diff --git a/patches/server/0079-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch b/patches/server/0079-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch deleted file mode 100644 index 1c3289e22..000000000 --- a/patches/server/0079-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8b10da757f42d39ad07a17029d7f57173a9238da 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 - ---- - .../minecraft/server/EnderDragonBattle.java | 55 ++++++++++++++++--- - 1 file changed, 48 insertions(+), 7 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index a2dfdc23f1..935d73f822 100644 ---- a/src/main/java/net/minecraft/server/EnderDragonBattle.java -+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java -@@ -22,7 +22,7 @@ public class EnderDragonBattle { - private static final Predicate b = IEntitySelector.a.and(IEntitySelector.a(0.0D, 128.0D, 0.0D, 192.0D)); - public final BossBattleServer bossBattle; - private final WorldServer d; public WorldServer getWorld() { return d; } // Purpur - OBFHELPER -- private final List e; -+ private final List e; public List getGateways() { return e; } // Purpur - OBFHELPER - private final ShapeDetector f; - private int g; - private int h; -@@ -356,8 +356,8 @@ public class EnderDragonBattle { - if (entityenderdragon.getUniqueID().equals(this.m)) { - this.bossBattle.setProgress(0.0F); - this.bossBattle.setVisible(false); -- this.a(true); -- this.n(); -+ spawnExitPortal(entityenderdragon); // Purpur -+ spawnGateway(entityenderdragon); // Purpur - if (getWorld().purpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg - this.d.setTypeUpdate(this.d.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData()); - } -@@ -368,21 +368,62 @@ public class EnderDragonBattle { - - } - -- private void n() { -- if (!this.e.isEmpty()) { -- int i = (Integer) this.e.remove(this.e.size() - 1); -+ // Purpur start -+ private void spawnGateway(EntityEnderDragon dragon) { n(dragon); } // Purpur - OBFHELPER -+ private void n(EntityEnderDragon entityenderdragon) { -+ if (!getGateways().isEmpty()) { -+ int i = getGateways().remove(getGateways().size() - 1); -+ // Purpur end - int j = MathHelper.floor(96.0D * Math.cos(2.0D * (-3.141592653589793D + 0.15707963267948966D * (double) i))); - int k = MathHelper.floor(96.0D * Math.sin(2.0D * (-3.141592653589793D + 0.15707963267948966D * (double) i))); - -- this.a(new BlockPosition(j, 75, k)); -+ // Purpur start -+ getWorld().captureBlockStates = true; -+ generateGateway(new BlockPosition(j, 75, k)); -+ getWorld().captureBlockStates = false; -+ if (getWorld().capturedBlockStates.size() > 0) { -+ org.bukkit.event.entity.EntityCreatePortalEvent event = new org.bukkit.event.entity.EntityCreatePortalEvent(entityenderdragon.getBukkitLivingEntity(), getWorld().capturedBlockStates.stream().map(state -> org.bukkit.craftbukkit.block.CraftBlockState.getBlockState(getWorld(), state.getPosition())).collect(java.util.stream.Collectors.toList()), org.bukkit.PortalType.END_GATEWAY); -+ if (!event.callEvent()) { -+ // put the gateway back into queue -+ getGateways().add(i); -+ // revert captured blocks -+ for (org.bukkit.craftbukkit.block.CraftBlockState state : getWorld().capturedBlockStates) { -+ state.update(true, false); -+ } -+ } -+ } -+ getWorld().capturedTileEntities.clear(); -+ getWorld().capturedBlockStates.clear(); -+ // Purpur end - } - } - -+ private void generateGateway(BlockPosition blockPosition) { a(blockPosition); } // Purpur - OBFHELPER - private void a(BlockPosition blockposition) { - this.d.triggerEffect(3000, blockposition, 0); - WorldGenerator.END_GATEWAY.b(WorldGenEndGatewayConfiguration.a()).a(this.d, this.d.getChunkProvider().getChunkGenerator(), new Random(), blockposition); // Paper - decompile fix - } - -+ // Purpur start -+ private void spawnExitPortal(EntityEnderDragon dragon) { -+ getWorld().captureBlockStates = true; -+ generateExitPortal(true); -+ getWorld().captureBlockStates = false; -+ if (getWorld().capturedBlockStates.size() > 0) { -+ org.bukkit.event.entity.EntityCreatePortalEvent event = new org.bukkit.event.entity.EntityCreatePortalEvent(dragon.getBukkitLivingEntity(), getWorld().capturedBlockStates.stream().map(state -> org.bukkit.craftbukkit.block.CraftBlockState.getBlockState(getWorld(), state.getPosition())).collect(java.util.stream.Collectors.toList()), org.bukkit.PortalType.ENDER); -+ if (!event.callEvent()) { -+ // revert captured blocks -+ for (org.bukkit.craftbukkit.block.CraftBlockState state : getWorld().capturedBlockStates) { -+ state.update(true); -+ } -+ } -+ } -+ getWorld().capturedTileEntities.clear(); -+ getWorld().capturedBlockStates.clear(); -+ } -+ // Purpur end -+ -+ private void generateExitPortal(boolean active) { a(active); } // Purpur - OBFHELPER - private void a(boolean flag) { - WorldGenEndTrophy worldgenendtrophy = new WorldGenEndTrophy(flag); - --- -2.24.0 - diff --git a/patches/server/0080-Implement-infinite-lava.patch b/patches/server/0079-Implement-infinite-lava.patch similarity index 94% rename from patches/server/0080-Implement-infinite-lava.patch rename to patches/server/0079-Implement-infinite-lava.patch index 2cab0e612..2c3e14eac 100644 --- a/patches/server/0080-Implement-infinite-lava.patch +++ b/patches/server/0079-Implement-infinite-lava.patch @@ -1,4 +1,4 @@ -From e333cb0d9b353fcd4828e679634afa442a06e992 Mon Sep 17 00:00:00 2001 +From e36bd62276b84bb6fc0684b7ce09f4a8b733cc24 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 @@ -11,7 +11,7 @@ Subject: [PATCH] Implement infinite lava 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index 376dca1889..c8abe61cf7 100644 +index 376dca188..c8abe61cf 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -219,7 +219,7 @@ public abstract class FluidTypeFlowing extends FluidType { @@ -38,7 +38,7 @@ index 376dca1889..c8abe61cf7 100644 protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) { diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index d25368d032..09f82c2d92 100644 +index d25368d03..09f82c2d9 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -56,7 +56,7 @@ index d25368d032..09f82c2d92 100644 protected boolean f() { return false; diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java -index 9eba9a12c0..39252e6873 100644 +index 9eba9a12c..39252e687 100644 --- a/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; @@ -69,7 +69,7 @@ index 9eba9a12c0..39252e6873 100644 protected boolean c; protected boolean d; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b82fc8d19f..059ecf375c 100644 +index b82fc8d19..059ecf375 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -155,6 +155,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0081-Phantoms-only-attack-insomniacs.patch b/patches/server/0080-Phantoms-only-attack-insomniacs.patch similarity index 95% rename from patches/server/0081-Phantoms-only-attack-insomniacs.patch rename to patches/server/0080-Phantoms-only-attack-insomniacs.patch index 8e1cafbb7..6c94eb288 100644 --- a/patches/server/0081-Phantoms-only-attack-insomniacs.patch +++ b/patches/server/0080-Phantoms-only-attack-insomniacs.patch @@ -1,4 +1,4 @@ -From ce7d5e2bf70c4e628dcfcaa3bf2f3ccc8c388d35 Mon Sep 17 00:00:00 2001 +From c01cdfacaaa03c66a34485f1722291bcc07be971 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 20:33:41 -0600 Subject: [PATCH] Phantoms only attack insomniacs @@ -10,7 +10,7 @@ Subject: [PATCH] Phantoms only attack insomniacs 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index ccc1ade4e4..af0828c28a 100644 +index 5cfa69b32..a98453665 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -392,8 +392,11 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -28,7 +28,7 @@ index ccc1ade4e4..af0828c28a 100644 } } diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 71c61dc45e..becf9d29e2 100644 +index 71c61dc45..becf9d29e 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -25,6 +25,7 @@ public final class IEntitySelector { @@ -40,7 +40,7 @@ index 71c61dc45e..becf9d29e2 100644 public static Predicate a(double d0, double d1, double d2, double d3) { double d4 = d3 * d3; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 148fc22ff7..46dc8cf79a 100644 +index 148fc22ff..46dc8cf79 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -230,10 +230,12 @@ public class PurpurConfig { diff --git a/patches/server/0082-Villagers-follow-emerald-blocks.patch b/patches/server/0081-Villagers-follow-emerald-blocks.patch similarity index 95% rename from patches/server/0082-Villagers-follow-emerald-blocks.patch rename to patches/server/0081-Villagers-follow-emerald-blocks.patch index 7d06c32af..6ad8800a7 100644 --- a/patches/server/0082-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0081-Villagers-follow-emerald-blocks.patch @@ -1,4 +1,4 @@ -From 385090164807e54ddd4dca86616de161b6d7fb8f Mon Sep 17 00:00:00 2001 +From 48a7b50eaee27e05f1684414d1d21302d5fafa4c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:10:12 -0600 Subject: [PATCH] Villagers follow emerald blocks @@ -9,7 +9,7 @@ Subject: [PATCH] Villagers follow emerald blocks 2 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 4187bb6026..d8cbe549d4 100644 +index cd8da30a1..9415abeab 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -25,6 +25,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent; @@ -37,7 +37,7 @@ index 4187bb6026..d8cbe549d4 100644 public BehaviorController getBehaviorController() { return (BehaviorController) super.getBehaviorController(); // CraftBukkit - decompile error diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 46dc8cf79a..81f41ccc77 100644 +index 46dc8cf79..81f41ccc7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -255,10 +255,12 @@ public class PurpurConfig { diff --git a/patches/server/0083-Add-charged-creeper-spawn-chance.patch b/patches/server/0082-Add-charged-creeper-spawn-chance.patch similarity index 95% rename from patches/server/0083-Add-charged-creeper-spawn-chance.patch rename to patches/server/0082-Add-charged-creeper-spawn-chance.patch index 54a097b0e..315becc7e 100644 --- a/patches/server/0083-Add-charged-creeper-spawn-chance.patch +++ b/patches/server/0082-Add-charged-creeper-spawn-chance.patch @@ -1,4 +1,4 @@ -From 19c255144560ce388e919ed5844ec2d4f8ebb267 Mon Sep 17 00:00:00 2001 +From 0ddcaa13c2b1d7dd3a4f57fec987731661dc1d2e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:37:44 -0600 Subject: [PATCH] Add charged creeper spawn chance @@ -9,7 +9,7 @@ Subject: [PATCH] Add charged creeper spawn chance 2 files changed, 21 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index ebae462807..5dd9a57234 100644 +index d1acd38f9..cc155fa34 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -1,11 +1,16 @@ @@ -48,7 +48,7 @@ index ebae462807..5dd9a57234 100644 public void b(NBTTagCompound nbttagcompound) { super.b(nbttagcompound); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 81f41ccc77..544c68b0d8 100644 +index 81f41ccc7..544c68b0d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -208,6 +208,11 @@ public class PurpurConfig { diff --git a/patches/server/0084-Despawn-egg-hatches-chicken.patch b/patches/server/0083-Despawn-egg-hatches-chicken.patch similarity index 95% rename from patches/server/0084-Despawn-egg-hatches-chicken.patch rename to patches/server/0083-Despawn-egg-hatches-chicken.patch index 4c496a6af..41e78ec26 100644 --- a/patches/server/0084-Despawn-egg-hatches-chicken.patch +++ b/patches/server/0083-Despawn-egg-hatches-chicken.patch @@ -1,4 +1,4 @@ -From 70da9dd4f68ee591b2fb3fe9013382676cd66e0d Mon Sep 17 00:00:00 2001 +From 4c2f2df79ce26a005dd1306c9b49c5d027ee74f4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 23:47:42 -0600 Subject: [PATCH] Despawn egg hatches chicken @@ -9,7 +9,7 @@ Subject: [PATCH] Despawn egg hatches chicken 2 files changed, 28 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index e61af3f5eb..184b2a015a 100644 +index d15a9fcfb..6d78c427d 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -165,6 +165,27 @@ public class EntityItem extends Entity { @@ -41,7 +41,7 @@ index e61af3f5eb..184b2a015a 100644 Vec3D vec3d = this.getMot(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 059ecf375c..a773d5dc76 100644 +index 059ecf375..a773d5dc7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -173,6 +173,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0085-Option-for-hay-block-fall-damage.patch b/patches/server/0084-Option-for-hay-block-fall-damage.patch similarity index 92% rename from patches/server/0085-Option-for-hay-block-fall-damage.patch rename to patches/server/0084-Option-for-hay-block-fall-damage.patch index 57dd5d5be..3d9d402b7 100644 --- a/patches/server/0085-Option-for-hay-block-fall-damage.patch +++ b/patches/server/0084-Option-for-hay-block-fall-damage.patch @@ -1,4 +1,4 @@ -From e2b99918b8f7f859a285957c6292e3ddd21de737 Mon Sep 17 00:00:00 2001 +From 3ef828793968a61f4bc4c8f985fc84273b021864 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 01:31:09 -0600 Subject: [PATCH] Option for hay block fall damage @@ -9,7 +9,7 @@ Subject: [PATCH] Option for hay block fall damage 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/BlockHay.java b/src/main/java/net/minecraft/server/BlockHay.java -index ca81c49f0a..ca8f957989 100644 +index ca81c49f0..ca8f95798 100644 --- a/src/main/java/net/minecraft/server/BlockHay.java +++ b/src/main/java/net/minecraft/server/BlockHay.java @@ -9,6 +9,6 @@ public class BlockHay extends BlockRotatable { @@ -21,7 +21,7 @@ index ca81c49f0a..ca8f957989 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a773d5dc76..de793add46 100644 +index a773d5dc7..de793add4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -155,6 +155,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Add-sleep-options.patch b/patches/server/0085-Add-sleep-options.patch similarity index 96% rename from patches/server/0086-Add-sleep-options.patch rename to patches/server/0085-Add-sleep-options.patch index ce606aca8..5b5db6013 100644 --- a/patches/server/0086-Add-sleep-options.patch +++ b/patches/server/0085-Add-sleep-options.patch @@ -1,4 +1,4 @@ -From f9e503e9a1b4aa1513cb1e4dfc0200a16933651d Mon Sep 17 00:00:00 2001 +From f6eae13433bd413fc12bac0945ea602f7560dbc3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 03:30:17 -0600 Subject: [PATCH] Add sleep options @@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 3c9f180960..e1301d3170 100644 +index 9d26bd1e4..7b54b02e2 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -14,6 +14,11 @@ import java.util.OptionalInt; @@ -73,7 +73,7 @@ index 3c9f180960..e1301d3170 100644 return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index de793add46..f81c0cde39 100644 +index de793add4..f81c0cde3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -178,6 +178,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Make-the-GUI-better.patch b/patches/server/0086-Make-the-GUI-better.patch similarity index 99% rename from patches/server/0087-Make-the-GUI-better.patch rename to patches/server/0086-Make-the-GUI-better.patch index d92ae6002..341470750 100644 --- a/patches/server/0087-Make-the-GUI-better.patch +++ b/patches/server/0086-Make-the-GUI-better.patch @@ -1,4 +1,4 @@ -From 18b9102c49cd9cf5d273bca99ea956b79baa31eb Mon Sep 17 00:00:00 2001 +From e61e156fbc28b8c3ec867428fa4814df04e78b07 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 16 Jan 2020 14:59:16 -0600 Subject: [PATCH] Make the GUI better diff --git a/patches/server/0088-Disable-outdated-build-check.patch b/patches/server/0087-Disable-outdated-build-check.patch similarity index 94% rename from patches/server/0088-Disable-outdated-build-check.patch rename to patches/server/0087-Disable-outdated-build-check.patch index ca6b551a8..06d97b8a8 100644 --- a/patches/server/0088-Disable-outdated-build-check.patch +++ b/patches/server/0087-Disable-outdated-build-check.patch @@ -1,4 +1,4 @@ -From 575046416748239741024cd3f2ed453860aa17bb Mon Sep 17 00:00:00 2001 +From 8be74ef793ffcd377ddebaa4a23f47fe11ea68ed Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 15 Dec 2019 12:53:59 -0600 Subject: [PATCH] Disable outdated build check diff --git a/patches/server/0089-Add-option-for-zombie-villager-transformation-chance.patch b/patches/server/0088-Add-option-for-zombie-villager-transformation-chance.patch similarity index 95% rename from patches/server/0089-Add-option-for-zombie-villager-transformation-chance.patch rename to patches/server/0088-Add-option-for-zombie-villager-transformation-chance.patch index 50fbb9d3f..d9d070994 100644 --- a/patches/server/0089-Add-option-for-zombie-villager-transformation-chance.patch +++ b/patches/server/0088-Add-option-for-zombie-villager-transformation-chance.patch @@ -1,4 +1,4 @@ -From 68a4b563397296fe762231c5cd9733b69fa83a0d Mon Sep 17 00:00:00 2001 +From 733bfd9678905290d1543d825475c93c71dad3b1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 19 Dec 2019 16:59:46 -0600 Subject: [PATCH] Add option for zombie villager transformation chance @@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombie villager transformation chance 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index e9da244d98..0f0df08fff 100644 +index 11171b4a1..b6ec0b34b 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -457,8 +457,19 @@ public class EntityZombie extends EntityMonster { @@ -35,7 +35,7 @@ index e9da244d98..0f0df08fff 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f81c0cde39..69b3bef766 100644 +index f81c0cde3..69b3bef76 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -230,4 +230,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0090-Add-natural-cat-spawning-options.patch b/patches/server/0089-Add-natural-cat-spawning-options.patch similarity index 96% rename from patches/server/0090-Add-natural-cat-spawning-options.patch rename to patches/server/0089-Add-natural-cat-spawning-options.patch index c14c69736..cf3d822e7 100644 --- a/patches/server/0090-Add-natural-cat-spawning-options.patch +++ b/patches/server/0089-Add-natural-cat-spawning-options.patch @@ -1,4 +1,4 @@ -From cbeb79089f1039cc7fd2d627c129912a17e1370f Mon Sep 17 00:00:00 2001 +From ebb0e6e3c822041d403a5dd9a3b6d620a4f88283 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 18:52:55 -0600 Subject: [PATCH] Add natural cat spawning options @@ -9,7 +9,7 @@ Subject: [PATCH] Add natural cat spawning options 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java -index 6024478dc0..034b973365 100644 +index 6024478dc..034b97336 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerCat.java +++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java @@ -15,7 +15,7 @@ public class MobSpawnerCat { @@ -54,7 +54,7 @@ index 6024478dc0..034b973365 100644 return list.size() < 1 ? this.a(blockposition, world) : 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 69b3bef766..3bb968cfa1 100644 +index 69b3bef76..3bb968cfa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -185,6 +185,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0091-Add-player-death-exp-control-options.patch b/patches/server/0090-Add-player-death-exp-control-options.patch similarity index 97% rename from patches/server/0091-Add-player-death-exp-control-options.patch rename to patches/server/0090-Add-player-death-exp-control-options.patch index c282fc8fd..048010b5e 100644 --- a/patches/server/0091-Add-player-death-exp-control-options.patch +++ b/patches/server/0090-Add-player-death-exp-control-options.patch @@ -1,4 +1,4 @@ -From d0783acf1d4f859da0f39bd0f9c36fa502734160 Mon Sep 17 00:00:00 2001 +From 8d9bb64a27b05a9a4fa1f3d89929feecec49b475 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 22:08:37 -0600 Subject: [PATCH] Add player death exp control options diff --git a/patches/server/0092-Add-permission-for-F3-N-debug.patch b/patches/server/0091-Add-permission-for-F3-N-debug.patch similarity index 89% rename from patches/server/0092-Add-permission-for-F3-N-debug.patch rename to patches/server/0091-Add-permission-for-F3-N-debug.patch index 5e780fd42..601d80244 100644 --- a/patches/server/0092-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0091-Add-permission-for-F3-N-debug.patch @@ -1,4 +1,4 @@ -From d68dc2c5a6cb27488c852b356336f27e6697da48 Mon Sep 17 00:00:00 2001 +From d4c5efa50f98f5145db47706ff596eb53e59bb78 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 28 Dec 2019 04:21:54 -0600 Subject: [PATCH] Add permission for F3+N debug @@ -8,7 +8,7 @@ Subject: [PATCH] Add permission for F3+N debug 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6398c367f9..c48933cd6f 100644 +index 6398c367f..c48933cd6 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -904,6 +904,7 @@ public abstract class PlayerList { diff --git a/patches/server/0093-Add-obfhelpers-for-plugin-use.patch b/patches/server/0092-Add-obfhelpers-for-plugin-use.patch similarity index 93% rename from patches/server/0093-Add-obfhelpers-for-plugin-use.patch rename to patches/server/0092-Add-obfhelpers-for-plugin-use.patch index 46e9a4133..0acce5cef 100644 --- a/patches/server/0093-Add-obfhelpers-for-plugin-use.patch +++ b/patches/server/0092-Add-obfhelpers-for-plugin-use.patch @@ -1,4 +1,4 @@ -From 3ed90a827a45880fa95d0f568ffb6839c9c75372 Mon Sep 17 00:00:00 2001 +From e73415b5d39a42a222870c3be5d3d27802d2a762 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 1 Jan 2020 20:12:39 -0600 Subject: [PATCH] Add obfhelpers for plugin use @@ -10,7 +10,7 @@ Subject: [PATCH] Add obfhelpers for plugin use 3 files changed, 4 insertions(+) diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java -index fb97c51bb1..50ed4001d1 100644 +index fb97c51bb..50ed4001d 100644 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java @@ -145,6 +145,7 @@ public interface IChatBaseComponent extends Message, Iterable Date: Thu, 2 Jan 2020 01:23:22 -0600 Subject: [PATCH] Fix non black cat types spawning in swamp huts @@ -8,7 +8,7 @@ Subject: [PATCH] Fix non black cat types spawning in swamp huts 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java -index 034b973365..cc2f37869a 100644 +index 034b97336..cc2f37869 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerCat.java +++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java @@ -82,8 +82,9 @@ public class MobSpawnerCat { diff --git a/patches/server/0095-Make-lava-flow-speed-configurable.patch b/patches/server/0094-Make-lava-flow-speed-configurable.patch similarity index 93% rename from patches/server/0095-Make-lava-flow-speed-configurable.patch rename to patches/server/0094-Make-lava-flow-speed-configurable.patch index 129fb8d63..c980fa430 100644 --- a/patches/server/0095-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0094-Make-lava-flow-speed-configurable.patch @@ -1,4 +1,4 @@ -From 5174d846270dbb9edca5f00a66f4b089d9d161f7 Mon Sep 17 00:00:00 2001 +From 8306390fb9aa91c6d9ab57b7e4cd78b7207bb070 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 11:31:36 -0600 Subject: [PATCH] Make lava flow speed configurable @@ -10,7 +10,7 @@ Subject: [PATCH] Make lava flow speed configurable 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index 09f82c2d92..360470142a 100644 +index 09f82c2d9..360470142 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -129,7 +129,10 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { @@ -26,7 +26,7 @@ index 09f82c2d92..360470142a 100644 @Override diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java -index 39252e6873..75f8441ab6 100644 +index 39252e687..75f8441ab 100644 --- a/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java @@ -42,6 +42,7 @@ public abstract class WorldProvider { @@ -38,7 +38,7 @@ index 39252e6873..75f8441ab6 100644 return this.d; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 915b3beb2b..a49ccf2898 100644 +index 915b3beb2..a49ccf289 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -161,8 +161,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0096-Add-EntityPortalReadyEvent.patch b/patches/server/0095-Add-EntityPortalReadyEvent.patch similarity index 98% rename from patches/server/0096-Add-EntityPortalReadyEvent.patch rename to patches/server/0095-Add-EntityPortalReadyEvent.patch index b9da8328e..d9537f43d 100644 --- a/patches/server/0096-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0095-Add-EntityPortalReadyEvent.patch @@ -1,4 +1,4 @@ -From a8ae7468ad8c26276f01c7e028bb3a123399079c Mon Sep 17 00:00:00 2001 +From 9285ac973fec6e1944d6d751e08ae6c364bb6ba5 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 11 Jan 2020 23:12:52 -0600 Subject: [PATCH] Add EntityPortalReadyEvent @@ -86,7 +86,7 @@ index 2dc3ab4cf..1c0df77c2 100644 break; // CraftBukkit start - add the block to our list diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c24f7071a..053db1781 100644 +index d9963d1e4..1ea2120f0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -171,9 +171,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0097-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0096-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 96% rename from patches/server/0097-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0096-Add-wither-skeleton-takes-wither-damage-option.patch index 23218f9de..b6a514b90 100644 --- a/patches/server/0097-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0096-Add-wither-skeleton-takes-wither-damage-option.patch @@ -1,4 +1,4 @@ -From 832e1674894790e314de7c3793663fd64d85e139 Mon Sep 17 00:00:00 2001 +From 99826e344122c384777f3bfc6b61114897b6f3e8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 14 Jan 2020 19:43:40 -0600 Subject: [PATCH] Add wither skeleton takes wither damage option diff --git a/patches/server/0098-UPnP-Port-Forwarding-Service.patch b/patches/server/0097-UPnP-Port-Forwarding-Service.patch similarity index 99% rename from patches/server/0098-UPnP-Port-Forwarding-Service.patch rename to patches/server/0097-UPnP-Port-Forwarding-Service.patch index 5a040ab1e..0ef4cf9c7 100644 --- a/patches/server/0098-UPnP-Port-Forwarding-Service.patch +++ b/patches/server/0097-UPnP-Port-Forwarding-Service.patch @@ -1,4 +1,4 @@ -From 8ad191ed672a2729f636aa6dba1474fdabcfb28f Mon Sep 17 00:00:00 2001 +From 81c7a70af91041e318331cd9b6861085d7e898fe Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service