Fix API side of resizing barrels and ender chests

patches/api/0016-Allow-inventory-resizing.patch

@@ -0,0 +1,38 @@
+From 32525a0275809f982d4a3bd9dbc37d760198aa26 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Tue, 23 Jul 2019 06:50:55 -0500
+Subject: [PATCH] Allow inventory resizing
+
+---
+ .../java/org/bukkit/event/inventory/InventoryType.java    | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
+index 75e719ae8..fb7abc2a5 100644
+--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
++++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
+@@ -128,7 +128,7 @@ public enum InventoryType {
+     STONECUTTER(2, "Stonecutter")
+     ;
+ 
+-    private final int size;
++    private int size; // Purpur - remove final
+     private final String title;
+     private final boolean isCreatable;
+ 
+@@ -142,6 +142,12 @@ public enum InventoryType {
+         this.isCreatable = isCreatable;
+     }
+ 
++    // Purpur start
++    public void setDefaultSize(int size) {
++        this.size = size;
++    }
++    // Purpur end
++
+     public int getDefaultSize() {
+         return size;
+     }
+-- 
+2.20.1
+

patches/server/0019-Packed-Barrels.patch

@@ -1,15 +1,16 @@
-From 8dc2ee35820c0782581ad1fb5f17927d63a7ad79 Mon Sep 17 00:00:00 2001
+From 993318eb6baed6171d9aaf0ff23de8a317d264a0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Packed Barrels
 
 ---
- src/main/java/net/minecraft/server/TileEntityBarrel.java | 5 +++--
- src/main/java/net/pl3x/purpur/PurpurConfig.java          | 5 +++++
- 2 files changed, 8 insertions(+), 2 deletions(-)
+ src/main/java/net/minecraft/server/TileEntityBarrel.java   | 5 +++--
+ src/main/java/net/pl3x/purpur/PurpurConfig.java            | 7 +++++++
+ .../org/bukkit/craftbukkit/inventory/CraftContainer.java   | 4 ++++
+ 3 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
-index 76f298336..befb47d4d 100644
+index 5d80ec8010..dd8c6e8876 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
 @@ -56,7 +56,7 @@ public class TileEntityBarrel extends TileEntityLootable {
@@ -39,21 +40,53 @@ index 76f298336..befb47d4d 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index cbb163c0d..0b4a0f4b8 100644
+index 4d0d7a9dad..3fe87c2daa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -162,6 +162,11 @@ public class PurpurConfig {
+@@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
+ import org.bukkit.command.Command;
+ import org.bukkit.configuration.InvalidConfigurationException;
+ import org.bukkit.configuration.file.YamlConfiguration;
++import org.bukkit.event.inventory.InventoryType;
+ 
+ import java.io.File;
+ import java.io.IOException;
+@@ -162,6 +163,12 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
  
 +    public static boolean packedBarrels = true;
 +    private static void packedBarrels() {
 +        packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
++        InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
 +    }
 +
      public static boolean ridableBat = true;
      public static boolean ridableBlaze = true;
      public static boolean ridableCat = true;
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+index ae119756be..5ee6fc1629 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+@@ -155,6 +155,8 @@ public class CraftContainer extends Container {
+                 return Containers.GRINDSTONE;
+             case STONECUTTER:
+                 return Containers.STONECUTTER;
++            case BARREL:
++                return net.pl3x.purpur.PurpurConfig.packedBarrels ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3;
+             default:
+                 return Containers.GENERIC_9X3;
+         }
+@@ -168,7 +170,9 @@ public class CraftContainer extends Container {
+             case PLAYER:
+             case CHEST:
+             case ENDER_CHEST:
++                delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); break; // Purpur
+             case BARREL:
++                if (net.pl3x.purpur.PurpurConfig.packedBarrels) delegate = new ContainerChest(Containers.GENERIC_9X6, windowId, bottom, top, top.getSize() / 9); // Purpur
+                 delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
+                 break;
+             case DISPENSER:
 -- 
 2.20.1
 

patches/server/0024-Always-place-dragon-egg-when-dragon-is-killed.patch

@@ -1,4 +1,4 @@
-From 00ac20d89cee1272dafa6fdf3fae0ea034e93d6f Mon Sep 17 00:00:00 2001
+From e5202baf3ef1fdd42ba0f61adc8b914fde3bf157 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 1 Jun 2019 01:16:35 -0500
 Subject: [PATCH] Always place dragon egg when dragon is killed
@@ -9,7 +9,7 @@ Subject: [PATCH] Always place dragon egg when dragon is killed
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 6700c8c65..f0c77eb6c 100644
+index 6700c8c658..f0c77eb6c1 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -13,6 +13,8 @@ import java.util.Set;
@@ -31,11 +31,11 @@ index 6700c8c65..f0c77eb6c 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0b4a0f4b8..48c8da91e 100644
+index 3fe87c2daa..4c78758e78 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 {
-         packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
+@@ -169,6 +169,11 @@ public class PurpurConfig {
+         InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
      }
  
 +    public static boolean enderDragonDeathAlwaysPlacesEggBlock = true;

patches/server/0031-Make-Iron-Golems-Swim.patch

@@ -1,4 +1,4 @@
-From 0499d98e81084bfbc08ce063be99a3eb30487494 Mon Sep 17 00:00:00 2001
+From dcd4e2277b3f13c979904300f53757a72935ceab Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 15 Jun 2019 03:12:15 -0500
 Subject: [PATCH] Make Iron Golems Swim
@@ -21,10 +21,10 @@ index 2c34ab337a..9bb033336c 100644
          this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 48c8da91e3..ad373d20c1 100644
+index 4c78758e78..9cd05d37ed 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -155,6 +155,11 @@ public class PurpurConfig {
+@@ -156,6 +156,11 @@ public class PurpurConfig {
          giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
      }
  

patches/server/0032-Phantoms-spawn-naturally-in-the-end.patch

@@ -1,4 +1,4 @@
-From f35c78a29ecb482e9b5c2e7505af39d17c8a587b Mon Sep 17 00:00:00 2001
+From 8b27ca142306231130854439df63def114455547 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 20 Jun 2019 18:48:58 -0500
 Subject: [PATCH] Phantoms spawn naturally in the end
@@ -89,10 +89,10 @@ index 5e6559df0b..490445cefa 100644
                                                      EntityPositionTypes.Surface entitypositiontypes_surface = EntityPositionTypes.a(entitytypes);
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 261368073f..4516c86b79 100644
+index 9cd05d37ed..7dac34a6cd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -160,6 +160,11 @@ public class PurpurConfig {
+@@ -161,6 +161,11 @@ public class PurpurConfig {
          ironGolemSwims = getBoolean("settings.mobs.iron_golem.swims", ironGolemSwims);
      }
  

patches/server/0035-Add-large-sized-ender-chests.patch

@@ -1,16 +1,17 @@
-From edf6ac3246ffab78012b980495f40f203a84d5c7 Mon Sep 17 00:00:00 2001
+From b0ef60387187bdb7ccbe1e5f04e972902fe34d54 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 23 Jun 2019 17:01:26 -0500
 Subject: [PATCH] Add large sized ender chests
 
 ---
- src/main/java/net/minecraft/server/BlockEnderChest.java     | 1 +
- src/main/java/net/minecraft/server/InventoryEnderChest.java | 2 +-
- src/main/java/net/pl3x/purpur/PurpurConfig.java             | 5 +++++
- 3 files changed, 7 insertions(+), 1 deletion(-)
+ src/main/java/net/minecraft/server/BlockEnderChest.java   | 1 +
+ .../java/net/minecraft/server/InventoryEnderChest.java    | 2 +-
+ src/main/java/net/pl3x/purpur/PurpurConfig.java           | 6 ++++++
+ .../org/bukkit/craftbukkit/inventory/CraftContainer.java  | 8 +++++++-
+ 4 files changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
-index 4b7290238..fc5227683 100644
+index 4b72902385..fc52276836 100644
 --- a/src/main/java/net/minecraft/server/BlockEnderChest.java
 +++ b/src/main/java/net/minecraft/server/BlockEnderChest.java
 @@ -46,6 +46,7 @@ public class BlockEnderChest extends BlockTileEntity implements IBlockWaterlogge
@@ -22,7 +23,7 @@ index 4b7290238..fc5227683 100644
                  }, BlockEnderChest.d));
                  entityhuman.a(StatisticList.OPEN_ENDERCHEST);
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index fd31b9a6d..49b369236 100644
+index fd31b9a6dc..49b369236d 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -20,7 +20,7 @@ public class InventoryEnderChest extends InventorySubcontainer {
@@ -35,21 +36,48 @@ index fd31b9a6d..49b369236 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 233805175..a86b3fc9c 100644
+index 7dac34a6cd..abdbf21775 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 {
+@@ -173,6 +173,12 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
  
 +    public static boolean largeEnderChests = true;
 +    private static void largeEnderChests() {
 +        largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
++        InventoryType.ENDER_CHEST.setDefaultSize(largeEnderChests ? 54 : 27);
 +    }
 +
      public static boolean packedBarrels = true;
      private static void packedBarrels() {
          packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+index 5ee6fc1629..fef1a774bc 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+@@ -157,6 +157,8 @@ public class CraftContainer extends Container {
+                 return Containers.STONECUTTER;
+             case BARREL:
+                 return net.pl3x.purpur.PurpurConfig.packedBarrels ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3;
++            case ENDER_CHEST:
++                return net.pl3x.purpur.PurpurConfig.largeEnderChests ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3;
+             default:
+                 return Containers.GENERIC_9X3;
+         }
+@@ -170,7 +172,11 @@ public class CraftContainer extends Container {
+             case PLAYER:
+             case CHEST:
+             case ENDER_CHEST:
+-                delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); break; // Purpur
++                // Purpur start
++                if (net.pl3x.purpur.PurpurConfig.largeEnderChests) delegate = new ContainerChest(Containers.GENERIC_9X6, windowId, bottom, top, top.getSize() / 9);
++                delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
++                break;
++                // Purpur end
+             case BARREL:
+                 if (net.pl3x.purpur.PurpurConfig.packedBarrels) delegate = new ContainerChest(Containers.GENERIC_9X6, windowId, bottom, top, top.getSize() / 9); // Purpur
+                 delegate = new ContainerChest(Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9);
 -- 
 2.20.1
 

patches/server/0036-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From 080d4114cbcffb26519aaa21692c0216cd956765 Mon Sep 17 00:00:00 2001
+From 76d44d6f1cccb6c1804bdf56fcd5b87b8fc237cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -111,7 +111,7 @@ index ec96fa0a43..9ad3cc2982 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 128d03ed74..154ba7ba6b 100644
+index abdbf21775..e0077674c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,9 +1,13 @@
@@ -127,8 +127,8 @@ index 128d03ed74..154ba7ba6b 100644
 +import org.bukkit.configuration.ConfigurationSection;
  import org.bukkit.configuration.InvalidConfigurationException;
  import org.bukkit.configuration.file.YamlConfiguration;
- 
-@@ -303,4 +307,30 @@ public class PurpurConfig {
+ import org.bukkit.event.inventory.InventoryType;
+@@ -306,4 +310,30 @@ public class PurpurConfig {
          ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman);
          ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager);
      }

patches/server/0037-Disable-loot-drops-on-death-by-cramming.patch

@@ -1,4 +1,4 @@
-From 87e1f98c33d608083081aee10c11fcbb2d714d00 Mon Sep 17 00:00:00 2001
+From bcfaef046a1ad3737f886fbb6f37e9c0ec992911 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 3 Jul 2019 23:58:31 -0500
 Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
  2 files changed, 7 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 53cf6fc39..c00918a7a 100644
+index 6b8bf2d63b..a14553a799 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1420,8 +1420,10 @@ public abstract class EntityLiving extends Entity {
@@ -24,10 +24,10 @@ index 53cf6fc39..c00918a7a 100644
              deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
              if (!deathEvent.isCancelled()) this.drops = new ArrayList<org.bukkit.inventory.ItemStack>(); // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 99c13caee..f7c63ef91 100644
+index e0077674c1..7cd70519e8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -142,6 +142,11 @@ public class PurpurConfig {
+@@ -143,6 +143,11 @@ public class PurpurConfig {
          enableTPSCatchup = getBoolean("settings.enable-tps-catchup", enableTPSCatchup);
      }
  

patches/server/0038-Make-illusioners-naturally-spawn.patch

@@ -1,4 +1,4 @@
-From 6a6aa821f7e6fb1d2ae2b46ca3ce0c64dce1f489 Mon Sep 17 00:00:00 2001
+From a6283f88383f06691c84414147b412ba0450c2e6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 11:09:25 -0500
 Subject: [PATCH] Make illusioners naturally spawn
@@ -9,7 +9,7 @@ Subject: [PATCH] Make illusioners naturally spawn
  2 files changed, 23 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
-index 3f7f7a2de..38284a62b 100644
+index 3f7f7a2de8..38284a62b9 100644
 --- a/src/main/java/net/minecraft/server/Biomes.java
 +++ b/src/main/java/net/minecraft/server/Biomes.java
 @@ -112,6 +112,24 @@ public abstract class Biomes {
@@ -38,10 +38,10 @@ index 3f7f7a2de..38284a62b 100644
  
      private static void addSpawn(String biome, EnumCreatureType ct, EntityTypes et, int weight, int min_group, int max_group) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f7c63ef91..bbec3faaa 100644
+index 7cd70519e8..bbfebfda8f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -164,6 +164,11 @@ public class PurpurConfig {
+@@ -165,6 +165,11 @@ public class PurpurConfig {
          giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
      }
  

patches/server/0041-Dont-send-useless-entity-packets.patch

@@ -1,4 +1,4 @@
-From 5e072a93830368611f80eac1cb8a681596c1e378 Mon Sep 17 00:00:00 2001
+From 3535761321b4a1ff530527e568841def7ca9c4cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
@@ -10,7 +10,7 @@ Subject: [PATCH] Dont send useless entity packets
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 460c687d3..61af5a99f 100644
+index 460c687d3e..61af5a99f7 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -162,6 +162,7 @@ public class EntityTrackerEntry {
@@ -45,7 +45,7 @@ index 460c687d3..61af5a99f 100644
          this.tracker.c(entityplayer);
          entityplayer.c(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index 1a9802e75..4c5a52c80 100644
+index 1a9802e755..4c5a52c802 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -5,11 +5,11 @@ import java.io.IOException;
@@ -66,10 +66,10 @@ index 1a9802e75..4c5a52c80 100644
      protected boolean h;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index bbec3faaa..c60f00a55 100644
+index bbfebfda8f..b4bd26cf5f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -147,6 +147,11 @@ public class PurpurConfig {
+@@ -148,6 +148,11 @@ public class PurpurConfig {
          disableDropsOnCrammingDeath = getBoolean("settings.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
      }
  

patches/server/0042-Fix-item-position-desync-MC-4.patch

@@ -1,4 +1,4 @@
-From 15774d3db02243b018c5f30667d24054caa08c27 Mon Sep 17 00:00:00 2001
+From 78c2722560ed08cbc5e22f823b6638045ac4e414 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] Fix item position desync (MC-4)
@@ -10,7 +10,7 @@ Subject: [PATCH] Fix item position desync (MC-4)
  3 files changed, 13 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 61af5a99f..b271e9ace 100644
+index 61af5a99f7..b271e9aced 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -124,6 +124,12 @@ public class EntityTrackerEntry {
@@ -27,7 +27,7 @@ index 61af5a99f..b271e9ace 100644
                  boolean flag1 = vec3d.g() >= 7.62939453125E-6D;
                  Packet<?> packet1 = null;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index 4c5a52c80..9ec3495d5 100644
+index 4c5a52c802..9ec3495d58 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -13,10 +13,12 @@ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
@@ -44,10 +44,10 @@ index 4c5a52c80..9ec3495d5 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c60f00a55..8001ecaab 100644
+index b4bd26cf5f..a3197414a9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -152,6 +152,11 @@ public class PurpurConfig {
+@@ -153,6 +153,11 @@ public class PurpurConfig {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
  

patches/server/0051-Tulips-change-fox-type.patch

@@ -1,4 +1,4 @@
-From c979581487a50fbb9cb58ea2e7c38131a4c80a78 Mon Sep 17 00:00:00 2001
+From 87de3aa9cbefd8013634bdb1273a3db75be5bd21 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type
@@ -77,10 +77,10 @@ index 987297634c..eed256349d 100644
      public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
      public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8001ecaab5..255b8badc0 100644
+index a3197414a9..8cf0d27931 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 {
+@@ -168,6 +168,11 @@ public class PurpurConfig {
          feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
      }
  

patches/server/0052-Mending-mends-most-damages-equipment-first.patch

@@ -1,4 +1,4 @@
-From 3ab5a5ec84a8ef85e6dbfe5b875fdf047de9c92e Mon Sep 17 00:00:00 2001
+From 8b08ce21aecf36ba70992db752a5ef348e955001 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first
@@ -58,10 +58,10 @@ index 1a98442e08..8a4eedb747 100644
                  if (entry != null) {
                      ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 255b8badc0..3222c7bec6 100644
+index 8cf0d27931..d8321e8ec3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -157,6 +157,11 @@ public class PurpurConfig {
+@@ -158,6 +158,11 @@ public class PurpurConfig {
          fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
      }