diff --git a/Paper b/Paper index 10c29e736..4a97a7ca4 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 10c29e7369df57f7bdb68bf8b4fdc6f229e6a014 +Subproject commit 4a97a7ca44b1a07d51d21e662029bca03c932cc3 diff --git a/current-paper b/current-paper index 7e74aa485..a894cbb5f 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.4--b8a459d4a86f3ed036f7bf543c83ba033a382924 +1.14.4--01504b725115d7ab78f69565b55b8459e86ad7de diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 97ead2d3d..506374b55 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -207,11 +207,6 @@ mobs - **default**: false - **description**: Prevent pigmen from targetting players unless they are hit. (fixes MC-56653) -* pillager - * disable-patrols - - **default**: false - - **description**: Disables random pillager patrols (does not effect pillager outposts) - * rabbit * spawn-killer-rabbit-chance - **default**: 0.0 diff --git a/patches/server/0020-Allow-color-codes-on-signs.patch b/patches/server/0020-Allow-color-codes-on-signs.patch index 03e4d8a62..53bcddb10 100644 --- a/patches/server/0020-Allow-color-codes-on-signs.patch +++ b/patches/server/0020-Allow-color-codes-on-signs.patch @@ -1,4 +1,4 @@ -From 9cb17aad55df0f36335066132488c86a802cfdae Mon Sep 17 00:00:00 2001 +From 79c73f8dbdd6592ee6e072ac6d0f85243f4cdd5a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Allow color codes on signs @@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs 4 files changed, 28 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7801879c8..e0e94ca11 100644 +index c747b5deb3..d5f80be598 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1120,6 +1120,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1122,6 +1122,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void openSign(TileEntitySign tileentitysign) { tileentitysign.a((EntityHuman) this); @@ -23,7 +23,7 @@ index 7801879c8..e0e94ca11 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e7b8b2e99..3405e8a85 100644 +index ae17cdf234..afc1a5f858 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2561,6 +2561,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -42,7 +42,7 @@ index e7b8b2e99..3405e8a85 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 0a8d9b52d..65771ed9e 100644 +index 0a8d9b52dd..65771ed9e1 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -122,6 +122,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -67,7 +67,7 @@ index 0a8d9b52d..65771ed9e 100644 @Override public PacketPlayOutTileEntityData getUpdatePacket() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 383e7d5d5..fe0136c63 100644 +index 8bd887b1c2..abd10a500a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -98,4 +98,9 @@ public class PurpurWorldConfig { @@ -81,5 +81,5 @@ index 383e7d5d5..fe0136c63 100644 + } } -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0040-Players-should-not-cram-to-death.patch b/patches/server/0040-Players-should-not-cram-to-death.patch index 8e4713804..63c614c15 100644 --- a/patches/server/0040-Players-should-not-cram-to-death.patch +++ b/patches/server/0040-Players-should-not-cram-to-death.patch @@ -1,4 +1,4 @@ -From aff8536930249c18ed0448d8627de98e359c6ef6 Mon Sep 17 00:00:00 2001 +From c0f77cc38698e65711c583d78967a3d1cd3d8f6b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:01:46 -0500 Subject: [PATCH] Players should not cram to death @@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e0e94ca11..a90bc090c 100644 +index d5f80be598..9a76d14a04 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1079,7 +1079,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1081,7 +1081,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public boolean isInvulnerable(DamageSource damagesource) { @@ -21,5 +21,5 @@ index e0e94ca11..a90bc090c 100644 @Override -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0048-Add-5-second-tps-average-in-tps.patch b/patches/server/0047-Add-5-second-tps-average-in-tps.patch similarity index 96% rename from patches/server/0048-Add-5-second-tps-average-in-tps.patch rename to patches/server/0047-Add-5-second-tps-average-in-tps.patch index 7d17053ac..36b02d5d7 100644 --- a/patches/server/0048-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0047-Add-5-second-tps-average-in-tps.patch @@ -1,4 +1,4 @@ -From bb9d55a4c4f8c86ab51da99d8c3c5c2fb0541eb0 Mon Sep 17 00:00:00 2001 +From 57e8301289f665aaf55793cb18208e553ef361da Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 28 Jul 2019 01:27:37 -0500 Subject: [PATCH] Add 5 second tps average in /tps @@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ab596e74e..093457ed7 100644 +index ab596e74e3..093457ed7b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -174,7 +174,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant -Date: Sat, 27 Jul 2019 17:20:35 -0500 -Subject: [PATCH] Add option to disable pillager patrols - ---- - src/main/java/net/minecraft/server/MobSpawnerPatrol.java | 1 + - src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 2 files changed, 6 insertions(+) - -diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index a9d32ebdf..b88040e03 100644 ---- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -+++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -@@ -9,6 +9,7 @@ public class MobSpawnerPatrol { - public MobSpawnerPatrol() {} - - public int a(WorldServer worldserver, boolean flag, boolean flag1) { -+ if (net.pl3x.purpur.PurpurConfig.disablePillagerPatrols) return 0; // Purpur - if (!flag) { - return 0; - } else { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 44232346e..3e3bbb4c3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -225,6 +225,11 @@ public class PurpurConfig { - pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit); - } - -+ public static boolean disablePillagerPatrols = false; -+ private static void pillagerSettings() { -+ disablePillagerPatrols = getBoolean("settings.mobs.pillager.disable-patrols", disablePillagerPatrols); -+ } -+ - public static boolean snowmanDropsPumpkin = false; - public static boolean snowmanPumpkinPutBack = false; - private static void snowmansSettings() { --- -2.23.0.rc1 - diff --git a/patches/server/0049-Rate-limit-packets-incoming-from-players.patch b/patches/server/0048-Rate-limit-packets-incoming-from-players.patch similarity index 98% rename from patches/server/0049-Rate-limit-packets-incoming-from-players.patch rename to patches/server/0048-Rate-limit-packets-incoming-from-players.patch index c6cc3e696..951682abf 100644 --- a/patches/server/0049-Rate-limit-packets-incoming-from-players.patch +++ b/patches/server/0048-Rate-limit-packets-incoming-from-players.patch @@ -1,4 +1,4 @@ -From 7f9771a3f065bc1ea1b339a1b18bdc1c984ffc8d Mon Sep 17 00:00:00 2001 +From 916ee5d62872a87cb932256aca0de26dcb696980 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 11 Mar 2019 12:18:29 -0700 Subject: [PATCH] Rate limit packets incoming from players @@ -12,7 +12,7 @@ Subject: [PATCH] Rate limit packets incoming from players create mode 100644 src/main/java/com/destroystokyo/paper/network/PacketLimiter.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 58e2a0707..4fcecf409 100644 +index 4362720ba3..1fcb815b2e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -392,6 +392,18 @@ public class PaperConfig { @@ -36,7 +36,7 @@ index 58e2a0707..4fcecf409 100644 //public static boolean asyncChunkGenThreadPerWorld = true; // Leave out for now until we can control this diff --git a/src/main/java/com/destroystokyo/paper/network/PacketLimiter.java b/src/main/java/com/destroystokyo/paper/network/PacketLimiter.java new file mode 100644 -index 000000000..91c8c5f53 +index 0000000000..91c8c5f53a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PacketLimiter.java @@ -0,0 +1,135 @@ @@ -176,7 +176,7 @@ index 000000000..91c8c5f53 + } +} diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 96a785af2..ff8b5e76f 100644 +index 96a785af27..ff8b5e76f3 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -150,6 +150,13 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -194,7 +194,7 @@ index 96a785af2..ff8b5e76f 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index afc1a5f85..30595523e 100644 +index afc1a5f858..30595523e6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -140,6 +140,60 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -259,5 +259,5 @@ index afc1a5f85..30595523e 100644 public void tick() { this.syncPosition(); -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0050-Don-t-recalculate-permissions-for-players-on-world-c.patch b/patches/server/0049-Don-t-recalculate-permissions-for-players-on-world-c.patch similarity index 92% rename from patches/server/0050-Don-t-recalculate-permissions-for-players-on-world-c.patch rename to patches/server/0049-Don-t-recalculate-permissions-for-players-on-world-c.patch index 72a3a9ab4..9a610b00c 100644 --- a/patches/server/0050-Don-t-recalculate-permissions-for-players-on-world-c.patch +++ b/patches/server/0049-Don-t-recalculate-permissions-for-players-on-world-c.patch @@ -1,4 +1,4 @@ -From 4ce5f542966dc9bf338e7c805858ecb3b549e776 Mon Sep 17 00:00:00 2001 +From a5b5ba6ffa2c7eea71d8cca1f357823667d0dfae Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 12 Jul 2019 07:59:35 -0500 Subject: [PATCH] Don't recalculate permissions for players on world change @@ -9,7 +9,7 @@ Subject: [PATCH] Don't recalculate permissions for players on world change 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3cb443c4f..a33285379 100644 +index 4ba349e1a3..7a5bd0857e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -711,7 +711,7 @@ public abstract class PlayerList { @@ -21,7 +21,7 @@ index 3cb443c4f..a33285379 100644 if (!entityplayer.playerConnection.isDisconnected()) { worldserver.addPlayerRespawn(entityplayer1); this.players.add(entityplayer1); -@@ -752,6 +752,7 @@ public abstract class PlayerList { +@@ -754,6 +754,7 @@ public abstract class PlayerList { return entityplayer1; } @@ -30,7 +30,7 @@ index 3cb443c4f..a33285379 100644 GameProfile gameprofile = entityplayer.getProfile(); int i = this.server.a(gameprofile); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4243cd4d7..96461a1cf 100644 +index 44232346e1..22df3577cc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,11 @@ public class PurpurConfig { @@ -46,5 +46,5 @@ index 4243cd4d7..96461a1cf 100644 private static void requireShiftToMount() { requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount); -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0051-Add-blacklist-option-for-grindstone.patch b/patches/server/0050-Add-blacklist-option-for-grindstone.patch similarity index 96% rename from patches/server/0051-Add-blacklist-option-for-grindstone.patch rename to patches/server/0050-Add-blacklist-option-for-grindstone.patch index 88966b953..177a76b37 100644 --- a/patches/server/0051-Add-blacklist-option-for-grindstone.patch +++ b/patches/server/0050-Add-blacklist-option-for-grindstone.patch @@ -1,4 +1,4 @@ -From 4e9868d14c78881570891be09193174eef4f0cac Mon Sep 17 00:00:00 2001 +From 5fde04fa7eb04056763689b50cd583be287fd33c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 1 Aug 2019 19:15:12 -0500 Subject: [PATCH] Add blacklist option for grindstone @@ -10,7 +10,7 @@ Subject: [PATCH] Add blacklist option for grindstone 3 files changed, 35 insertions(+) diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java -index ed88e208d..0a5abd2e1 100644 +index ed88e208d0..0a5abd2e10 100644 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java @@ -57,12 +57,24 @@ public class ContainerGrindstone extends Container { @@ -51,7 +51,7 @@ index ed88e208d..0a5abd2e1 100644 Map map = EnchantmentManager.a(itemstack); Iterator iterator = map.entrySet().iterator(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 43e89b99b..e538ba399 100644 +index 43e89b99b1..e538ba3991 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -538,6 +538,12 @@ public final class ItemStack { @@ -68,7 +68,7 @@ index 43e89b99b..e538ba399 100644 return this.getItem().f(this); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 96461a1cf..973cf6586 100644 +index 22df3577cc..0fa7faa996 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ @@ -98,5 +98,5 @@ index 96461a1cf..973cf6586 100644 private static void requireShiftToMount() { requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount); -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0052-Implement-AFK-API.patch b/patches/server/0051-Implement-AFK-API.patch similarity index 98% rename from patches/server/0052-Implement-AFK-API.patch rename to patches/server/0051-Implement-AFK-API.patch index 26b01f289..447d4d4d5 100644 --- a/patches/server/0052-Implement-AFK-API.patch +++ b/patches/server/0051-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From 932bc8077657edda8bc84b0ae54b86d7a54feae5 Mon Sep 17 00:00:00 2001 +From cffd71583a96d5d1517e9112eafe5db20974bc3d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] Implement AFK API @@ -49,10 +49,10 @@ index 8b5ceec8d8..3610611299 100644 super(EntityTypes.PLAYER, world); this.bY = ItemStack.a; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b37512369c..1309e97605 100644 +index 9a76d14a04..d88fa128c7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1605,8 +1605,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1607,8 +1607,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void resetIdleTimer() { this.cm = SystemUtils.getMonotonicMillis(); @@ -299,5 +299,5 @@ index 92601c581c..185717c804 100644 ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange ); ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange ); -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0053-Advancement-stuffs.patch b/patches/server/0052-Advancement-stuffs.patch similarity index 87% rename from patches/server/0053-Advancement-stuffs.patch rename to patches/server/0052-Advancement-stuffs.patch index d9ed979f3..b37579573 100644 --- a/patches/server/0053-Advancement-stuffs.patch +++ b/patches/server/0052-Advancement-stuffs.patch @@ -1,4 +1,4 @@ -From 3417eded091bd2c030ad35dde9a48739601067ca Mon Sep 17 00:00:00 2001 +From 3cd2e9d59270365d1315c92b17c8a0c5c454184f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 11 Aug 2019 22:25:33 -0500 Subject: [PATCH] Advancement stuffs @@ -8,7 +8,7 @@ Subject: [PATCH] Advancement stuffs 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java -index 4fe732447..6e5d81daf 100644 +index 4fe7324475..6e5d81daf1 100644 --- a/src/main/java/net/minecraft/server/CriterionTrigger.java +++ b/src/main/java/net/minecraft/server/CriterionTrigger.java @@ -27,6 +27,7 @@ public interface CriterionTrigger { @@ -20,5 +20,5 @@ index 4fe732447..6e5d81daf 100644 return this.a; } -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0054-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0053-Add-option-for-zombies-targetting-turtle-eggs.patch similarity index 91% rename from patches/server/0054-Add-option-for-zombies-targetting-turtle-eggs.patch rename to patches/server/0053-Add-option-for-zombies-targetting-turtle-eggs.patch index fd956b5dd..01943d524 100644 --- a/patches/server/0054-Add-option-for-zombies-targetting-turtle-eggs.patch +++ b/patches/server/0053-Add-option-for-zombies-targetting-turtle-eggs.patch @@ -1,4 +1,4 @@ -From 79736643c2309d5efd118a36a3506c2a8cfd0975 Mon Sep 17 00:00:00 2001 +From 06f5f8eca842c388f4338ceab0e667231a9c348f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 17 Aug 2019 15:27:09 -0500 Subject: [PATCH] Add option for zombies targetting turtle eggs @@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombies targetting turtle eggs 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 96676a786..b426941f5 100644 +index 61c427f18b..51191b1195 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -48,7 +48,7 @@ public class EntityZombie extends EntityMonster { @@ -22,10 +22,10 @@ index 96676a786..b426941f5 100644 this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this)); this.l(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f3e0df8f9..47bb0fb95 100644 +index 0fa7faa996..e6a8f9fb84 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -261,6 +261,11 @@ public class PurpurConfig { +@@ -256,6 +256,11 @@ public class PurpurConfig { villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks); } @@ -38,5 +38,5 @@ index f3e0df8f9..47bb0fb95 100644 private static void zombieHorseSettings() { zombieHorseSpawnChance = (float) getDouble("settings.mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance); -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0055-Implement-bamboo-growth-settings.patch b/patches/server/0054-Implement-bamboo-growth-settings.patch similarity index 97% rename from patches/server/0055-Implement-bamboo-growth-settings.patch rename to patches/server/0054-Implement-bamboo-growth-settings.patch index f765f2461..d61852872 100644 --- a/patches/server/0055-Implement-bamboo-growth-settings.patch +++ b/patches/server/0054-Implement-bamboo-growth-settings.patch @@ -1,4 +1,4 @@ -From 731bbc7baab11969ce89f59d0846ccc73bfa249f Mon Sep 17 00:00:00 2001 +From 7154ef7c0bb8c9196c77d0913828ac949f0754c9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 23 Aug 2019 20:57:29 -0500 Subject: [PATCH] Implement bamboo growth settings @@ -9,7 +9,7 @@ Subject: [PATCH] Implement bamboo growth settings 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java -index 3a9c3b54a..f0401c3e7 100644 +index 3a9c3b54a9..f0401c3e72 100644 --- a/src/main/java/net/minecraft/server/BlockBamboo.java +++ b/src/main/java/net/minecraft/server/BlockBamboo.java @@ -89,7 +89,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement { @@ -67,7 +67,7 @@ index 3a9c3b54a..f0401c3e7 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0764be9d1..8915bc9ea 100644 +index 0764be9d1a..8915bc9ea8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -67,6 +67,13 @@ public class PurpurWorldConfig { @@ -85,5 +85,5 @@ index 0764be9d1..8915bc9ea 100644 private void campfireObeysGravity() { campfireObeysGravity = getBoolean("campfire-obeys-gravity", campfireObeysGravity); -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0056-Option-for-slimes-not-pushable.patch b/patches/server/0055-Option-for-slimes-not-pushable.patch similarity index 93% rename from patches/server/0056-Option-for-slimes-not-pushable.patch rename to patches/server/0055-Option-for-slimes-not-pushable.patch index 7d3487311..fbc3a1c4f 100644 --- a/patches/server/0056-Option-for-slimes-not-pushable.patch +++ b/patches/server/0055-Option-for-slimes-not-pushable.patch @@ -1,4 +1,4 @@ -From 6b3959cb0a2d244edd7ed730e56b3b5a26fdefaa Mon Sep 17 00:00:00 2001 +From 5b63c689aa1542e570b8d4e8ad03059fbd67d043 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 23 Aug 2019 21:56:31 -0500 Subject: [PATCH] Option for slimes not pushable @@ -10,7 +10,7 @@ Subject: [PATCH] Option for slimes not pushable 3 files changed, 32 insertions(+) diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index de804348f..52cc35d0a 100644 +index de804348f3..52cc35d0a7 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -9,6 +9,8 @@ import java.util.Set; @@ -40,7 +40,7 @@ index de804348f..52cc35d0a 100644 if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java -index fd54958f6..3ee8332c9 100644 +index fd54958f65..3ee8332c95 100644 --- a/src/main/java/net/minecraft/server/BlockSlime.java +++ b/src/main/java/net/minecraft/server/BlockSlime.java @@ -49,4 +49,11 @@ public class BlockSlime extends BlockHalfTransparent { @@ -56,10 +56,10 @@ index fd54958f6..3ee8332c9 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 47bb0fb95..1d043e53a 100644 +index e6a8f9fb84..94ca1e0bcb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -283,6 +283,19 @@ public class PurpurConfig { +@@ -278,6 +278,19 @@ public class PurpurConfig { InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27); } @@ -80,5 +80,5 @@ index 47bb0fb95..1d043e53a 100644 public static boolean ridableBlaze = true; public static boolean ridableCat = true; -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0057-Ender-Dragon-always-drops-full-exp.patch b/patches/server/0056-Ender-Dragon-always-drops-full-exp.patch similarity index 93% rename from patches/server/0057-Ender-Dragon-always-drops-full-exp.patch rename to patches/server/0056-Ender-Dragon-always-drops-full-exp.patch index 193a18baf..fa5a44448 100644 --- a/patches/server/0057-Ender-Dragon-always-drops-full-exp.patch +++ b/patches/server/0056-Ender-Dragon-always-drops-full-exp.patch @@ -1,4 +1,4 @@ -From 81482a75f9d7503a38261cb283594bc3f8e6e6cd Mon Sep 17 00:00:00 2001 +From d6e9fe4a886c5b87aa18d0c6653cc637f1a0d546 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 24 Aug 2019 14:42:54 -0500 Subject: [PATCH] Ender Dragon always drops full exp @@ -9,7 +9,7 @@ Subject: [PATCH] Ender Dragon always drops full exp 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 6a6367a2e..578676fec 100644 +index 6a6367a2e1..578676fec9 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -558,7 +558,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -22,7 +22,7 @@ index 6a6367a2e..578676fec 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1d043e53a..bc8ad4a7c 100644 +index 94ca1e0bcb..26ac853132 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -194,6 +194,7 @@ public class PurpurConfig { @@ -42,5 +42,5 @@ index 1d043e53a..bc8ad4a7c 100644 public static boolean tulipsChangeFoxType = true; -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0058-Dispenser-curse-of-binding-protection.patch b/patches/server/0057-Dispenser-curse-of-binding-protection.patch similarity index 95% rename from patches/server/0058-Dispenser-curse-of-binding-protection.patch rename to patches/server/0057-Dispenser-curse-of-binding-protection.patch index 150a17dd9..ae6a55eda 100644 --- a/patches/server/0058-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0057-Dispenser-curse-of-binding-protection.patch @@ -1,4 +1,4 @@ -From 070bf398cc0469574042f361707af5bdb9ee3db0 Mon Sep 17 00:00:00 2001 +From 3ea6afe462da21924c767a6efb68233de314757c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 25 Aug 2019 00:09:52 -0500 Subject: [PATCH] Dispenser curse of binding protection @@ -10,7 +10,7 @@ Subject: [PATCH] Dispenser curse of binding protection 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 2a74c3d18..610bf5458 100644 +index 2a74c3d185..610bf54584 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -896,9 +896,15 @@ public abstract class EntityInsentient extends EntityLiving { @@ -31,7 +31,7 @@ index 2a74c3d18..610bf5458 100644 } diff --git a/src/main/java/net/minecraft/server/ItemArmor.java b/src/main/java/net/minecraft/server/ItemArmor.java -index dec03e4ae..ce77b7e33 100644 +index dec03e4ae5..ce77b7e33f 100644 --- a/src/main/java/net/minecraft/server/ItemArmor.java +++ b/src/main/java/net/minecraft/server/ItemArmor.java @@ -33,7 +33,7 @@ public class ItemArmor extends Item { @@ -52,7 +52,7 @@ index dec03e4ae..ce77b7e33 100644 return this.b; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8915bc9ea..3ff5dc4a3 100644 +index 8915bc9ea8..3ff5dc4a3b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -107,6 +107,11 @@ public class PurpurWorldConfig { @@ -68,5 +68,5 @@ index 8915bc9ea..3ff5dc4a3 100644 private void allowMoistSoilFromWaterBelow() { allowMoistSoilFromWaterBelow = getBoolean("allow-moist-soil-from-water-below", allowMoistSoilFromWaterBelow); -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0060-Add-killer-rabbit-natural-spawn-chance.patch b/patches/server/0058-Add-killer-rabbit-natural-spawn-chance.patch similarity index 83% rename from patches/server/0060-Add-killer-rabbit-natural-spawn-chance.patch rename to patches/server/0058-Add-killer-rabbit-natural-spawn-chance.patch index 9b99f3840..9d0425caa 100644 --- a/patches/server/0060-Add-killer-rabbit-natural-spawn-chance.patch +++ b/patches/server/0058-Add-killer-rabbit-natural-spawn-chance.patch @@ -1,4 +1,4 @@ -From b9d0c3d5fcad5d6eb857309e3083751df28c32f7 Mon Sep 17 00:00:00 2001 +From 726de26909cd6f0643a8b781cbb5ddecd0929e3a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 31 Aug 2019 17:24:41 -0500 Subject: [PATCH] Add killer rabbit natural spawn chance @@ -9,7 +9,7 @@ Subject: [PATCH] Add killer rabbit natural spawn chance 2 files changed, 7 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index d48610df3..498c453d7 100644 +index d48610df3a..498c453d71 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -328,6 +328,8 @@ public class EntityRabbit extends EntityAnimal { @@ -22,11 +22,11 @@ index d48610df3..498c453d7 100644 int i = this.random.nextInt(100); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bc8ad4a7c..1a1cee00d 100644 +index 26ac853132..3e96f63dbe 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -249,6 +249,11 @@ public class PurpurConfig { - disablePillagerPatrols = getBoolean("settings.mobs.pillager.disable-patrols", disablePillagerPatrols); +@@ -244,6 +244,11 @@ public class PurpurConfig { + pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit); } + public static double killerRabbitChance = 0.0D; @@ -38,5 +38,5 @@ index bc8ad4a7c..1a1cee00d 100644 public static boolean snowmanPumpkinPutBack = false; private static void snowmansSettings() { -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0061-Add-option-to-spawn-Toast.patch b/patches/server/0059-Add-option-to-spawn-Toast.patch similarity index 91% rename from patches/server/0061-Add-option-to-spawn-Toast.patch rename to patches/server/0059-Add-option-to-spawn-Toast.patch index 7ca7f887d..223bc5e83 100644 --- a/patches/server/0061-Add-option-to-spawn-Toast.patch +++ b/patches/server/0059-Add-option-to-spawn-Toast.patch @@ -1,4 +1,4 @@ -From abe8c126fd25b489ae78b0f4bbc864cf33763d7a Mon Sep 17 00:00:00 2001 +From f1cd162a9a053fa793a85354770acae1223da892 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 31 Aug 2019 17:47:11 -0500 Subject: [PATCH] Add option to spawn Toast @@ -9,7 +9,7 @@ Subject: [PATCH] Add option to spawn Toast 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 498c453d7..41d8d1ccb 100644 +index 498c453d71..41d8d1ccb0 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -300,7 +300,7 @@ public class EntityRabbit extends EntityAnimal { @@ -30,10 +30,10 @@ index 498c453d7..41d8d1ccb 100644 BiomeBase biomebase = generatoraccess.getBiome(new BlockPosition(this)); int i = this.random.nextInt(100); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1a1cee00d..0481db6f1 100644 +index 3e96f63dbe..569c5b3442 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -250,8 +250,10 @@ public class PurpurConfig { +@@ -245,8 +245,10 @@ public class PurpurConfig { } public static double killerRabbitChance = 0.0D; @@ -45,5 +45,5 @@ index 1a1cee00d..0481db6f1 100644 public static boolean snowmanDropsPumpkin = false; -- -2.23.0.rc1 +2.24.0.rc1 diff --git a/patches/server/0059-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/server/0059-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch deleted file mode 100644 index 36254ca37..000000000 --- a/patches/server/0059-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0b76e89f23f92f891c5da98871e30e03cbff759b Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Fri, 30 Aug 2019 18:56:32 -0500 -Subject: [PATCH] Fix stuck in sneak when changing worlds MC-10657 - ---- - src/main/java/net/minecraft/server/EntityPlayer.java | 2 ++ - src/main/java/net/minecraft/server/PlayerList.java | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cfa608e22..ad9fa0488 100644 ---- a/src/main/java/net/minecraft/server/EntityPlayer.java -+++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -963,6 +963,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - this.lastHealthSent = -1.0F; - this.lastFoodSent = -1; - -+ setSneaking(false); // Purpur - fix MC-10657 -+ - // CraftBukkit start - PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld()); - this.world.getServer().getPluginManager().callEvent(changeEvent); -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a33285379..8ad9ccde9 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -728,6 +728,8 @@ public abstract class PlayerList { - entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect)); - } - -+ entityplayer.setSneaking(false); // Purpur - fix MC-10657 -+ - // Fire advancement trigger - entityplayer.b(((CraftWorld) fromWorld).getHandle()); - --- -2.23.0.rc1 - diff --git a/patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0060-Add-option-for-boats-to-eject-players-on-land.patch similarity index 96% rename from patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0060-Add-option-for-boats-to-eject-players-on-land.patch index c7ffc6c87..8b8c53e73 100644 --- a/patches/server/0062-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0060-Add-option-for-boats-to-eject-players-on-land.patch @@ -1,4 +1,4 @@ -From 6146816adad1f317c75340779db9dfc05a2dbc42 Mon Sep 17 00:00:00 2001 +From f71a6b979a284bf7f992a60251937b33250f9e01 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 7 Sep 2019 22:47:59 -0500 Subject: [PATCH] Add option for boats to eject players on land diff --git a/patches/server/0063-Allow-leashing-villagers.patch b/patches/server/0061-Allow-leashing-villagers.patch similarity index 95% rename from patches/server/0063-Allow-leashing-villagers.patch rename to patches/server/0061-Allow-leashing-villagers.patch index 14f7a912b..5b27bc245 100644 --- a/patches/server/0063-Allow-leashing-villagers.patch +++ b/patches/server/0061-Allow-leashing-villagers.patch @@ -1,4 +1,4 @@ -From 761fadea4b472815f421735fb46fdd4bc8cbbf55 Mon Sep 17 00:00:00 2001 +From ba08bce0d3b1032f7099f4a9e35dac7871d753ab Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 3 Oct 2019 18:08:03 -0500 Subject: [PATCH] Allow leashing villagers @@ -38,10 +38,10 @@ index d1d62a900f..2a848304df 100644 + // Purpur - end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0481db6f15..04a58a8da0 100644 +index 569c5b3442..7ab88bd640 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -265,9 +265,11 @@ public class PurpurConfig { +@@ -260,9 +260,11 @@ public class PurpurConfig { public static boolean useVillagerBrainTicksOnlyWhenLagging = true; public static int villagerBrainTicks = 20; diff --git a/patches/server/0064-Add-option-to-set-armorstand-step-height.patch b/patches/server/0062-Add-option-to-set-armorstand-step-height.patch similarity index 95% rename from patches/server/0064-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0062-Add-option-to-set-armorstand-step-height.patch index 5cfbef172..0ae69a7df 100644 --- a/patches/server/0064-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0062-Add-option-to-set-armorstand-step-height.patch @@ -1,4 +1,4 @@ -From 5632f7443ddeedcff30dccbed2ed6f8576645367 Mon Sep 17 00:00:00 2001 +From 46a5fe7cbdae341b895a29c270760ad731fb9562 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 6 Oct 2019 12:46:35 -0500 Subject: [PATCH] Add option to set armorstand step height @@ -22,7 +22,7 @@ index 8bd864cb39..f58cfa6da1 100644 public EntityArmorStand(World world, double d0, double d1, double d2) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 04a58a8da0..f2f61f9975 100644 +index 7ab88bd640..25ca8381b3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -188,6 +188,11 @@ public class PurpurConfig { diff --git a/patches/server/0065-Add-API-for-Villager-resetOffers.patch b/patches/server/0063-Add-API-for-Villager-resetOffers.patch similarity index 97% rename from patches/server/0065-Add-API-for-Villager-resetOffers.patch rename to patches/server/0063-Add-API-for-Villager-resetOffers.patch index 8ae584438..190716f43 100644 --- a/patches/server/0065-Add-API-for-Villager-resetOffers.patch +++ b/patches/server/0063-Add-API-for-Villager-resetOffers.patch @@ -1,4 +1,4 @@ -From c5c4dfeda34cd1c720b4a8bd35eec55df0bcae99 Mon Sep 17 00:00:00 2001 +From 58e0aff97d803390d5e033fa7f44cc219659d6a1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 7 Oct 2019 00:15:37 -0500 Subject: [PATCH] Add API for Villager#resetOffers() diff --git a/patches/server/0066-Alternative-Keepalive-Handling.patch b/patches/server/0064-Alternative-Keepalive-Handling.patch similarity index 98% rename from patches/server/0066-Alternative-Keepalive-Handling.patch rename to patches/server/0064-Alternative-Keepalive-Handling.patch index 84d3dbb9d..fbc484e71 100644 --- a/patches/server/0066-Alternative-Keepalive-Handling.patch +++ b/patches/server/0064-Alternative-Keepalive-Handling.patch @@ -1,4 +1,4 @@ -From de43aa4d94afa84d4cda98b0d2228ff9860cf11e Mon Sep 17 00:00:00 2001 +From c08a0854ea28663d5311401118b0ef20e2f1bb0b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 11 Oct 2019 00:17:39 -0500 Subject: [PATCH] Alternative Keepalive Handling @@ -75,7 +75,7 @@ index 6f584d515f..b40bea8e8b 100644 if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f2f61f9975..baa069d0c8 100644 +index 25ca8381b3..306d86d842 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -167,6 +167,11 @@ public class PurpurConfig { diff --git a/patches/server/0067-Expose-getItemStack-for-Trident.patch b/patches/server/0065-Expose-getItemStack-for-Trident.patch similarity index 96% rename from patches/server/0067-Expose-getItemStack-for-Trident.patch rename to patches/server/0065-Expose-getItemStack-for-Trident.patch index 341385aa1..57b11454e 100644 --- a/patches/server/0067-Expose-getItemStack-for-Trident.patch +++ b/patches/server/0065-Expose-getItemStack-for-Trident.patch @@ -1,4 +1,4 @@ -From e7a2f53717adec767dbc1a9a864e7e0deb9d2b57 Mon Sep 17 00:00:00 2001 +From c5fecee384e8f908932c82f11ed61330c554a234 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:19:40 -0500 Subject: [PATCH] Expose getItemStack for Trident diff --git a/patches/server/0068-Add-more-llama-API.patch b/patches/server/0066-Add-more-llama-API.patch similarity index 99% rename from patches/server/0068-Add-more-llama-API.patch rename to patches/server/0066-Add-more-llama-API.patch index c484cbe65..2db082a57 100644 --- a/patches/server/0068-Add-more-llama-API.patch +++ b/patches/server/0066-Add-more-llama-API.patch @@ -1,4 +1,4 @@ -From 1debe995bd2c920910bbff750353714006b2a131 Mon Sep 17 00:00:00 2001 +From 6c8732cc438eb595e0124a21cd57c3d445145677 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:50:12 -0500 Subject: [PATCH] Add more llama API diff --git a/patches/server/0069-Add-entity-jump-API.patch b/patches/server/0067-Add-entity-jump-API.patch similarity index 97% rename from patches/server/0069-Add-entity-jump-API.patch rename to patches/server/0067-Add-entity-jump-API.patch index 3e449a666..7595a6528 100644 --- a/patches/server/0069-Add-entity-jump-API.patch +++ b/patches/server/0067-Add-entity-jump-API.patch @@ -1,4 +1,4 @@ -From f244cb2f5cef18819de2098f92bff75d8bd6e5b2 Mon Sep 17 00:00:00 2001 +From bcf6c9b4668bc6328c419236371755f9302f0a46 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 23:34:48 -0500 Subject: [PATCH] Add entity jump API diff --git a/patches/server/0070-Add-block-and-fluid-tick-events.patch b/patches/server/0068-Add-block-and-fluid-tick-events.patch similarity index 98% rename from patches/server/0070-Add-block-and-fluid-tick-events.patch rename to patches/server/0068-Add-block-and-fluid-tick-events.patch index 44df50235..7e2dbefdb 100644 --- a/patches/server/0070-Add-block-and-fluid-tick-events.patch +++ b/patches/server/0068-Add-block-and-fluid-tick-events.patch @@ -1,4 +1,4 @@ -From efb71f36f1a37e61ec64e76daa8b1f947c51d662 Mon Sep 17 00:00:00 2001 +From 56bea4aa2394d22e31b992c3715a1b4c519f7320 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 23:58:56 -0500 Subject: [PATCH] Add block and fluid tick events diff --git a/patches/server/0071-Add-more-evoker-API.patch b/patches/server/0069-Add-more-evoker-API.patch similarity index 97% rename from patches/server/0071-Add-more-evoker-API.patch rename to patches/server/0069-Add-more-evoker-API.patch index c5a43877e..50a8af6a6 100644 --- a/patches/server/0071-Add-more-evoker-API.patch +++ b/patches/server/0069-Add-more-evoker-API.patch @@ -1,4 +1,4 @@ -From 20545171b9c5187780a145abd4928ed4bf664f29 Mon Sep 17 00:00:00 2001 +From c5762ebef35be6a13d450004f93e3c7984f81a17 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:29:02 -0500 Subject: [PATCH] Add more evoker API diff --git a/patches/server/0072-Add-getPlacementBlockData-to-World.patch b/patches/server/0070-Add-getPlacementBlockData-to-World.patch similarity index 94% rename from patches/server/0072-Add-getPlacementBlockData-to-World.patch rename to patches/server/0070-Add-getPlacementBlockData-to-World.patch index 55cdc0b20..e542ed1dc 100644 --- a/patches/server/0072-Add-getPlacementBlockData-to-World.patch +++ b/patches/server/0070-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From 7708ca2db335aa2644980d59912d8b13d25e792e Mon Sep 17 00:00:00 2001 +From 5d8f75f465d9985353d919129ed0996a6e042c60 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:34:43 -0500 Subject: [PATCH] Add getPlacementBlockData to World diff --git a/patches/server/0073-Add-setting-to-suppress-unknown-attribute-warnings.patch b/patches/server/0071-Add-setting-to-suppress-unknown-attribute-warnings.patch similarity index 95% rename from patches/server/0073-Add-setting-to-suppress-unknown-attribute-warnings.patch rename to patches/server/0071-Add-setting-to-suppress-unknown-attribute-warnings.patch index e89150a0c..93cd7082b 100644 --- a/patches/server/0073-Add-setting-to-suppress-unknown-attribute-warnings.patch +++ b/patches/server/0071-Add-setting-to-suppress-unknown-attribute-warnings.patch @@ -1,4 +1,4 @@ -From 1f82c7d2a0f9d88d8a261ccbb9a7bb8e5f515c4e Mon Sep 17 00:00:00 2001 +From 33f577964c65dc07468b42c08f00da4e0e0351c8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:52:12 -0500 Subject: [PATCH] Add setting to suppress unknown attribute warnings @@ -21,7 +21,7 @@ index 469e293c25..ada17e2bf6 100644 } else { a(attributeinstance, nbttagcompound); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index baa069d0c8..a8d86b4345 100644 +index 306d86d842..af808d0367 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -172,6 +172,11 @@ public class PurpurConfig { diff --git a/patches/server/0074-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0072-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 97% rename from patches/server/0074-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0072-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 857cb5e3d..8de380d11 100644 --- a/patches/server/0074-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0072-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -1,4 +1,4 @@ -From 82a289d747be235a3b6311c223e010ee015f8b85 Mon Sep 17 00:00:00 2001 +From 4400fecb0d24cda272bc41114a905dcde070624f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 01:42:50 -0500 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/patches/server/0075-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0073-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 95% rename from patches/server/0075-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0073-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index f41d06906..6add48248 100644 --- a/patches/server/0075-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/patches/server/0073-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -1,4 +1,4 @@ -From dc5bbd188cd2d45597e1fb68f3242a453c98a219 Mon Sep 17 00:00:00 2001 +From b1e4664cdc73bee097d32b10c3eea44cd81045f9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:20:45 -0500 Subject: [PATCH] Add option to allow iron golems to spawn in air @@ -22,7 +22,7 @@ index 9bb033336c..6fdc4e6d6a 100644 } else { for (int i = 1; i < 3; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a8d86b4345..a98e704cff 100644 +index af808d0367..d05d69df10 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -241,8 +241,10 @@ public class PurpurConfig { diff --git a/patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 94% rename from patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch index ae2a52b7b..8056d6948 100644 --- a/patches/server/0076-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From aaf778c501cbb4b866392319fcb861a33c087c85 Mon Sep 17 00:00:00 2001 +From 15223190288e5d7d84bf8780184f0718019fb283 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:25:16 -0500 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/patches/server/0077-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0075-Add-getPlayer-to-SkeletonHorseTrapEvent.patch similarity index 96% rename from patches/server/0077-Add-getPlayer-to-SkeletonHorseTrapEvent.patch rename to patches/server/0075-Add-getPlayer-to-SkeletonHorseTrapEvent.patch index 6d6f914ec..6b58c990e 100644 --- a/patches/server/0077-Add-getPlayer-to-SkeletonHorseTrapEvent.patch +++ b/patches/server/0075-Add-getPlayer-to-SkeletonHorseTrapEvent.patch @@ -1,4 +1,4 @@ -From 1de15d02c574f64fa05e6be6d5f8c65faf861429 Mon Sep 17 00:00:00 2001 +From 69c1869edcf56eafc428a8e649b2228639b794e7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:35:35 -0500 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent diff --git a/patches/server/0078-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0076-Add-LootableInventoryFirstFillEvent.patch similarity index 94% rename from patches/server/0078-Add-LootableInventoryFirstFillEvent.patch rename to patches/server/0076-Add-LootableInventoryFirstFillEvent.patch index aa2c3e23d..2814c2b98 100644 --- a/patches/server/0078-Add-LootableInventoryFirstFillEvent.patch +++ b/patches/server/0076-Add-LootableInventoryFirstFillEvent.patch @@ -1,4 +1,4 @@ -From 646c030ba66848fbc3f7f0b9cdc60bb4441e931d Mon Sep 17 00:00:00 2001 +From bc45df1c6bdba7b7f33a2f5ccaf9f88de834a24a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:43:17 -0500 Subject: [PATCH] Add LootableInventoryFirstFillEvent diff --git a/patches/server/0079-Add-MonsterEggSpawnEvent.patch b/patches/server/0077-Add-MonsterEggSpawnEvent.patch similarity index 98% rename from patches/server/0079-Add-MonsterEggSpawnEvent.patch rename to patches/server/0077-Add-MonsterEggSpawnEvent.patch index 48522babb..e8c5fe969 100644 --- a/patches/server/0079-Add-MonsterEggSpawnEvent.patch +++ b/patches/server/0077-Add-MonsterEggSpawnEvent.patch @@ -1,4 +1,4 @@ -From 7e57a22bc34e8cda17e24822f168012ba21f9b8a Mon Sep 17 00:00:00 2001 +From ca3a6ee2ec47c2c27e489cd391a08bc889b59c76 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 03:20:59 -0500 Subject: [PATCH] Add MonsterEggSpawnEvent diff --git a/patches/server/0080-Add-ThrownEggHatchEvent.patch b/patches/server/0078-Add-ThrownEggHatchEvent.patch similarity index 95% rename from patches/server/0080-Add-ThrownEggHatchEvent.patch rename to patches/server/0078-Add-ThrownEggHatchEvent.patch index ca7363b59..7fc9377ff 100644 --- a/patches/server/0080-Add-ThrownEggHatchEvent.patch +++ b/patches/server/0078-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From b47b58dad8826e0d9c701a76764d50962b619bd1 Mon Sep 17 00:00:00 2001 +From 802e64b9f8494e865901c339b040d3d72d94be40 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 03:28:06 -0500 Subject: [PATCH] Add ThrownEggHatchEvent diff --git a/patches/server/0081-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch b/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch similarity index 95% rename from patches/server/0081-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch rename to patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch index 20b4cbe2b..1327a2004 100644 --- a/patches/server/0081-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch +++ b/patches/server/0079-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch @@ -1,4 +1,4 @@ -From cff5f796948cc4264a018359c2bfc91e0c9ba58f Mon Sep 17 00:00:00 2001 +From fba249fae3251b05417156a06dbcd080f5839306 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 03:36:52 -0500 Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and diff --git a/patches/server/0082-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch b/patches/server/0080-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch similarity index 98% rename from patches/server/0082-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch rename to patches/server/0080-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch index 328917799..649455f21 100644 --- a/patches/server/0082-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch +++ b/patches/server/0080-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch @@ -1,4 +1,4 @@ -From 742dc7ca52fff8d0a9e487673250662f954e0caa Mon Sep 17 00:00:00 2001 +From ccfa78953a0fc3fe610268338cfdfd11c41c1d60 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 03:53:54 -0500 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon diff --git a/patches/server/0083-Implement-infinite-lava.patch b/patches/server/0081-Implement-infinite-lava.patch similarity index 91% rename from patches/server/0083-Implement-infinite-lava.patch rename to patches/server/0081-Implement-infinite-lava.patch index 171dddbd8..2e6975b1b 100644 --- a/patches/server/0083-Implement-infinite-lava.patch +++ b/patches/server/0081-Implement-infinite-lava.patch @@ -1,4 +1,4 @@ -From 853e211dfd463a6f326694c86706089a7b7a7cae Mon Sep 17 00:00:00 2001 +From f7042a404bdd4b7a5d79b5f8f0b9a2b46cfdb43e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 23 Nov 2019 17:55:42 -0600 Subject: [PATCH] Implement infinite lava @@ -22,10 +22,10 @@ index ff677c59e5..240f0a9fdc 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a98e704cff..4b3a2792a7 100644 +index d05d69df10..37e9d13886 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -324,6 +324,11 @@ public class PurpurConfig { +@@ -319,6 +319,11 @@ public class PurpurConfig { slimeBlocksNotPushable = getBoolean("settings.slime-blocks-not-pushable", slimeBlocksNotPushable); }