Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly Paper Changes: 5b123cd1 [CI-SKIP] [Auto] Rebuild Patches becb478c Add ignore discounts API 9e90c15f Add custom ranges to beacons 068313fa Item no age & no player pickup 1b3c20f9 Fix client lag on advancement loading (#4710) c596edb1 [CI-SKIP] Update IRC information in readme and config (#4751) a936a413 [Auto] Updated Upstream (Bukkit)
2026-02-17 16:37:43 +01:00 · 2020-11-11 11:59:54 -06:00
parent a295636d23
commit ef45666757
19 changed files with 52 additions and 124 deletions
--- a/2
+++ b/2
--- a/2
+++ b/2
@@ -1 +1 @@
-1.16.4--7f6a342cfc7f178d5fa99a3b5ca3215319394293
+1.16.4--
--- a/patches/api/0029-Item-entity-immunities.patch
+++ b/patches/api/0029-Item-entity-immunities.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Item entity immunities


 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index c404a5b8e..554d9bd30 100644
+index 0ee07264..bc1f3f1c 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
-@@ -91,4 +91,34 @@ public interface Item extends Entity {
+@@ -120,4 +120,34 @@ public interface Item extends Entity {
      */
-     public void setCanMobPickup(boolean canMobPickup);
+     public void setWillAge(boolean willAge);
     // Paper end
 +
 +    // Purpur start
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand


 diff --git a/pom.xml b/pom.xml
-index 78c2a8bbcc..0c982c3f0e 100644
+index 78c2a8bbc..0c982c3f0 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -1,11 +1,11 @@
@@ -85,7 +85,7 @@ index 78c2a8bbcc..0c982c3f0e 100644
                 </configuration>
                 <executions>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 74ed02fa92..c1280478ee 100644
+index 74ed02fa9..c1280478e 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -98,7 +98,7 @@ index 74ed02fa92..c1280478ee 100644
                 .completer(new ConsoleCommandCompleter(this.server))
         );
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index 229c3b0f0c..f88cf526d2 100644
+index 229c3b0f0..f88cf526d 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
@@ -70,7 +70,7 @@ public class EULA {
@@ -111,7 +111,7 @@ index 229c3b0f0c..f88cf526d2 100644
                     throwable = throwable1;
                     throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 08518ff57b..b6aa6454e2 100644
+index 08518ff57..b6aa6454e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1514,7 +1514,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -125,7 +125,7 @@ index 08518ff57b..b6aa6454e2 100644
     public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 new file mode 100644
-index 0000000000..d8b408f061
+index 000000000..d8b408f06
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
@@ -0,0 +1,115 @@
@@ -245,7 +245,7 @@ index 0000000000..d8b408f061
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9bf854b5a2..260d3513ec 100644
+index 9bf854b5a..260d3513e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
@@ -258,10 +258,10 @@ index 9bf854b5a2..260d3513ec 100644
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ed926fc6eb..3d2fcb5e8a 100644
+index 0f7f1503d..65a85f226 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -347,7 +347,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -353,7 +353,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
 
     @Override
     public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -271,7 +271,7 @@ index ed926fc6eb..3d2fcb5e8a 100644
 
     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 001b1e5197..13b9843932 100644
+index 001b1e519..13b984393 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {
--- a/patches/server/0029-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0029-Logger-settings-suppressing-pointless-logs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)


 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 17789407b..c31f4040c 100644
+index c680319e4..eaa1063ff 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-@@ -169,6 +169,7 @@ public class AdvancementDataPlayer {
+@@ -170,6 +170,7 @@ public class AdvancementDataPlayer {
                         if (advancement == null) {
                             // CraftBukkit start
                             if (entry.getKey().getNamespace().equals("minecraft")) {
--- a/patches/server/0072-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0072-Implement-configurable-search-radius-for-villagers-t.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn


 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a272d353e3..3468e096b5 100644
+index 563dfc3da..33b7bc39f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -892,6 +892,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -894,6 +894,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
 
     @Nullable
     private EntityIronGolem d(WorldServer worldserver) {
@@ -18,7 +18,7 @@ index a272d353e3..3468e096b5 100644
 
         for (int i = 0; i < 10; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0ca84d650e..13fc46d441 100644
+index 0ca84d650..13fc46d44 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -280,12 +280,16 @@ public class PurpurWorldConfig {
--- a/patches/server/0086-Item-entity-immunities.patch
+++ b/patches/server/0086-Item-entity-immunities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 673e05627b..ef65921659 100644
+index 6a9318318..e14aa4fd9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1478,6 +1478,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 673e05627b..ef65921659 100644
         return this.O == tag;
     }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ba73d14437..f55d40c981 100644
+index ba73d1443..f55d40c98 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -23,6 +23,8 @@ public class EntityItem extends Entity {
@@ -68,7 +68,7 @@ index ba73d14437..f55d40c981 100644
 +    // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index aea72b0db1..29731da08d 100644
+index aea72b0db..29731da08 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -106,6 +106,15 @@ public class EntityTrackerEntry {
@@ -88,7 +88,7 @@ index aea72b0db1..29731da08d 100644
             int i;
             int j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 998751ab80..bc7124b911 100644
+index 998751ab8..bc7124b91 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,21 @@ public class PurpurWorldConfig {
@@ -114,10 +114,10 @@ index 998751ab80..bc7124b911 100644
     public boolean idleTimeoutTickNearbyEntities = true;
     public boolean idleTimeoutCountAsSleeping = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index d6a64e4ecf..3e9f2f6626 100644
+index bcbaad118..96628c39e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -88,4 +88,26 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -114,4 +114,26 @@ public class CraftItem extends CraftEntity implements Item {
     public EntityType getType() {
         return EntityType.DROPPED_ITEM;
     }
--- a/patches/server/0102-Configurable-villager-breeding.patch
+++ b/patches/server/0102-Configurable-villager-breeding.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable villager breeding


 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 3468e096b5..d1a260a3b2 100644
+index 33b7bc39f..7cf6d4a4c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -640,7 +640,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -642,7 +642,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
 
     @Override
     public boolean canBreed() {
@@ -18,7 +18,7 @@ index 3468e096b5..d1a260a3b2 100644
 
     private boolean fr() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3b8058890b..ce7b2b7ab9 100644
+index 3b8058890..ce7b2b7ab 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -458,6 +458,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch
+++ b/patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to reset reputation when villager is cured


 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index d1a260a3b2..a95bf56823 100644
+index 7cf6d4a4c..5dd9e3bb2 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -39,7 +39,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -17,7 +17,7 @@ index d1a260a3b2..a95bf56823 100644
     private long bz;
     private long bA;
     private int bB;
-@@ -940,6 +940,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -942,6 +942,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
     @Override
     public void a(ReputationEvent reputationevent, Entity entity) {
         if (reputationevent == ReputationEvent.a) {
@@ -26,7 +26,7 @@ index d1a260a3b2..a95bf56823 100644
             this.by.a(entity.getUniqueID(), ReputationType.MINOR_POSITIVE, 25);
         } else if (reputationevent == ReputationEvent.e) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8496be8704..806ef0bb48 100644
+index 8496be870..806ef0bb4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -547,9 +547,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0130-PaperPR-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0130-PaperPR-Fix-client-lag-on-advancement-loading.patch
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: jmp <jasonpenilla2@me.com>
-Date: Sat, 31 Oct 2020 11:49:01 -0700
-Subject: [PATCH] PaperPR - Fix client lag on advancement loading
-
-When new advancements are added via the UnsafeValues#loadAdvancement
-API, it triggers a full datapack reload when this is not necessary. The
-advancement is already loaded directly into the advancement registry,
-and the point of saving the advancement to the Bukkit datapack seems to
-be for persistence. By removing the call to reload datapacks when an
-advancement is loaded, the client no longer completely freezes up when
-adding a new advancement.
-To ensure the client still receives the updated advancement data, we
-manually reload the advancement data for all players, which
-normally takes place as a part of the datapack reloading.
-
-diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index c31f4040c..eaa1063ff 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-@@ -78,6 +78,7 @@ public class AdvancementDataPlayer {
- 
-     }
- 
-+    public final void reload(AdvancementDataWorld advancementDataWorld) { this.a(advancementDataWorld); } // Paper - OBFHELPER
-     public void a(AdvancementDataWorld advancementdataworld) {
-         this.a();
-         this.data.clear();
-@@ -375,6 +376,7 @@ public class AdvancementDataPlayer {
- 
-     }
- 
-+    public final void sendUpdateIfNeeded(EntityPlayer entityPlayer) { this.b(entityPlayer); } // Paper - OBFHELPER
-     public void b(EntityPlayer entityplayer) {
-         if (this.m || !this.i.isEmpty() || !this.j.isEmpty()) {
-             Map<MinecraftKey, AdvancementProgress> map = Maps.newHashMap();
-diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d33d24af6..0105382ee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -230,4 +230,9 @@ public class PurpurConfig {
-     private static void tpsCatchup() {
-         tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
-     }
-+
-+    public static boolean fixClientAdvancementLag = false;
-+    private static void fixClientAdvancementLag() {
-+        fixClientAdvancementLag = getBoolean("settings.fix-client-lag-from-advancements-api", fixClientAdvancementLag);
-+    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 63bfd1c70..aac30af6e 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -282,7 +282,16 @@ public final class CraftMagicNumbers implements UnsafeValues {
-                     Bukkit.getLogger().log(Level.SEVERE, "Error saving advancement " + key, ex);
-                 }
- 
-                MinecraftServer.getServer().getPlayerList().reload();
-+                // Paper start
-+                if (net.pl3x.purpur.PurpurConfig.fixClientAdvancementLag) {
-+                    MinecraftServer.getServer().getPlayerList().getPlayers().forEach(player -> {
-+                        player.getAdvancementData().reload(MinecraftServer.getServer().getAdvancementData());
-+                        player.getAdvancementData().sendUpdateIfNeeded(player);
-+                    });
-+                } else {
-+                    MinecraftServer.getServer().getPlayerList().reload();
-+                }
-+                // Paper end
- 
-                 return bukkit;
-             }
--- a/patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch
@@ -7,7 +7,7 @@ Makes it so that when a TileEntity is placed in the world and then broken,
 the dropped ItemStack retains any original custom display name/lore.

 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 4aa2b38f18..f863909992 100644
+index 4aa2b38f1..f86390999 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -207,6 +207,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -74,7 +74,7 @@ index 4aa2b38f18..f863909992 100644
     public static void a(World world, BlockPosition blockposition, ItemStack itemstack) {
         if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index bbb1de7d1a..d97efe3d47 100644
+index bbb1de7d1..d97efe3d4 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -96,7 +96,24 @@ public class ItemBlock extends Item {
@@ -104,7 +104,7 @@ index bbb1de7d1a..d97efe3d47 100644
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 58d958a88a..8e87490954 100644
+index 58d958a88..8e8749095 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -90,9 +90,25 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -160,7 +160,7 @@ index 58d958a88a..8e87490954 100644
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 14c1e0d1f9..3aa8f34ecc 100644
+index 2c1ef95e8..c540e9b5a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -184,6 +184,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/server/0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient


 diff --git a/src/main/java/net/minecraft/server/RecipeItemStack.java b/src/main/java/net/minecraft/server/RecipeItemStack.java
-index 0f96abd0ca..f6d9294940 100644
+index 0f96abd0c..f6d929494 100644
 --- a/src/main/java/net/minecraft/server/RecipeItemStack.java
 +++ b/src/main/java/net/minecraft/server/RecipeItemStack.java
@@ -26,6 +26,7 @@ public final class RecipeItemStack implements Predicate<ItemStack> {
@@ -30,7 +30,7 @@ index 0f96abd0ca..f6d9294940 100644
                 int i = aitemstack.length;
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-index ef29599a89..18413e6327 100644
+index ef29599a8..18413e632 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
@@ -22,6 +22,7 @@ public interface CraftRecipe extends Recipe {
--- a/patches/server/0132-Flying-squids-Oh-my.patch
+++ b/patches/server/0132-Flying-squids-Oh-my.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying squids! Oh my!


 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 70b952f10a..cee2265016 100644
+index 70b952f10..cee226501 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -51,6 +51,11 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -38,7 +38,7 @@ index 70b952f10a..cee2265016 100644
                 float f1 = MathHelper.cos(f) * 0.2F;
                 float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c540e9b5af..d827a365a7 100644
+index c540e9b5a..d827a365a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -864,10 +864,12 @@ public class PurpurWorldConfig {
--- a/patches/server/0133-Infinity-bow-settings.patch
+++ b/patches/server/0133-Infinity-bow-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Infinity bow settings


 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index dd6a93dc78..8241f3dafa 100644
+index dd6a93dc7..8241f3daf 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
@@ -24,7 +24,7 @@ public class ItemBow extends ItemProjectileWeapon implements ItemVanishable {
@@ -26,7 +26,7 @@ index dd6a93dc78..8241f3dafa 100644
                     entityhuman.b(StatisticList.ITEM_USED.b(this));
                 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4678b19e30..31e803b268 100644
+index d827a365a..400d793b1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -147,6 +147,15 @@ public class PurpurWorldConfig {
--- a/patches/server/0134-Stonecutter-damage.patch
+++ b/patches/server/0134-Stonecutter-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage


 diff --git a/src/main/java/net/minecraft/server/BlockStonecutter.java b/src/main/java/net/minecraft/server/BlockStonecutter.java
-index 3e57abd33e..08ba9e1c4e 100644
+index 3e57abd33..08ba9e1c4 100644
 --- a/src/main/java/net/minecraft/server/BlockStonecutter.java
 +++ b/src/main/java/net/minecraft/server/BlockStonecutter.java
@@ -71,4 +71,16 @@ public class BlockStonecutter extends Block {
@@ -26,7 +26,7 @@ index 3e57abd33e..08ba9e1c4e 100644
 +    // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index 33804e6893..fabadcd7a2 100644
+index 33804e689..fabadcd7a 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
@@ -480,7 +480,7 @@ public class PathfinderNormal extends PathfinderAbstract {
@@ -39,7 +39,7 @@ index 33804e6893..fabadcd7a2 100644
                         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 400d793b15..8e97eb92dd 100644
+index 400d793b1..8e97eb92d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -376,6 +376,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0135-Configurable-daylight-cycle.patch
+++ b/patches/server/0135-Configurable-daylight-cycle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable daylight cycle


 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index 15af5927f3..c9c2e9774a 100644
+index 15af5927f..c9c2e9774 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
@@ -11,7 +11,7 @@ public class PacketPlayOutUpdateTime implements Packet<PacketListenerPlayOut> {
@@ -18,7 +18,7 @@ index 15af5927f3..c9c2e9774a 100644
     public PacketPlayOutUpdateTime() {}
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 32d0854749..63e3267955 100644
+index 32d085474..63e326795 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -74,7 +74,7 @@ index 32d0854749..63e3267955 100644
 
     public void doMobSpawning(boolean flag, boolean flag1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8e97eb92dd..013f1cfb48 100644
+index 8e97eb92d..013f1cfb4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,6 +116,13 @@ public class PurpurWorldConfig {
--- a/patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow infinite and mending enchantments together


 diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
-index 408cfa4609..3d4e34f707 100644
+index 408cfa460..3d4e34f70 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
@@ -23,6 +23,6 @@ public class EnchantmentInfiniteArrows extends Enchantment {
@@ -17,7 +17,7 @@ index 408cfa4609..3d4e34f707 100644
     }
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b5d5a259fd..6cfc1094b6 100644
+index d33d24af6..418fc8390 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -55,8 +55,8 @@ public class PurpurConfig {
--- a/patches/server/0137-Infinite-fuel-furnace.patch
+++ b/patches/server/0137-Infinite-fuel-furnace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Infinite fuel furnace


 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 1d3c2dd936..e96fc0420a 100644
+index 1d3c2dd93..e96fc0420 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -266,6 +266,16 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -26,7 +26,7 @@ index 1d3c2dd936..e96fc0420a 100644
                 if (!this.isBurning() && this.cookTime > 0) {
                     this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3f7c2d7e23..2c26c4df22 100644
+index 013f1cfb4..e080aa482 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -344,6 +344,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0138-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0138-Arrows-should-not-reset-despawn-counter.patch
@@ -7,7 +7,7 @@ This prevents keeping arrows alive indefinitely (such as when the block
 the arrow is stuck in gets removed, like a piston head going up/down)

 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 7f89b269e3..5ec8c9484d 100644
+index 7f89b269e..5ec8c9484 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -243,7 +243,7 @@ public abstract class EntityArrow extends IProjectile {