Ensure portal search radius is used when teleporting players (#2877)

Also add the create search radius mojang recently introduced
to config

Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch

@@ -1,21 +1,23 @@
-From 8436a8ff5cd80197bd581cd6aed2ae34a2c931f1 Mon Sep 17 00:00:00 2001
+From 9331a06c96c797e2ddbf697c45a5f2f70bbc4f1e Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 62e793b71..5de4ec052 100644
+index 62e793b71..cd47a4ca0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -191,4 +191,9 @@ public class PaperWorldConfig {
+@@ -191,4 +191,11 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
 +
 +    public int portalSearchRadius;
++    public int portalCreateRadius;
 +    private void portalSearchRadius() {
 +        portalSearchRadius = getInt("portal-search-radius", 128);
++        portalCreateRadius = getInt("portal-create-radius", 16);
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
@@ -31,6 +33,21 @@ index 4fcba0c0d..6314c4a19 100644
                  if (event == null) {
                      return null;
                  }
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index ab2d8015a..586c9c8ce 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -751,7 +751,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+             // CraftBukkit start
+             Location enter = this.getBukkitEntity().getLocation();
+             Location exit = (worldserver1 == null) ? null : new Location(worldserver1.getWorld(), d0, d1, d2, f1, f);
+-            PlayerPortalEvent event = new PlayerPortalEvent(this.getBukkitEntity(), enter, exit, cause, 128, true, dimensionmanager.getType() == DimensionManager.THE_END ? 0 : 16);
++            int configuredSearchRadius = (worldserver1 == null ? worldserver : worldserver1).paperConfig.portalSearchRadius;
++            int configuredCreateRadius = (worldserver1 == null ? worldserver : worldserver1).paperConfig.portalCreateRadius;
++            PlayerPortalEvent event = new PlayerPortalEvent(this.getBukkitEntity(), enter, exit, cause, configuredSearchRadius, true, dimensionmanager.getType() == DimensionManager.THE_END ? 0 : configuredCreateRadius); // Paper - configurable portal search radius
+             Bukkit.getServer().getPluginManager().callEvent(event);
+             if (event.isCancelled() || event.getTo() == null) {
+                 return null;
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 index 503e3016a..b5f224e3b 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -54,5 +71,5 @@ index 503e3016a..b5f224e3b 100644
              return villageplacetype == VillagePlaceType.u;
          }, blockposition, searchRadius, VillagePlace.Occupancy.ANY).collect(Collectors.toList()); // CraftBukkit - searchRadius
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From 5bf4c9a22ad5e15885ed9fd8089bd0d5aa9496a5 Mon Sep 17 00:00:00 2001
+From 2d84b102ac24e02391c19589b89432803f4a63d7 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -16,12 +16,12 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5de4ec0521..ba16bcc319 100644
+index cd47a4ca0..abbf59bb9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -196,4 +196,9 @@ public class PaperWorldConfig {
-     private void portalSearchRadius() {
+@@ -198,4 +198,9 @@ public class PaperWorldConfig {
          portalSearchRadius = getInt("portal-search-radius", 128);
+         portalCreateRadius = getInt("portal-create-radius", 16);
      }
 +
 +    public boolean disableTeleportationSuffocationCheck;
@@ -30,7 +30,7 @@ index 5de4ec0521..ba16bcc319 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c6624cf086..a80c0164a3 100644
+index c6624cf08..a80c0164a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -759,7 +759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -43,5 +43,5 @@ index c6624cf086..a80c0164a3 100644
          return true;
      }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From a751c9333b1469eb35ce42ef889079b8a6b1287e Mon Sep 17 00:00:00 2001
+From 38ab592e9683f9b24222f701415adebdd3cfb056 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba16bcc31..f5e7f24c5 100644
+index abbf59bb9..04430aae5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -201,4 +201,9 @@ public class PaperWorldConfig {
+@@ -203,4 +203,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -25,7 +25,7 @@ index ba16bcc31..f5e7f24c5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2aea9ba50..2e5426432 100644
+index 6314c4a19..405badea6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2265,6 +2265,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -49,5 +49,5 @@ index e38be6eba..6e8adb65c 100644
  
              if (!flag) {
 -- 
-2.24.0
+2.25.0.windows.1
 

Spigot-Server-Patches/0063-Undead-horse-leashing.patch

@@ -1,4 +1,4 @@
-From 7478cfc72f66b5391dc408b2f71d8c53c5129ccc Mon Sep 17 00:00:00 2001
+From 60ee3be356dc4198bb2335d982aa1f2849125fbf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 970de3fe8..aaa1b60f9 100644
+index 04430aae5..dd2122153 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -206,4 +206,9 @@ public class PaperWorldConfig {
+@@ -208,4 +208,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -20,7 +20,7 @@ index 970de3fe8..aaa1b60f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 9c7e2437f..8aa60e95f 100644
+index b611ade24..c56efe035 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -33,5 +33,5 @@ index 9c7e2437f..8aa60e95f 100644
  
      @Override
 -- 
-2.23.0
+2.25.0.windows.1
 

Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 9f486428618df2f388560f3141c62fe82262c626 Mon Sep 17 00:00:00 2001
+From 919cdfa17b475a4bcd78767960cd286dbd642969 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2c20de281..64146effd 100644
+index dd2122153..7de7b74ff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -211,4 +211,19 @@ public class PaperWorldConfig {
+@@ -213,4 +213,19 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
@@ -43,5 +43,5 @@ index a9f843aad..2b14b2c3f 100644
          }
  
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,14 +1,14 @@
-From c3f360656a2f726e381153cd7b86f77c9b6561ca Mon Sep 17 00:00:00 2001
+From 3fbb7edf2dc2243cc53b512329fa76f9b44d189b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 64146effd..cc81e1cae 100644
+index 7de7b74ff..6ef0e1399 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -226,4 +226,12 @@ public class PaperWorldConfig {
+@@ -228,4 +228,12 @@ public class PaperWorldConfig {
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
          log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
      }
@@ -35,5 +35,5 @@ index c40aebc41..5bb94fb5e 100644
                  if (flag1) {
                      EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this);
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch

@@ -1,4 +1,4 @@
-From f5af27d1bef6ea5746e3b9da9c7f0a45272311ce Mon Sep 17 00:00:00 2001
+From 336592342a931d216667dd38c95b50124050de28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Time
@@ -11,10 +11,10 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cc81e1cae..edb5248f3 100644
+index 6ef0e1399..5872e6b17 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -234,4 +234,14 @@ public class PaperWorldConfig {
+@@ -236,4 +236,14 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.01D; // Vanilla value
          }
      }
@@ -43,5 +43,5 @@ index fd9ba8232..034e8684d 100644
  
      @Override
 -- 
-2.24.0
+2.25.0.windows.1
 

Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch

@@ -1,14 +1,14 @@
-From 073c5e88483ced82b8c5e8960e9bd9ce7b8be9a2 Mon Sep 17 00:00:00 2001
+From 22c0481aa92d6551cabea6b5bd6d4bc8c0646e28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index edb5248f3..862cbfbd5 100644
+index 5872e6b17..47f5f8055 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -244,4 +244,10 @@ public class PaperWorldConfig {
+@@ -246,4 +246,10 @@ public class PaperWorldConfig {
          }
          fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
      }
@@ -32,5 +32,5 @@ index 9b25fc2f9..2b19b6754 100644
              // CraftBukkit start
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(worldserver, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) {
 -- 
-2.24.0
+2.25.0.windows.1
 

Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From 8fb2556bfd8e89f9438e8996f8136cd139670788 Mon Sep 17 00:00:00 2001
+From 5777cc7c9975620edb3bf09beec4f760c0f66ae1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -12,10 +12,10 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves at some point in the future.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 862cbfbd5..b1682894f 100644
+index 47f5f8055..b1d1a3c1f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -250,4 +250,9 @@ public class PaperWorldConfig {
+@@ -252,4 +252,9 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
@@ -61,5 +61,5 @@ index 05ea0ace5..94a24a49c 100644
          playerconnection.a(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.yaw, entityplayer.pitch);
          this.players.add(entityplayer);
 -- 
-2.24.0
+2.25.0.windows.1
 

Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch

@@ -1,11 +1,11 @@
-From 013d3a8f08c00a46fea6ded0b2ccaa883310111f Mon Sep 17 00:00:00 2001
+From f0e4524e92aa546ee5c57aba4c1940a84faf0ddb Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ab2d8015a..12fa705b0 100644
+index 586c9c8ce..de4634486 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
@@ -17,7 +17,7 @@ index ab2d8015a..12fa705b0 100644
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
-@@ -1459,13 +1459,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1461,13 +1461,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
@@ -65,5 +65,5 @@ index 74a0ceba6..fe26ce3af 100644
          {
              Set<Player> ret = new HashSet<Player>();
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch

@@ -1,14 +1,14 @@
-From 6c3518bcb40157228f7e11e6f75615fe6e77a1c0 Mon Sep 17 00:00:00 2001
+From eacd489c663c807ba70b9939224dc2d29cf5ddf5 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b1682894f..d00e8155d 100644
+index b1d1a3c1f..9e0c48954 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -255,4 +255,14 @@ public class PaperWorldConfig {
+@@ -257,4 +257,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
@@ -54,5 +54,5 @@ index af17aba8b..5e414138e 100644
      }
  
 -- 
-2.24.0
+2.25.0.windows.1
 

Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,4 +1,4 @@
-From acc3c97129aadff8f9139c652a9da0e165979f8b Mon Sep 17 00:00:00 2001
+From bceca705427862859ac4918b4b2e189730186c4b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d00e8155d..277f7618e 100644
+index 9e0c48954..6db131203 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -265,4 +265,26 @@ public class PaperWorldConfig {
+@@ -267,4 +267,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
@@ -520,7 +520,7 @@ index 000000000..d50410532
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 167d22574..2e56c7f57 100644
+index 4201f5191..5a168037f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -756,5 +756,5 @@ index 334bd5bb3..f5b31237f 100644
  
      public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.17.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch

@@ -1,11 +1,11 @@
-From bd999b0dfbea6de1fb638a8124eda2d17467d22a Mon Sep 17 00:00:00 2001
+From f7302b3957b44d6362167888ffad640ad010e6bb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 277f7618e..1dbeb209e 100644
+index 6db131203..8cf3076f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index 277f7618e..1dbeb209e 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -287,4 +286,14 @@ public class PaperWorldConfig {
+@@ -289,4 +288,14 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -107,5 +107,5 @@ index a13fd9b34..3ff7a7b4a 100644
      private java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = null;
  
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch

@@ -1,14 +1,14 @@
-From 5a1ada2f1061cb0b8cc21617685f1962b8cb1882 Mon Sep 17 00:00:00 2001
+From 5076722134520b0ae09562ca892ccf0a0f120c4f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 12fa705b0..5d6acca27 100644
+index de4634486..8ccaccee3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -991,6 +991,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -993,6 +993,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (entity1 != entity && this.playerConnection != null) {
              this.playerConnection.a(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
          }
@@ -23,7 +23,7 @@ index 12fa705b0..5d6acca27 100644
  
      }
  
-@@ -1007,7 +1015,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1009,7 +1017,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (!this.isSpectator()) {
              super.b(blockposition);
          }
@@ -32,5 +32,5 @@ index 12fa705b0..5d6acca27 100644
  
      public void a(double d0, boolean flag) {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch

@@ -1,14 +1,14 @@
-From a85d7e8d80aed8641a9b3be4b0133fd7eeba958b Mon Sep 17 00:00:00 2001
+From 4e95a0f3ccd7eaee08275b35a5b2b19f40e021e7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1dbeb209e..fd1be52f3 100644
+index 8cf3076f4..721eceeff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -296,4 +296,9 @@ public class PaperWorldConfig {
+@@ -298,4 +298,9 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
@@ -36,5 +36,5 @@ index 034e8684d..1efddb533 100644
              // CraftBukkit end
          }
 -- 
-2.17.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch

@@ -1,11 +1,11 @@
-From 62498f0d28b7d705658e1d9b2c1d765d6e78fba8 Mon Sep 17 00:00:00 2001
+From 25812e37d4d662f3588031f24b01b1d7e38cabf6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fd1be52f3..ba8edcf7e 100644
+index 721eceeff..bff2e9d26 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index fd1be52f3..ba8edcf7e 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -301,4 +302,12 @@ public class PaperWorldConfig {
+@@ -303,4 +304,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
@@ -30,7 +30,7 @@ index fd1be52f3..ba8edcf7e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 55d1b3529..2e908c749 100644
+index c3c3e58ce..d302712a5 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -231,6 +231,15 @@ public class EntityFallingBlock extends Entity {
@@ -50,5 +50,5 @@ index 55d1b3529..2e908c749 100644
          if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) {
              this.hurtEntities = nbttagcompound.getBoolean("HurtEntities");
 -- 
-2.17.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch

@@ -1,11 +1,11 @@
-From 1ec4298e0b8623b4f2771f75916053b23a0d225c Mon Sep 17 00:00:00 2001
+From a3f76428be43b103a928b7a5e2971c96b0affa9d Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 12156b6e5..47978174e 100644
+index 52ffdffa0..f40eab51f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -50,7 +50,7 @@ index 12156b6e5..47978174e 100644
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -1326,7 +1335,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1328,7 +1337,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastHealthSent = -1.0F;
          this.lastFoodSent = -1;
          // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit
@@ -67,5 +67,5 @@ index 12156b6e5..47978174e 100644
          this.cr = entityplayer.cr;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch

@@ -1,4 +1,4 @@
-From 40a5fa15dcb0bc09af143775aa33c0728975b72f Mon Sep 17 00:00:00 2001
+From 889dfd798b25b7f30ee074cc7b75d1998524e4bf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba8edcf7ef..bf11448bcd 100644
+index bff2e9d26..f164844f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -310,4 +310,14 @@ public class PaperWorldConfig {
+@@ -312,4 +312,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
@@ -28,7 +28,7 @@ index ba8edcf7ef..bf11448bcd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index 3bcf0b385d..4764ffef77 100644
+index 3bcf0b385..4764ffef7 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
 @@ -92,7 +92,8 @@ public class VillagerTrades {
@@ -42,5 +42,5 @@ index 3bcf0b385d..4764ffef77 100644
                  if (blockposition != null) {
                      ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch

@@ -1,4 +1,4 @@
-From 3437308c9316ffdf1306244ba281a0b23eee93cf Mon Sep 17 00:00:00 2001
+From 504991dab4fcd1e9471216cfdb1d1699226ea49f Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 47978174e..0a1f82c10 100644
+index f40eab51f..636667a8e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1794,7 +1794,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1796,7 +1796,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {
@@ -32,5 +32,5 @@ index 16b70221e..cc6a2aaeb 100644
      // CraftBukkit end
  
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From b4c4fa54f5a94e4d29234238e452812550993522 Mon Sep 17 00:00:00 2001
+From c18a30b8936217bab75d84459f912ce82990eb7d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bf11448bcd..e00e1e8f6a 100644
+index f164844f3..751551f17 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -320,4 +320,10 @@ public class PaperWorldConfig {
+@@ -322,4 +322,10 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
@@ -27,7 +27,7 @@ index bf11448bcd..e00e1e8f6a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1619d9f415..fcfe8f550d 100644
+index 764e779b1..9c1607377 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 1619d9f415..fcfe8f550d 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index be85a76acd..6379b361a9 100644
+index be85a76ac..6379b361a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2621,8 +2621,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index be85a76acd..6379b361a9 100644
                  this.C(entity);
              }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -1,4 +1,4 @@
-From ec99b16f0ef9b97e6d5464724b1a76dd91451399 Mon Sep 17 00:00:00 2001
+From 7fa11256d1579a6b9db98fbc7d2333da0bcef3df Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e00e1e8f6a..f151e43c38 100644
+index 751551f17..eae1690cc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -326,4 +326,10 @@ public class PaperWorldConfig {
+@@ -328,4 +328,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
@@ -26,7 +26,7 @@ index e00e1e8f6a..f151e43c38 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 242d0df1c0..673e2b79d5 100644
+index 517bb0748..9054e77ae 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 242d0df1c0..673e2b79d5 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc6a2aaeb3..01ab2e1516 100644
+index cc6a2aaeb..01ab2e151 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1772,6 +1772,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -57,5 +57,5 @@ index cc6a2aaeb3..01ab2e1516 100644
              case RELEASE_SHIFT_KEY:
                  this.player.setSneaking(false);
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch

@@ -1,4 +1,4 @@
-From 87f4257f24379f12edcb7b596bc3f0f41550735e Mon Sep 17 00:00:00 2001
+From 204d562f714621571b27cb96ff2f4adc13aeaadf Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f151e43c38..c145e27ccb 100644
+index eae1690cc..39ab54575 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -332,4 +332,10 @@ public class PaperWorldConfig {
+@@ -334,4 +334,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
@@ -21,7 +21,7 @@ index f151e43c38..c145e27ccb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 859b528456..dabe40c5f9 100644
+index 859b52845..dabe40c5f 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster {
@@ -34,5 +34,5 @@ index 859b528456..dabe40c5f9 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch

@@ -1,14 +1,14 @@
-From 3e49edef5199b3d1b180dacd0e520504b7c14e4a Mon Sep 17 00:00:00 2001
+From b39cefe2d8a88197428fb9e92720719749665af7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c145e27cc..671587631 100644
+index 39ab54575..d2582d981 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -338,4 +338,10 @@ public class PaperWorldConfig {
+@@ -340,4 +340,10 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
@@ -60,5 +60,5 @@ index c45b7c15f..dbda8b35a 100644
          // Spigot end
          } else if (!(entity instanceof EntityPlayer)) {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch

@@ -1,4 +1,4 @@
-From feee9c593efa057e9f1d53320031ed830164d05a Mon Sep 17 00:00:00 2001
+From 688bed2423785ca26fadf257a001659361eaa10d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 671587631e..e315a00cc3 100644
+index d2582d981..92e689150 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -344,4 +344,9 @@ public class PaperWorldConfig {
+@@ -346,4 +346,9 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
@@ -21,7 +21,7 @@ index 671587631e..e315a00cc3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 8c4f3b2c2e..1c1ff2069d 100644
+index 8c4f3b2c2..1c1ff2069 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -35,5 +35,5 @@ index 8c4f3b2c2e..1c1ff2069d 100644
  
      public void a(float f, float f1, float f2) {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch

@@ -1,4 +1,4 @@
-From ab9d9343bd388345ec9a2c56b1281f5fd721d9cb Mon Sep 17 00:00:00 2001
+From 33100445f19f3f90c54e22eb6e201f2e9eb84a1e Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2607c4e5fa..1d3120b9bf 100644
+index 77cdbfadf..171c8e303 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -354,4 +354,9 @@ public class PaperWorldConfig {
+@@ -356,4 +356,9 @@ public class PaperWorldConfig {
      private void squidMaxSpawnHeight() {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
@@ -20,7 +20,7 @@ index 2607c4e5fa..1d3120b9bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 205a842ee6..4e91fdd69e 100644
+index 1aa373ed3..9595c3b0a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1112,7 +1112,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,5 +37,5 @@ index 205a842ee6..4e91fdd69e 100644
  
                          if (flag3) {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch

@@ -1,4 +1,4 @@
-From 8bed28be730343282419516db2bb02293d4d9aeb Mon Sep 17 00:00:00 2001
+From 1014a6b22c4d4d7a6916d7cc31d9fbc993298a5a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1d3120b9bf..585646deda 100644
+index 171c8e303..9c52e31f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -359,4 +359,10 @@ public class PaperWorldConfig {
+@@ -361,4 +361,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }
@@ -27,7 +27,7 @@ index 1d3120b9bf..585646deda 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 724b78b5d2..9eed1dce3e 100644
+index 724b78b5d..9eed1dce3 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -201,6 +201,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -39,5 +39,5 @@ index 724b78b5d2..9eed1dce3e 100644
      }
  
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch

@@ -1,14 +1,14 @@
-From ec7724be6c1c144194915816e3fa6f533296ee83 Mon Sep 17 00:00:00 2001
+From d51d14dfa3970f44d5446bfd91311b2096206b39 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 585646deda..54bf1323e0 100644
+index 9c52e31f4..33ce9a500 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -365,4 +365,9 @@ public class PaperWorldConfig {
+@@ -367,4 +367,9 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }
@@ -19,7 +19,7 @@ index 585646deda..54bf1323e0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c03fcd2d38..3f493f4158 100644
+index c03fcd2d3..3f493f415 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2996,7 +2996,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index c03fcd2d38..3f493f4158 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b8482c6328..67f275321b 100644
+index b8482c632..67f275321 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -632,5 +632,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -68,5 +68,5 @@ index b8482c6328..67f275321b 100644
      // Paper end
  }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch

@@ -1,14 +1,14 @@
-From 581d4753a42a14b3ed01c91abb2d00f13598b466 Mon Sep 17 00:00:00 2001
+From 050181755667e9b0c3c795c28fbe2b2b12e3c213 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 54bf1323e0..f5cafbecaf 100644
+index 33ce9a500..cea15d50e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -370,4 +370,9 @@ public class PaperWorldConfig {
+@@ -372,4 +372,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }
@@ -19,7 +19,7 @@ index 54bf1323e0..f5cafbecaf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 909d13c427..218c04245b 100644
+index 909d13c42..218c04245 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -28,10 +28,10 @@ public class EnderDragonBattle {
@@ -47,5 +47,5 @@ index 909d13c427..218c04245b 100644
          if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
              if (nbttagcompound.b("DragonUUID")) {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From a9838a0c3ea9f5301368717247ba1d5fb5b32fce Mon Sep 17 00:00:00 2001
+From 9ae19da684f14a024a586c46e53b06675ea9f551 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -34,7 +34,7 @@ index ba3e6b882..2265b01e6 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 225721d1f..0ac63f0ba 100644
+index 636667a8e..2419feba7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -55,7 +55,7 @@ index 225721d1f..0ac63f0ba 100644
          }
  
          String deathMessage = event.getDeathMessage();
-@@ -1054,7 +1054,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1056,7 +1056,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              return OptionalInt.empty();
          } else {
              if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index 225721d1f..0ac63f0ba 100644
              }
  
              this.nextContainerCounter();
-@@ -1114,7 +1114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1116,7 +1116,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // CraftBukkit end
          if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index 225721d1f..0ac63f0ba 100644
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1178,7 +1178,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1180,7 +1180,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void closeInventory() {
@@ -193,5 +193,5 @@ index caf277439..f931fa48b 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch

@@ -1,4 +1,4 @@
-From e318355e0c847c81d00e49474f5ad3caab3bd873 Mon Sep 17 00:00:00 2001
+From 47f50e10ef01160769a2557af0f38894370fef12 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,10 +10,10 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f5cafbecaf..b4e5948ccf 100644
+index cea15d50e..387e0dcb9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -375,4 +375,15 @@ public class PaperWorldConfig {
+@@ -377,4 +377,15 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
@@ -30,7 +30,7 @@ index f5cafbecaf..b4e5948ccf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 7947563426..06a35629ab 100644
+index 794756342..06a35629a 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -196,6 +196,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -149,5 +149,5 @@ index 7947563426..06a35629ab 100644
          VoxelShape voxelshape = iworldreader.getType(blockposition).getCollisionShape(iworldreader, blockposition);
  
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch

@@ -1,14 +1,14 @@
-From 95ab537764618d02f25e87b7d0bdb8e6a1a7ad32 Mon Sep 17 00:00:00 2001
+From d9d45e34f445632b8da9cc1809c2e2a9dbb3bc9f Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b4e5948ccf..0a99b8fe95 100644
+index 387e0dcb9..eaaa51e4b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -386,4 +386,9 @@ public class PaperWorldConfig {
+@@ -388,4 +388,9 @@ public class PaperWorldConfig {
              log("Bed Search Radius: " + bedSearchRadius);
          }
      }
@@ -19,7 +19,7 @@ index b4e5948ccf..0a99b8fe95 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5d04d13012..307a2d060f 100644
+index 257ea4f33..6742c991f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -805,6 +805,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -38,5 +38,5 @@ index 5d04d13012..307a2d060f 100644
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch

@@ -1,14 +1,14 @@
-From 1e48b9fb8b37d1c9378a0628f6e9501344f30c2f Mon Sep 17 00:00:00 2001
+From f6237bf9c93b2ccb59e4f517446d9d7c986cab59 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0a99b8fe95..42d14fac2c 100644
+index eaaa51e4b..bc3df01aa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -391,4 +391,10 @@ public class PaperWorldConfig {
+@@ -393,4 +393,10 @@ public class PaperWorldConfig {
      private void armorStandEntityLookups() {
          armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
      }
@@ -20,7 +20,7 @@ index 0a99b8fe95..42d14fac2c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index eb6cf3a86b..b51662ee99 100644
+index eb6cf3a86..b51662ee9 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving {
@@ -142,7 +142,7 @@ index eb6cf3a86b..b51662ee99 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 470cbddeb8..91b6d68787 100644
+index 470cbddeb..91b6d6878 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2324,52 +2324,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index 470cbddeb8..91b6d68787 100644
          float f2 = MathHelper.g(f - this.aI);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index d1d689e5d7..ac105270d5 100644
+index d1d689e5d..ac105270d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -277,5 +277,5 @@ index d1d689e5d7..ac105270d5 100644
      // Paper end
  }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch

@@ -1,14 +1,14 @@
-From 1e3f4727b8362e1c3f223420ec5f8860c6ea50b0 Mon Sep 17 00:00:00 2001
+From 5743b74188e22ca39b2ae259c22e0d741ca72fa4 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 42d14fac2c..50ac7afa36 100644
+index bc3df01aa..487b0d5cd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -397,4 +397,10 @@ public class PaperWorldConfig {
+@@ -399,4 +399,10 @@ public class PaperWorldConfig {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
          log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
      }
@@ -20,7 +20,7 @@ index 42d14fac2c..50ac7afa36 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index f56e14e1e2..6d351f0979 100644
+index f56e14e1e..6d351f097 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -70,11 +70,28 @@ public class BlockFluids extends Block implements IFluidSource {
@@ -63,5 +63,5 @@ index f56e14e1e2..6d351f0979 100644
  
      }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch

@@ -1,14 +1,14 @@
-From 0b13559bf28c95ee98407b3e6b0fb58c5a92c186 Mon Sep 17 00:00:00 2001
+From 900eacae63f24da67c7db6b73cc151d53e4f9816 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 50ac7afa3..7dda0803c 100644
+index 487b0d5cd..b8789c8ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -240,6 +240,28 @@ public class PaperWorldConfig {
+@@ -242,6 +242,28 @@ public class PaperWorldConfig {
          }
      }
  
@@ -82,5 +82,5 @@ index 00a1fe759..bcf406f22 100644
  
      @Override
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch

@@ -1,11 +1,11 @@
-From 79335f2b17824b7c681cb113e96dbed732bb87b9 Mon Sep 17 00:00:00 2001
+From 5a2b59cd432df49374c60ff6fc3db1a166f097f1 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c3e9f9d90..70c9a41ee 100644
+index 67062635c..707dfe375 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index c3e9f9d90..70c9a41ee 100644
      public boolean worldChangeInvuln;
      private boolean cm; private void setHasSeenCredits(boolean has) { this.cm = has; } // Paper - OBFHELPER
      private final RecipeBookServer recipeBook;
-@@ -1583,15 +1583,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1585,15 +1585,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
      }
  
@@ -58,7 +58,7 @@ index c3e9f9d90..70c9a41ee 100644
      }
  
      @Override
-@@ -1599,7 +1619,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1601,7 +1621,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.portalCooldown > 0 && !this.worldChangeInvuln) {
              --this.portalCooldown;
          }
@@ -67,5 +67,5 @@ index c3e9f9d90..70c9a41ee 100644
  
      @Override
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -1,4 +1,4 @@
-From fa52d846a4cf65b435f06e72fb0da2bc057a6d7d Mon Sep 17 00:00:00 2001
+From 4c028f4696820f3469ac9a56822d2b712c3d390b Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7dda0803c4..dd5e263d71 100644
+index b8789c8ec..0862a1d62 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -425,4 +425,9 @@ public class PaperWorldConfig {
+@@ -427,4 +427,9 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }
@@ -20,7 +20,7 @@ index 7dda0803c4..dd5e263d71 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 77c375f71b..ccad0a601c 100644
+index 77c375f71..ccad0a601 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -63,5 +63,5 @@ index 77c375f71b..ccad0a601c 100644
                              if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) {
                                  float f2 = this.player.isGliding() ? 300.0F : 100.0F;
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch

@@ -1,11 +1,11 @@
-From d32552a87b14d231a96e10bbb937a07618f44df6 Mon Sep 17 00:00:00 2001
+From 3becb862ae274a065c17d6edd7c61f924b34717e Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 905d2be5e..95d73fd6e 100644
+index 1d4c15039..4ff59a6fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index 905d2be5e..95d73fd6e 100644
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 70c9a41ee..2301efa51 100644
+index 707dfe375..c5ca709a1 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1859,6 +1859,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1861,6 +1861,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.setHealth(this.getMaxHealth());
@@ -29,5 +29,5 @@ index 70c9a41ee..2301efa51 100644
          this.fallDistance = 0;
          this.foodData = new FoodMetaData(this);
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch

@@ -1,4 +1,4 @@
-From 7300336b4ea331e4d37eabd94f391e90cdd03804 Mon Sep 17 00:00:00 2001
+From 3f48cc87934a730f5d6423ce5cab4f167d399c63 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,10 +19,10 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dd5e263d7..357c7cf1d 100644
+index 0862a1d62..4ba72275b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -430,4 +430,14 @@ public class PaperWorldConfig {
+@@ -432,4 +432,14 @@ public class PaperWorldConfig {
      private void preventMovingIntoUnloadedChunks() {
          preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
      }
@@ -1147,5 +1147,5 @@ index b6d904007..697c99d94 100644
          int i = 0;
          EnumDirection[] aenumdirection = World.a;
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch

@@ -1,4 +1,4 @@
-From 47c875d5a6be96d740cfb05aa88e0bc9d1fcde86 Mon Sep 17 00:00:00 2001
+From 47b1a0115bf4d80d5b352677c55d804002195cc5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 95d73fd6e..fef298f55 100644
+index 4ff59a6fa..75b883791 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2027,12 +2027,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -112,10 +112,10 @@ index b59b39d41..a63edeeb9 100644
              this.a(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e4622e117..5d21fdb71 100644
+index c5ca709a1..15a21ce59 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1013,11 +1013,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1015,11 +1015,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
      }
  
@@ -133,5 +133,5 @@ index e4622e117..5d21fdb71 100644
  
          if (entity1 != entity && this.playerConnection != null) {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch

@@ -1,14 +1,14 @@
-From 522bea13c79b27397a461b61f271f323b73a08f0 Mon Sep 17 00:00:00 2001
+From 73968e2b8fe632e8eaf8a12b9fcb9e8a1d169624 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 886669d6c..fd1a249a1 100644
+index 8d4cac430..1cb90334e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1288,6 +1288,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1290,6 +1290,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void n() {
          this.cq = true;
          this.ejectPassengers();
@@ -23,5 +23,5 @@ index 886669d6c..fd1a249a1 100644
              this.wakeup(true, false);
          }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From e47da6c1ee139716e719de3284d8f25e87ac494e Mon Sep 17 00:00:00 2001
+From 7d00c8a2e75726da594e0203d6e88cbafb2513b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 357c7cf1d..2b2c82d5e 100644
+index 4ba72275b..572679e4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -440,4 +440,43 @@ public class PaperWorldConfig {
+@@ -442,4 +442,43 @@ public class PaperWorldConfig {
              log("Using vanilla redstone algorithm.");
          }
      }
@@ -258,5 +258,5 @@ index ae1e4b34b..c4fabc477 100644
                  logger.error("Overwrote an existing entity " + old + " with " + entity);
                  if (DEBUG_ENTITIES) {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 0b318110f77b98e569b1e1efc5e8bb640aa529a7 Mon Sep 17 00:00:00 2001
+From 14f500c16bffebebc1e0ae5e7dda0b54432ef414 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2b2c82d5ee..778de46305 100644
+index 572679e4d..071e5e7f7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -479,4 +479,10 @@ public class PaperWorldConfig {
+@@ -481,4 +481,10 @@ public class PaperWorldConfig {
                  break;
          }
      }
@@ -21,7 +21,7 @@ index 2b2c82d5ee..778de46305 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fd7526137d..105ac13581 100644
+index fd7526137..105ac1358 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -585,6 +585,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -72,7 +72,7 @@ index fd7526137d..105ac13581 100644
          // CraftBukkit start
          // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListener.java b/src/main/java/net/minecraft/server/WorldLoadListener.java
-index d6762d3853..7b6f5b2da0 100644
+index d6762d385..7b6f5b2da 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListener.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListener.java
 @@ -9,4 +9,6 @@ public interface WorldLoadListener {
@@ -83,7 +83,7 @@ index d6762d3853..7b6f5b2da0 100644
 +    void setChunkRadius(int radius); // Paper - allow changing chunk radius
  }
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
-index 3868572aed..ae77805f71 100644
+index 3868572ae..ae77805f7 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 @@ -7,16 +7,24 @@ import org.apache.logging.log4j.Logger;
@@ -114,7 +114,7 @@ index 3868572aed..ae77805f71 100644
      @Override
      public void a(ChunkCoordIntPair chunkcoordintpair) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c4fabc4772..8b3ea65446 100644
+index c4fabc477..8b3ea6544 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1566,13 +1566,85 @@ public class WorldServer extends World {
@@ -207,7 +207,7 @@ index c4fabc4772..8b3ea65446 100644
  
      public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3a686c5287..8b62d1c6f2 100644
+index 3a686c528..8b62d1c6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1913,15 +1913,21 @@ public class CraftWorld implements World {
@@ -237,5 +237,5 @@ index 3a686c5287..8b62d1c6f2 100644
  
      @Override
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0382-incremental-chunk-saving.patch

@@ -1,14 +1,14 @@
-From 4688cfc998f599ddb723bf1a06d90cafacc4e2a5 Mon Sep 17 00:00:00 2001
+From 7b6033c0bc67362b923dc13dc494b0b4c0911ff3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 778de4630..99f1541b9 100644
+index 071e5e7f7..486761521 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -485,4 +485,19 @@ public class PaperWorldConfig {
+@@ -487,4 +487,19 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
@@ -207,5 +207,5 @@ index 8b3ea6544..2b42f3262 100644
          this.checkSession();
          this.worldProvider.i();
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0388-Anti-Xray.patch

@@ -1,11 +1,11 @@
-From fca668c719538bda3e7b9e7a67f615e3e0822dad Mon Sep 17 00:00:00 2001
+From dcdd9553b66246aa5f1fd23a5ba36c9e39701ce6 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 99f1541b9..6634ef923 100644
+index 486761521..df24e3297 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,11 @@
@@ -20,7 +20,7 @@ index 99f1541b9..6634ef923 100644
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
-@@ -500,4 +504,43 @@ public class PaperWorldConfig {
+@@ -502,4 +506,43 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
@@ -1580,7 +1580,7 @@ index bfaabfdfe..3825520fa 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 18ff6dd68..8720dd120 100644
+index e2e5c17c2..ce4340a47 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -264,6 +264,8 @@ public class PlayerInteractManager {
@@ -1648,7 +1648,7 @@ index a905a29e7..335b64435 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2fd76add2..040610ecd 100644
+index 65763d772..06e8c27d9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -1710,5 +1710,5 @@ index 7772d5900..4570ed999 100644
          return section;
      }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch

@@ -1,4 +1,4 @@
-From 559672aa60c1d20af16028bbac444831b9712ac1 Mon Sep 17 00:00:00 2001
+From fb7dfbcc4e1ac59d02f68704b18d8f8742abff73 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
@@ -17,10 +17,10 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6634ef923..2f0b06dc5 100644
+index df24e3297..4c5010936 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -505,6 +505,16 @@ public class PaperWorldConfig {
+@@ -507,6 +507,16 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
@@ -56,5 +56,5 @@ index 2b42f3262..d1b2800b2 100644
              }
          }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch

@@ -1,4 +1,4 @@
-From ab900cea1b5588387881ee6687f298f4e6b7a811 Mon Sep 17 00:00:00 2001
+From a51787f3150ea943b1131cef4d82066dc1b05aae Mon Sep 17 00:00:00 2001
 From: Lucavon <lucavonlp@gmail.com>
 Date: Tue, 23 Jul 2019 20:29:20 -0500
 Subject: [PATCH] Configurable projectile relative velocity
@@ -25,10 +25,10 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2f0b06dc55..0fc77ac287 100644
+index 4c5010936..a09282e00 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -553,4 +553,9 @@ public class PaperWorldConfig {
+@@ -555,4 +555,9 @@ public class PaperWorldConfig {
          }
          log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
      }
@@ -39,7 +39,7 @@ index 2f0b06dc55..0fc77ac287 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 634e2bd304..9c97edf9c9 100644
+index 634e2bd30..9c97edf9c 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -85,7 +85,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -52,7 +52,7 @@ index 634e2bd304..9c97edf9c9 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 6c091b6808..f5c8074dcf 100644
+index 6c091b680..f5c8074dc 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -43,7 +43,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -65,5 +65,5 @@ index 6c091b6808..f5c8074dcf 100644
  
      @Override
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch

@@ -1,11 +1,11 @@
-From bbfda228c1b88bf6ab10d4ec1e2078abdc0146ff Mon Sep 17 00:00:00 2001
+From 8e41731bb2f662d9286443c7ba5eb0cde48511b1 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 3 Jun 2019 02:02:39 -0400
 Subject: [PATCH] Implement alternative item-despawn-rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0fc77ac287..3dfe54ad3d 100644
+index a09282e00..9d9260ad0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,12 +1,17 @@
@@ -26,7 +26,7 @@ index 0fc77ac287..3dfe54ad3d 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -558,4 +563,52 @@ public class PaperWorldConfig {
+@@ -560,4 +565,52 @@ public class PaperWorldConfig {
      private void disableRelativeProjectileVelocity() {
          disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
      }
@@ -80,7 +80,7 @@ index 0fc77ac287..3dfe54ad3d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index a0d1e7fd27..e61af3f5eb 100644
+index a0d1e7fd2..e61af3f5e 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -6,6 +6,7 @@ import java.util.Objects;
@@ -128,5 +128,5 @@ index a0d1e7fd27..e61af3f5eb 100644
      public Packet<?> L() {
          return new PacketPlayOutSpawnEntity(this);
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch

@@ -1,4 +1,4 @@
-From 190676b36c7fdb635808f8f43b05838893ae5b64 Mon Sep 17 00:00:00 2001
+From fd1b75f95c393ce7cd4c71ea10cb230378a33673 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 01:27:58 +0500
 Subject: [PATCH] implement optional per player mob spawns
@@ -25,10 +25,10 @@ index 8de6c4816..e25544f11 100644
          poiUnload = Timings.ofSafe(name + "Chunk unload - POI");
          chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3dfe54ad3..02715539a 100644
+index 9d9260ad0..fd3dbea62 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -611,4 +611,9 @@ public class PaperWorldConfig {
+@@ -613,4 +613,9 @@ public class PaperWorldConfig {
              }
          }
      }
@@ -599,7 +599,7 @@ index 58654f453..8a35e2994 100644
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ed5116bb2..cce209ed1 100644
+index 260eca28c..8b120e277 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -80,6 +80,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -622,7 +622,7 @@ index ed5116bb2..cce209ed1 100644
      }
  
      // Yes, this doesn't match Vanilla, but it's the best we can do for now.
-@@ -1763,6 +1769,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1765,6 +1771,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -800,5 +800,5 @@ index aad93723e..f2d9392a0 100644
  
      @Override
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0405-Generator-Settings.patch

@@ -1,14 +1,14 @@
-From 98cff66b98d870ec0e0b98f9a112e6bef763bdd5 Mon Sep 17 00:00:00 2001
+From e010ff94179eff5de8cc9be7cfdfa2bf6fa68aa2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 02715539ae..33e251c87f 100644
+index fd3dbea62..e790326c9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -616,4 +616,9 @@ public class PaperWorldConfig {
+@@ -618,4 +618,9 @@ public class PaperWorldConfig {
      private void perPlayerMobSpawns() {
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", false);
      }
@@ -19,7 +19,7 @@ index 02715539ae..33e251c87f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
-index af81a84142..2268fbdd87 100644
+index af81a8414..2268fbdd8 100644
 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 @@ -211,8 +211,8 @@ public abstract class ChunkGeneratorAbstract<T extends GeneratorSettingsDefault>
@@ -52,5 +52,5 @@ index af81a84142..2268fbdd87 100644
                      }
                  }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch

@@ -1,14 +1,14 @@
-From 9503a0663360f9ef64ac72b5b8799aa15a9d709c Mon Sep 17 00:00:00 2001
+From 674ba47adc6ea8be5ea4a7632056881426763acf Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 15 Sep 2019 11:32:32 -0500
 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 33e251c87..c0af1aaf3 100644
+index e790326c9..c37a0f035 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -564,6 +564,11 @@ public class PaperWorldConfig {
+@@ -566,6 +566,11 @@ public class PaperWorldConfig {
          disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
      }
  
@@ -95,5 +95,5 @@ index f2d9392a0..70cbff313 100644
  
                          Fluid fluid = iblockdata.getFluid();
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch

@@ -1,14 +1,14 @@
-From ce2faacbf303eced568ca6939b8d689630d3ff4d Mon Sep 17 00:00:00 2001
+From 2b69b34da50e8b99da20afff6b968db050e7f19a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:51:43 -0500
 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cce209ed1..5bf13f8bf 100644
+index 8b120e277..eca1841b2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -974,6 +974,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -976,6 +976,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.lastHealthSent = -1.0F;
              this.lastFoodSent = -1;
  
@@ -31,5 +31,5 @@ index f702619aa..7b79ee4fe 100644
          entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
  
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch

@@ -1,14 +1,14 @@
-From 13f0a89d99877180dae9b5d4233a909833740b34 Mon Sep 17 00:00:00 2001
+From 2c72901a7914221bfc9e2776b7ff7d885f40ef8c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:46:15 -0500
 Subject: [PATCH] Add option to disable pillager patrols
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c0af1aaf3b..dbc645ebbe 100644
+index c37a0f035..3bbf77a8e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -626,4 +626,9 @@ public class PaperWorldConfig {
+@@ -628,4 +628,9 @@ public class PaperWorldConfig {
      private void generatorSettings() {
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
      }
@@ -19,7 +19,7 @@ index c0af1aaf3b..dbc645ebbe 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
-index 59161143b3..f155179ad4 100644
+index 55fc19fdc..38de3a618 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 {
@@ -31,5 +31,5 @@ index 59161143b3..f155179ad4 100644
              return 0;
          } else {
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch

@@ -1,14 +1,14 @@
-From f70de6c68dbc7c37171890858ad3049ddb26285b Mon Sep 17 00:00:00 2001
+From aaf33f160019b436880109d1cee7f5014f74c1dd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 18 Dec 2019 22:21:35 -0600
 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dbc645ebb..95be6cb2b 100644
+index 3bbf77a8e..f8d8cb865 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -631,4 +631,9 @@ public class PaperWorldConfig {
+@@ -633,4 +633,9 @@ public class PaperWorldConfig {
      private void pillagerSettings() {
          disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
      }
@@ -63,5 +63,5 @@ index c76a43837..e35ec2db0 100644
 +    // Paper end
  }
 -- 
-2.24.1
+2.25.0.windows.1
 

Spigot-Server-Patches/0418-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From 55c73aaf1ae91331a1fc6bbad18fc26506fe6f6e Mon Sep 17 00:00:00 2001
+From 63066de2ceac7c8eba20a27cf786d230eb7badfa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,10 +11,10 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 95be6cb2b..b309fdaba 100644
+index f8d8cb865..3b8488d3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -636,4 +636,13 @@ public class PaperWorldConfig {
+@@ -638,4 +638,13 @@ public class PaperWorldConfig {
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
      }
@@ -307,5 +307,5 @@ index e08faf538..5dded0abe 100644
                  flag = true;
              } else if (a(itemstack1, itemstack)) {
 -- 
-2.24.1
+2.25.0.windows.1