diff --git a/Paper b/Paper index e594a5869..94315dad7 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit e594a58695583d971ada21c3efd7cbe03e9e3498 +Subproject commit 94315dad74c0e9a7a7594269c560380c25c26e84 diff --git a/current-paper b/current-paper index d40845b6d..6d65d96f2 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.1--e1e9b6da7135e7efe7759f0662935f6162ec90eb +1.16.1--16cb905fe84bd9bb78a9fc9634e7741566946741 diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index 519efa0bb..98c586942 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3db19a9bab..ebbd81a2db 100644 +index 3db19a9ba..ebbd81a2d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1563,6 +1563,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 3db19a9bab..ebbd81a2db 100644 double d3 = this.locX() - d0; double d4 = this.locY() - d1; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 2cada09ced..a69a698594 100644 +index 2cada09ce..a69a69859 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -37,7 +37,7 @@ index 2cada09ced..a69a698594 100644 super(EntityTypes.PLAYER, world); this.bS = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0f9550fb87..a23f237029 100644 +index 0f9550fb8..a23f23702 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -96,7 +96,7 @@ index 0f9550fb87..a23f237029 100644 return this.serverStatisticManager; } diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 0edcb775e9..dfa8f3439b 100644 +index 0edcb775e..dfa8f3439 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -144,28 +144,18 @@ public interface IEntityAccess { @@ -141,7 +141,7 @@ index 0edcb775e9..dfa8f3439b 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index a52dd0c021..9b4795f3bd 100644 +index a52dd0c02..9b4795f3b 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -161,7 +161,7 @@ index a52dd0c021..9b4795f3bd 100644 // Paper start public static final Predicate affectsSpawning = (entity) -> { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 37f55c66b6..aa6855c356 100644 +index 37f55c66b..aa6855c35 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -205,7 +205,7 @@ index 37f55c66b6..aa6855c356 100644 if (from.getX() != Double.MAX_VALUE) { Location oldTo = to.clone(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bc3a7d1513..9191d77864 100644 +index a7a63bb06..82b276ae8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -862,7 +862,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -217,7 +217,7 @@ index bc3a7d1513..9191d77864 100644 })) { // CraftBukkit start long l = this.worldData.getDayTime() + 24000L; -@@ -1182,7 +1182,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1181,7 +1181,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { while (iterator.hasNext()) { EntityPlayer entityplayer = (EntityPlayer) iterator.next(); @@ -227,7 +227,7 @@ index bc3a7d1513..9191d77864 100644 } else if (entityplayer.isSleeping()) { ++j; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 803a7ff92a..d699a91685 100644 +index 803a7ff92..d699a9168 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ @@ -255,7 +255,7 @@ index 803a7ff92a..d699a91685 100644 private static void timingsSettings() { timingsUrl = getString("settings.timings.url", timingsUrl); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 361f7857e4..2578a4677d 100644 +index 361f7857e..2578a4677 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -56,4 +56,15 @@ public class PurpurWorldConfig { @@ -275,7 +275,7 @@ index 361f7857e4..2578a4677d 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b832ece494..c278ad57d6 100644 +index b832ece49..c278ad57d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2149,4 +2149,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -301,7 +301,7 @@ index b832ece494..c278ad57d6 100644 + // Purpur end } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index f78e44e05f..da4c49daf4 100644 +index f78e44e05..da4c49daf 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -207,6 +207,7 @@ public class ActivationRange diff --git a/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch index 68d878c1f..998c29e7d 100644 --- a/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Logger settings (suppressing pointless logs) diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index d3387a4e16..fd22020037 100644 +index 1588d101e..fc4c1c1cd 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -@@ -165,6 +165,7 @@ public class AdvancementDataPlayer { +@@ -169,6 +169,7 @@ public class AdvancementDataPlayer { if (advancement == null) { // CraftBukkit start if (entry.getKey().getNamespace().equals("minecraft")) { @@ -17,7 +17,7 @@ index d3387a4e16..fd22020037 100644 } // CraftBukkit end diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 04ed0b1dba..83d146a18c 100644 +index 04ed0b1db..83d146a18 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -182,4 +182,11 @@ public class PurpurConfig { @@ -33,7 +33,7 @@ index 04ed0b1dba..83d146a18c 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java -index b14333ce9e..d25204f7d4 100644 +index b14333ce9..d25204f7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java @@ -254,6 +254,7 @@ public final class CraftLegacy { diff --git a/patches/server/0037-Zombie-horse-naturally-spawn.patch b/patches/server/0037-Zombie-horse-naturally-spawn.patch index 63c127368..0a8af8d7f 100644 --- a/patches/server/0037-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0037-Zombie-horse-naturally-spawn.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index efc2ea044..37a4b08e3 100644 +index 82b276ae8..137078daf 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1059,12 +1059,18 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1058,12 +1058,18 @@ public class WorldServer extends World implements GeneratorAccessSeed { boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper if (flag1) { diff --git a/patches/server/0047-Cat-spawning-options.patch b/patches/server/0047-Cat-spawning-options.patch index d86a60abf..e9d4d9ff6 100644 --- a/patches/server/0047-Cat-spawning-options.patch +++ b/patches/server/0047-Cat-spawning-options.patch @@ -99,10 +99,10 @@ index 5bd3bcc2b..5f2bb140a 100644 return this.E; } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 37a4b08e3..e6ad5a6ab 100644 +index 137078daf..b112fa052 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -2358,6 +2358,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -2357,6 +2357,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } }