Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b1691e7b Remove some Streams usage in Entity Collision
d454bbd5 Implement JellySquid's Entity Collision optimisations patch
8e85f841 Optimize Collision to not load chunks
ceb824db Fix ChunkCache .getXIfLoaded to use the local chunks in the cache

current-paper

@@ -1 +1 @@
-1.15.2--b3418d8100f75e8b30b24931e91b5446f7d259f1
+1.15.2--4855e238ccb7ca42732659de5fa77da1264a62d9

patches/server/0003-decompile-fixes.patch

@@ -1,4 +1,4 @@
-From 106e7e57474342b5a012d4bad86fe8438a8cc663 Mon Sep 17 00:00:00 2001
+From 6a3e2bccab2447deb3903835280a9fd6f83d8c3c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] decompile-fixes
@@ -95,7 +95,7 @@ Subject: [PATCH] decompile-fixes
  88 files changed, 227 insertions(+), 233 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
-index de831ed87e..9c38f8907a 100644
+index de831ed87..9c38f8907 100644
 --- a/src/main/java/net/minecraft/server/BiomeBambooJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
 @@ -4,9 +4,9 @@ public class BiomeBambooJungle extends BiomeBase {
@@ -112,7 +112,7 @@ index de831ed87e..9c38f8907a 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
-index 5ae19373d6..2a6dafccdd 100644
+index 5ae19373d..2a6dafccd 100644
 --- a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
 @@ -4,9 +4,9 @@ public final class BiomeBambooJungleHills extends BiomeBase {
@@ -129,7 +129,7 @@ index 5ae19373d6..2a6dafccdd 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBeach.java b/src/main/java/net/minecraft/server/BiomeBeach.java
-index 2627404141..f4e9345aeb 100644
+index 262740414..f4e9345ae 100644
 --- a/src/main/java/net/minecraft/server/BiomeBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeBeach.java
 @@ -4,9 +4,9 @@ public final class BiomeBeach extends BiomeBase {
@@ -146,7 +146,7 @@ index 2627404141..f4e9345aeb 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
-index a42098da5c..58c30f6523 100644
+index a42098da5..58c30f652 100644
 --- a/src/main/java/net/minecraft/server/BiomeBigHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBigHills.java
 @@ -4,8 +4,8 @@ public final class BiomeBigHills extends BiomeBase {
@@ -161,7 +161,7 @@ index a42098da5c..58c30f6523 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java
-index 27fa238013..9437438c82 100644
+index 27fa23801..9437438c8 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForest.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForest extends BiomeBase {
@@ -176,7 +176,7 @@ index 27fa238013..9437438c82 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
-index 51b1d39f53..3e5c23d31e 100644
+index 51b1d39f5..3e5c23d31 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForestHills extends BiomeBase {
@@ -191,7 +191,7 @@ index 51b1d39f53..3e5c23d31e 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
-index b74f23cff6..d5eb5c91c4 100644
+index b74f23cff..d5eb5c91c 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForestHillsMutated extends BiomeBase {
@@ -206,7 +206,7 @@ index b74f23cff6..d5eb5c91c4 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
-index 17fe3818dd..e805f9568e 100644
+index 17fe3818d..e805f9568 100644
 --- a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeBirchForestMutated extends BiomeBase {
@@ -221,7 +221,7 @@ index 17fe3818dd..e805f9568e 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java
-index 2c230be98f..1b92f4567d 100644
+index 2c230be98..1b92f4567 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdBeach.java
 @@ -4,9 +4,9 @@ public final class BiomeColdBeach extends BiomeBase {
@@ -238,7 +238,7 @@ index 2c230be98f..1b92f4567d 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
-index d96e820e07..b9a5cb63a4 100644
+index d96e820e0..b9a5cb63a 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
 @@ -4,10 +4,10 @@ public class BiomeColdDeepOcean extends BiomeBase {
@@ -266,7 +266,7 @@ index d96e820e07..b9a5cb63a4 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java
-index c7ed2e134a..571c3d139d 100644
+index c7ed2e134..571c3d139 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdOcean.java
 @@ -4,9 +4,9 @@ public class BiomeColdOcean extends BiomeBase {
@@ -292,7 +292,7 @@ index c7ed2e134a..571c3d139d 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
-index c766dedfa9..88400e77bf 100644
+index c766dedfa..88400e77b 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
 @@ -4,9 +4,9 @@ public final class BiomeColdTaiga extends BiomeBase {
@@ -309,7 +309,7 @@ index c766dedfa9..88400e77bf 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
-index 187f11f584..8a8fc7dbd2 100644
+index 187f11f58..8a8fc7dbd 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
 @@ -4,8 +4,8 @@ public final class BiomeColdTaigaHills extends BiomeBase {
@@ -324,7 +324,7 @@ index 187f11f584..8a8fc7dbd2 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
-index 97c56fb803..327e6847f0 100644
+index 97c56fb80..327e6847f 100644
 --- a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeColdTaigaMutated extends BiomeBase {
@@ -339,7 +339,7 @@ index 97c56fb803..327e6847f0 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
-index bea1293144..651d44cb37 100644
+index bea129314..651d44cb3 100644
 --- a/src/main/java/net/minecraft/server/BiomeDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
 @@ -4,10 +4,10 @@ public final class BiomeDeepOcean extends BiomeBase {
@@ -367,7 +367,7 @@ index bea1293144..651d44cb37 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java
-index 7a8784f18a..257732dad7 100644
+index 7a8784f18..257732dad 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesert.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesert.java
 @@ -4,11 +4,11 @@ public final class BiomeDesert extends BiomeBase {
@@ -388,7 +388,7 @@ index 7a8784f18a..257732dad7 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.e(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java
-index 9f5e9abc41..3752fc4509 100644
+index 9f5e9abc4..3752fc450 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesertHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesertHills.java
 @@ -4,9 +4,9 @@ public final class BiomeDesertHills extends BiomeBase {
@@ -405,7 +405,7 @@ index 9f5e9abc41..3752fc4509 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.e(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
-index f79e438dc4..1a0b569322 100644
+index f79e438dc..1a0b56932 100644
 --- a/src/main/java/net/minecraft/server/BiomeDesertMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeDesertMutated extends BiomeBase {
@@ -420,7 +420,7 @@ index f79e438dc4..1a0b569322 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.e(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
-index 58a6125289..8e19e06889 100644
+index 58a612528..8e19e0688 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsEdge extends BiomeBase {
@@ -435,7 +435,7 @@ index 58a6125289..8e19e06889 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
-index cd18533bb0..69d4880c74 100644
+index cd18533bb..69d4880c7 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsMutated extends BiomeBase {
@@ -450,7 +450,7 @@ index cd18533bb0..69d4880c74 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
-index 2c7f5940a4..7661d53161 100644
+index 2c7f5940a..7661d5316 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTrees extends BiomeBase {
@@ -465,7 +465,7 @@ index 2c7f5940a4..7661d53161 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
-index 6e33c23632..05418f8fa1 100644
+index 6e33c2363..05418f8fa 100644
 --- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTreesMutated extends BiomeBase {
@@ -480,7 +480,7 @@ index 6e33c23632..05418f8fa1 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
-index c6ac9506a7..1d3f624323 100644
+index c6ac9506a..1d3f62432 100644
 --- a/src/main/java/net/minecraft/server/BiomeFlowerForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
 @@ -6,18 +6,18 @@ public final class BiomeFlowerForest extends BiomeBase {
@@ -508,7 +508,7 @@ index c6ac9506a7..1d3f624323 100644
          BiomeDecoratorGroups.Z(this);
          BiomeDecoratorGroups.aa(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
-index 570a1f66f3..e849b411c6 100644
+index 570a1f66f..e849b411c 100644
 --- a/src/main/java/net/minecraft/server/BiomeForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeForest.java
 @@ -4,9 +4,9 @@ public final class BiomeForest extends BiomeBase {
@@ -525,7 +525,7 @@ index 570a1f66f3..e849b411c6 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java
-index 8179e1c603..f7dea38eb3 100644
+index 8179e1c60..f7dea38eb 100644
 --- a/src/main/java/net/minecraft/server/BiomeForestHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeForestHills.java
 @@ -4,9 +4,9 @@ public final class BiomeForestHills extends BiomeBase {
@@ -542,7 +542,7 @@ index 8179e1c603..f7dea38eb3 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
-index 852c4bd9ab..67d120bef2 100644
+index 852c4bd9a..67d120bef 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
 @@ -6,10 +6,10 @@ public class BiomeFrozenDeepOcean extends BiomeBase {
@@ -561,7 +561,7 @@ index 852c4bd9ab..67d120bef2 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
-index 3d649c6004..2772bc6dac 100644
+index 3d649c600..2772bc6da 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
 @@ -6,9 +6,9 @@ public final class BiomeFrozenOcean extends BiomeBase {
@@ -578,7 +578,7 @@ index 3d649c6004..2772bc6dac 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
-index 915f20042b..4be53fc0f6 100644
+index 915f20042..4be53fc0f 100644
 --- a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
 +++ b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
 @@ -4,7 +4,7 @@ public final class BiomeFrozenRiver extends BiomeBase {
@@ -591,7 +591,7 @@ index 915f20042b..4be53fc0f6 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java
-index f9ca6b889a..888dfcd8d4 100644
+index f9ca6b889..888dfcd8d 100644
 --- a/src/main/java/net/minecraft/server/BiomeHell.java
 +++ b/src/main/java/net/minecraft/server/BiomeHell.java
 @@ -4,20 +4,20 @@ public final class BiomeHell extends BiomeBase {
@@ -629,7 +629,7 @@ index f9ca6b889a..888dfcd8d4 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ZOMBIE_PIGMAN, 100, 4, 4));
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.MAGMA_CUBE, 2, 4, 4));
 diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java
-index d5033de8aa..ad9b4efe09 100644
+index d5033de8a..ad9b4efe0 100644
 --- a/src/main/java/net/minecraft/server/BiomeIceMountains.java
 +++ b/src/main/java/net/minecraft/server/BiomeIceMountains.java
 @@ -4,8 +4,8 @@ public final class BiomeIceMountains extends BiomeBase {
@@ -644,7 +644,7 @@ index d5033de8aa..ad9b4efe09 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java
-index 054b0e0ab1..71606b0a71 100644
+index 054b0e0ab..71606b0a7 100644
 --- a/src/main/java/net/minecraft/server/BiomeIcePlains.java
 +++ b/src/main/java/net/minecraft/server/BiomeIcePlains.java
 @@ -4,11 +4,11 @@ public final class BiomeIcePlains extends BiomeBase {
@@ -665,7 +665,7 @@ index 054b0e0ab1..71606b0a71 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
-index 44c410f75c..984f94bb59 100644
+index 44c410f75..984f94bb5 100644
 --- a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
 +++ b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
 @@ -4,14 +4,14 @@ public final class BiomeIcePlainsSpikes extends BiomeBase {
@@ -688,7 +688,7 @@ index 44c410f75c..984f94bb59 100644
          BiomeDecoratorGroups.h(this);
          BiomeDecoratorGroups.l(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index 2f893ce918..95e5019968 100644
+index 2f893ce91..95e501996 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -4,9 +4,9 @@ public final class BiomeJungle extends BiomeBase {
@@ -705,7 +705,7 @@ index 2f893ce918..95e5019968 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
-index 4858617859..e624f9764f 100644
+index 485861785..e624f9764 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleEdge.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
 @@ -4,8 +4,8 @@ public final class BiomeJungleEdge extends BiomeBase {
@@ -720,7 +720,7 @@ index 4858617859..e624f9764f 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
-index a957f6124b..1fe9c840a7 100644
+index a957f6124..1fe9c840a 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeJungleEdgeMutated extends BiomeBase {
@@ -735,7 +735,7 @@ index a957f6124b..1fe9c840a7 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java
-index 7b9bc967a9..e2970ab00e 100644
+index 7b9bc967a..e2970ab00 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleHills.java
 @@ -4,9 +4,9 @@ public final class BiomeJungleHills extends BiomeBase {
@@ -752,7 +752,7 @@ index 7b9bc967a9..e2970ab00e 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
-index 02246950d0..ffe6b4344e 100644
+index 02246950d..ffe6b4344 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungleMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeJungleMutated extends BiomeBase {
@@ -767,7 +767,7 @@ index 02246950d0..ffe6b4344e 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
-index e6d4a2c397..b23c43305b 100644
+index e6d4a2c39..b23c43305 100644
 --- a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
 @@ -4,10 +4,10 @@ public class BiomeLukewarmDeepOcean extends BiomeBase {
@@ -786,7 +786,7 @@ index e6d4a2c397..b23c43305b 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
-index f2dc5d1b5c..efcb11bbe8 100644
+index f2dc5d1b5..efcb11bbe 100644
 --- a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
 @@ -4,9 +4,9 @@ public class BiomeLukewarmOcean extends BiomeBase {
@@ -803,7 +803,7 @@ index f2dc5d1b5c..efcb11bbe8 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
-index f6ec90c2d0..328e939a6f 100644
+index f6ec90c2d..328e939a6 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
 @@ -4,8 +4,8 @@ public final class BiomeMegaSpruceTaiga extends BiomeBase {
@@ -818,7 +818,7 @@ index f6ec90c2d0..328e939a6f 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
-index e9ad930d88..36bea710a0 100644
+index e9ad930d8..36bea710a 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
 @@ -4,8 +4,8 @@ public final class BiomeMegaTaiga extends BiomeBase {
@@ -833,7 +833,7 @@ index e9ad930d88..36bea710a0 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
-index cdc182c229..22474d682a 100644
+index cdc182c22..22474d682 100644
 --- a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
 @@ -4,8 +4,8 @@ public final class BiomeMegaTaigaHills extends BiomeBase {
@@ -848,7 +848,7 @@ index cdc182c229..22474d682a 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
-index 95e602a95f..65d606d51c 100644
+index 95e602a95..65d606d51 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesa.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesa.java
 @@ -4,8 +4,8 @@ public final class BiomeMesa extends BiomeBase {
@@ -863,7 +863,7 @@ index 95e602a95f..65d606d51c 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
-index 57ef10afb0..5ecec62f18 100644
+index 57ef10afb..5ecec62f1 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaBryce.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaBryce extends BiomeBase {
@@ -878,7 +878,7 @@ index 57ef10afb0..5ecec62f18 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
-index b9f81a044f..14d4bd312e 100644
+index b9f81a044..14d4bd312 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlataeu extends BiomeBase {
@@ -893,7 +893,7 @@ index b9f81a044f..14d4bd312e 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
-index 3ce8d3cef5..b5dab9d2aa 100644
+index 3ce8d3cef..b5dab9d2a 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlataeuClear extends BiomeBase {
@@ -908,7 +908,7 @@ index 3ce8d3cef5..b5dab9d2aa 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
-index 88b7b37467..d05cc38b5e 100644
+index 88b7b3746..d05cc38b5 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlateauClearMutated extends BiomeBase {
@@ -923,7 +923,7 @@ index 88b7b37467..d05cc38b5e 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
-index 7254bcf3e5..21a77ee812 100644
+index 7254bcf3e..21a77ee81 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeMesaPlateauMutated extends BiomeBase {
@@ -938,7 +938,7 @@ index 7254bcf3e5..21a77ee812 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
-index 58bc1f2343..0302efbdc7 100644
+index 58bc1f234..0302efbdc 100644
 --- a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
 +++ b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
 @@ -4,8 +4,8 @@ public final class BiomeMushroomIslandShore extends BiomeBase {
@@ -953,7 +953,7 @@ index 58bc1f2343..0302efbdc7 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java
-index cb620014b7..51f92584b8 100644
+index cb620014b..51f92584b 100644
 --- a/src/main/java/net/minecraft/server/BiomeMushrooms.java
 +++ b/src/main/java/net/minecraft/server/BiomeMushrooms.java
 @@ -4,8 +4,8 @@ public final class BiomeMushrooms extends BiomeBase {
@@ -968,7 +968,7 @@ index cb620014b7..51f92584b8 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java
-index fd7e991062..ad9628b2aa 100644
+index fd7e99106..ad9628b2a 100644
 --- a/src/main/java/net/minecraft/server/BiomeOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeOcean.java
 @@ -4,9 +4,9 @@ public final class BiomeOcean extends BiomeBase {
@@ -994,7 +994,7 @@ index fd7e991062..ad9628b2aa 100644
          BiomeDecoratorGroups.ah(this);
          BiomeDecoratorGroups.ap(this);
 diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java
-index efbb36d016..ff6090e3c1 100644
+index efbb36d01..ff6090e3c 100644
 --- a/src/main/java/net/minecraft/server/BiomePlains.java
 +++ b/src/main/java/net/minecraft/server/BiomePlains.java
 @@ -4,10 +4,10 @@ public final class BiomePlains extends BiomeBase {
@@ -1013,7 +1013,7 @@ index efbb36d016..ff6090e3c1 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
-index 7804a4e329..a28222eb1d 100644
+index 7804a4e32..a28222eb1 100644
 --- a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeRedwoodTaigaHillsMutated extends BiomeBase {
@@ -1028,7 +1028,7 @@ index 7804a4e329..a28222eb1d 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java
-index 6522c80214..b84b868b1a 100644
+index 6522c8021..b84b868b1 100644
 --- a/src/main/java/net/minecraft/server/BiomeRiver.java
 +++ b/src/main/java/net/minecraft/server/BiomeRiver.java
 @@ -4,7 +4,7 @@ public final class BiomeRiver extends BiomeBase {
@@ -1050,7 +1050,7 @@ index 6522c80214..b84b868b1a 100644
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 2, 1, 4));
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SALMON, 5, 1, 5));
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
-index 30d6802242..16bcf9bff0 100644
+index 30d680224..16bcf9bff 100644
 --- a/src/main/java/net/minecraft/server/BiomeRoofedForest.java
 +++ b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
 @@ -6,14 +6,14 @@ public final class BiomeRoofedForest extends BiomeBase {
@@ -1073,7 +1073,7 @@ index 30d6802242..16bcf9bff0 100644
          BiomeDecoratorGroups.g(this);
          BiomeDecoratorGroups.h(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
-index 5c9ab0864e..9fa84c87fa 100644
+index 5c9ab0864..9fa84c87f 100644
 --- a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
 @@ -6,14 +6,14 @@ public final class BiomeRoofedForestMutated extends BiomeBase {
@@ -1096,7 +1096,7 @@ index 5c9ab0864e..9fa84c87fa 100644
          BiomeDecoratorGroups.g(this);
          BiomeDecoratorGroups.h(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java
-index e023898b38..c12a890165 100644
+index e023898b3..c12a89016 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavanna.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavanna.java
 @@ -4,10 +4,10 @@ public final class BiomeSavanna extends BiomeBase {
@@ -1115,7 +1115,7 @@ index e023898b38..c12a890165 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
-index 8a0da661fb..db8b20a6c7 100644
+index 8a0da661f..db8b20a6c 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeSavannaMutated extends BiomeBase {
@@ -1130,7 +1130,7 @@ index 8a0da661fb..db8b20a6c7 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
-index 1d2a37a41e..2826c510d8 100644
+index 1d2a37a41..2826c510d 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
 @@ -4,8 +4,8 @@ public final class BiomeSavannaPlateau extends BiomeBase {
@@ -1145,7 +1145,7 @@ index 1d2a37a41e..2826c510d8 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
-index 91e2b59037..e544a8f6b9 100644
+index 91e2b5903..e544a8f6b 100644
 --- a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeSavannaPlateauMutated extends BiomeBase {
@@ -1160,7 +1160,7 @@ index 91e2b59037..e544a8f6b9 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
-index 501c36649e..34660f9f84 100644
+index 501c36649..34660f9f8 100644
 --- a/src/main/java/net/minecraft/server/BiomeStoneBeach.java
 +++ b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
 @@ -4,8 +4,8 @@ public final class BiomeStoneBeach extends BiomeBase {
@@ -1175,7 +1175,7 @@ index 501c36649e..34660f9f84 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
-index 62c1cfaef9..8815c95900 100644
+index 62c1cfaef..8815c9590 100644
 --- a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
 +++ b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
 @@ -4,21 +4,21 @@ public final class BiomeSunflowerPlains extends BiomeBase {
@@ -1206,7 +1206,7 @@ index 62c1cfaef9..8815c95900 100644
          BiomeDecoratorGroups.ap(this);
          this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java
-index 29e448f5ad..02584897e9 100644
+index 29e448f5a..02584897e 100644
 --- a/src/main/java/net/minecraft/server/BiomeSwamp.java
 +++ b/src/main/java/net/minecraft/server/BiomeSwamp.java
 @@ -4,8 +4,8 @@ public final class BiomeSwamp extends BiomeBase {
@@ -1230,7 +1230,7 @@ index 29e448f5ad..02584897e9 100644
          BiomeDecoratorGroups.ap(this);
          this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
 diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
-index 1352daa258..d85b01b956 100644
+index 1352daa25..d85b01b95 100644
 --- a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
 @@ -4,7 +4,7 @@ public final class BiomeSwamplandMutated extends BiomeBase {
@@ -1243,7 +1243,7 @@ index 1352daa258..d85b01b956 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java
-index 5cd569dcdd..ae6e6ca896 100644
+index 5cd569dcd..ae6e6ca89 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaiga.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaiga.java
 @@ -4,10 +4,10 @@ public final class BiomeTaiga extends BiomeBase {
@@ -1262,7 +1262,7 @@ index 5cd569dcdd..ae6e6ca896 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
-index e182f04008..4e19fe5ae9 100644
+index e182f0400..4e19fe5ae 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaigaHills.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
 @@ -4,8 +4,8 @@ public final class BiomeTaigaHills extends BiomeBase {
@@ -1277,7 +1277,7 @@ index e182f04008..4e19fe5ae9 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
-index 75d46c61dc..05e833ffed 100644
+index 75d46c61d..05e833ffe 100644
 --- a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
 +++ b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
 @@ -4,8 +4,8 @@ public final class BiomeTaigaMutated extends BiomeBase {
@@ -1292,7 +1292,7 @@ index 75d46c61dc..05e833ffed 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java
-index 26fda2cf69..22e9789a36 100644
+index 26fda2cf6..22e9789a3 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEnd.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEnd.java
 @@ -6,7 +6,7 @@ public final class BiomeTheEnd extends BiomeBase {
@@ -1305,7 +1305,7 @@ index 26fda2cf69..22e9789a36 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
      }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
-index c065128649..a26d56aa45 100644
+index c06512864..a26d56aa4 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
 @@ -4,7 +4,7 @@ public class BiomeTheEndFloatingIslands extends BiomeBase {
@@ -1318,7 +1318,7 @@ index c065128649..a26d56aa45 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
      }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
-index 90e79b2918..e47add3e43 100644
+index 90e79b291..e47add3e4 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
 @@ -4,10 +4,10 @@ public class BiomeTheEndHighIsland extends BiomeBase {
@@ -1336,7 +1336,7 @@ index 90e79b2918..e47add3e43 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
-index c7d5317cc0..ec92a84579 100644
+index c7d5317cc..ec92a8457 100644
 --- a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
 +++ b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
 @@ -4,7 +4,7 @@ public class BiomeTheEndMediumIsland extends BiomeBase {
@@ -1349,7 +1349,7 @@ index c7d5317cc0..ec92a84579 100644
          this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
      }
 diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java
-index 87fd7e1467..c9ba334535 100644
+index 87fd7e146..c9ba33453 100644
 --- a/src/main/java/net/minecraft/server/BiomeVoid.java
 +++ b/src/main/java/net/minecraft/server/BiomeVoid.java
 @@ -4,6 +4,6 @@ public final class BiomeVoid extends BiomeBase {
@@ -1361,7 +1361,7 @@ index 87fd7e1467..c9ba334535 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
-index 3f8e18a2c7..11dc5f6374 100644
+index 3f8e18a2c..11dc5f637 100644
 --- a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
 @@ -4,10 +4,10 @@ public class BiomeWarmDeepOcean extends BiomeBase {
@@ -1380,7 +1380,7 @@ index 3f8e18a2c7..11dc5f6374 100644
          BiomeDecoratorGroups.c(this);
          BiomeDecoratorGroups.d(this);
 diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
-index dd7916c090..e4dc7d198c 100644
+index dd7916c09..e4dc7d198 100644
 --- a/src/main/java/net/minecraft/server/BiomeWarmOcean.java
 +++ b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
 @@ -6,9 +6,9 @@ public class BiomeWarmOcean extends BiomeBase {
@@ -1409,7 +1409,7 @@ index dd7916c090..e4dc7d198c 100644
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 10, 4, 4));
          this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.PUFFERFISH, 15, 1, 3));
 diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
-index d384e9578a..f0d72ea39d 100644
+index d384e9578..f0d72ea39 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -25,7 +25,7 @@ public class CommandDebug {
@@ -1422,7 +1422,7 @@ index d384e9578a..f0d72ea39d 100644
      public static void a(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> com_mojang_brigadier_commanddispatcher) {
          com_mojang_brigadier_commanddispatcher.register((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) CommandDispatcher.a("debug").requires((commandlistenerwrapper) -> {
 diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
-index 5b1d2c7f50..da6a3fa2c8 100644
+index 5b1d2c7f5..da6a3fa2c 100644
 --- a/src/main/java/net/minecraft/server/EntityBlaze.java
 +++ b/src/main/java/net/minecraft/server/EntityBlaze.java
 @@ -24,7 +24,7 @@ public class EntityBlaze extends EntityMonster {
@@ -1435,7 +1435,7 @@ index 5b1d2c7f50..da6a3fa2c8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index 57af3835ee..b3bdc194ab 100644
+index 57af3835e..b3bdc194a 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -16,7 +16,7 @@ public class EntityCat extends EntityTameableAnimal {
@@ -1448,7 +1448,7 @@ index 57af3835ee..b3bdc194ab 100644
          hashmap.put(1, new MinecraftKey("textures/entity/cat/black.png"));
          hashmap.put(2, new MinecraftKey("textures/entity/cat/red.png"));
 diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
-index c13abc7e07..7ebd7da1c5 100644
+index c13abc7e0..7ebd7da1c 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
 @@ -21,7 +21,7 @@ public class EntityEnderSignal extends Entity {
@@ -1461,7 +1461,7 @@ index c13abc7e07..7ebd7da1c5 100644
              }));
          }
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
-index b34695f2d0..e4bd2796a4 100644
+index b34695f2d..e4bd2796a 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
 +++ b/src/main/java/net/minecraft/server/EntityEndermite.java
 @@ -19,7 +19,7 @@ public class EntityEndermite extends EntityMonster {
@@ -1474,7 +1474,7 @@ index b34695f2d0..e4bd2796a4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 886268b09e..b030fe9577 100644
+index 886268b09..b030fe957 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -24,7 +24,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1487,7 +1487,7 @@ index 886268b09e..b030fe9577 100644
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
-index d332907b3b..b853fd0d9b 100644
+index d332907b3..b853fd0d9 100644
 --- a/src/main/java/net/minecraft/server/EntityFish.java
 +++ b/src/main/java/net/minecraft/server/EntityFish.java
 @@ -73,11 +73,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1504,7 +1504,7 @@ index d332907b3b..b853fd0d9b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 1402087612..94e57a2d85 100644
+index 140208761..94e57a2d8 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -20,8 +20,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -1519,7 +1519,7 @@ index 1402087612..94e57a2d85 100644
          hashmap.put(EntityTypes.CAVE_SPIDER, SoundEffects.ENTITY_PARROT_IMITATE_SPIDER);
          hashmap.put(EntityTypes.CREEPER, SoundEffects.ENTITY_PARROT_IMITATE_CREEPER);
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index a8ef98981d..d5ffdc110d 100644
+index bb46247f2..f63528ca3 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -18,7 +18,7 @@ import org.bukkit.inventory.InventoryView;
@@ -1543,7 +1543,7 @@ index a8ef98981d..d5ffdc110d 100644
      private PathfinderGoalEatTile bA;
  
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 7b6b1ad17b..1432d3f6bf 100644
+index 7b6b1ad17..1432d3f6b 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -30,13 +30,13 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -1563,7 +1563,7 @@ index 7b6b1ad17b..1432d3f6bf 100644
          this.targetSelector.a(3, this.bA);
      }
 diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java
-index e865a5694f..acc5f61ced 100644
+index 5648ba73c..304190fdc 100644
 --- a/src/main/java/net/minecraft/server/GeneratorAccess.java
 +++ b/src/main/java/net/minecraft/server/GeneratorAccess.java
 @@ -49,7 +49,7 @@ public interface GeneratorAccess extends IEntityAccess, IWorldReader, VirtualLev
@@ -1574,9 +1574,9 @@ index e865a5694f..acc5f61ced 100644
 +        this.a(null, i, blockposition, j); // Purpur - decompile error
      }
  
-     @Override
+     @Override default java.util.List<VoxelShape> getEntityCollisions(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Set<Entity> set, boolean returnFast) {return IEntityAccess.super.getEntityCollisions(entity, axisalignedbb, set, returnFast); } // Paper
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 38b79b5b10..c4aa38ddf1 100644
+index 38b79b5b1..c4aa38ddf 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
@@ -1589,7 +1589,7 @@ index 38b79b5b10..c4aa38ddf1 100644
              afloat[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
          }
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
-index de8f1874af..73402f2b5a 100644
+index de8f1874a..73402f2b5 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
 @@ -25,7 +25,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
@@ -1602,7 +1602,7 @@ index de8f1874af..73402f2b5a 100644
  
      public WorldGenFeatureRandomChoiceConfigurationWeight<FC> a(float f) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
-index 979f3517c0..5827b1ba1a 100644
+index 979f3517c..5827b1ba1 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
 @@ -58,6 +58,6 @@ public class WorldGenFeatureTreeBeehive extends WorldGenFeatureTree {

patches/server/0007-Ridables.patch

@@ -1,4 +1,4 @@
-From b38d49c4521e69aad41951622616d80d2ef017d7 Mon Sep 17 00:00:00 2001
+From e9e36c5f91db8a630a6e784ddc8f33d8df885405 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -116,7 +116,7 @@ Subject: [PATCH] Ridables
  create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 3fdb52007..7e67292c2 100644
+index 1a466e929..203c8fe8c 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -104,6 +104,7 @@ public class AxisAlignedBB {
@@ -199,7 +199,7 @@ index 816d301f1..f7344d3ae 100644
          this.C = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8820e4b65..36088330e 100644
+index cd2c18382..418126197 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -246,7 +246,7 @@ index 8820e4b65..36088330e 100644
      public static double b(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1198,6 +1199,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1199,6 +1200,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return flag;
      }
  
@@ -254,7 +254,7 @@ index 8820e4b65..36088330e 100644
      private boolean l() {
          return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
      }
-@@ -1211,8 +1213,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1212,8 +1214,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.l();
      }
  
@@ -265,7 +265,7 @@ index 8820e4b65..36088330e 100644
      }
  
      public boolean aA() {
-@@ -1343,6 +1346,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1344,6 +1347,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inLava;
      }
  
@@ -273,7 +273,7 @@ index 8820e4b65..36088330e 100644
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2177,7 +2181,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2179,7 +2183,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -288,7 +288,7 @@ index 8820e4b65..36088330e 100644
          }
          return true; // CraftBukkit
      }
-@@ -2212,6 +2222,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2214,6 +2224,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -301,7 +301,7 @@ index 8820e4b65..36088330e 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2380,6 +2396,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2382,6 +2398,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -309,7 +309,7 @@ index 8820e4b65..36088330e 100644
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2598,6 +2615,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2600,6 +2617,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -317,7 +317,7 @@ index 8820e4b65..36088330e 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3452,4 +3470,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3454,4 +3472,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }

patches/server/0019-Cows-eat-mushrooms.patch

@@ -1,4 +1,4 @@
-From a51f4b1ec17222b8c99220ecc19fdec9bb881754 Mon Sep 17 00:00:00 2001
+From 23ad60ec8f75e9da9a58ed56affc15165cf59435 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] Cows eat mushrooms
@@ -11,7 +11,7 @@ Subject: [PATCH] Cows eat mushrooms
  4 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 36088330e..cdf908cc1 100644
+index 418126197..008b6a1d7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1096,6 +1096,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index 36088330e..cdf908cc1 100644
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
-@@ -2642,6 +2643,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2644,6 +2645,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  

patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -1,4 +1,4 @@
-From fe16df95ac31d875b31c4deae029b3f6586634b9 Mon Sep 17 00:00:00 2001
+From 7fd828cf0d1c476ee0c44ab9b6d351522940ba5f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -25,10 +25,10 @@ index f7344d3ae..f6c0165f9 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index cdf908cc1..c8afacb64 100644
+index 008b6a1d7..128409516 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1442,6 +1442,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1443,6 +1443,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -36,7 +36,7 @@ index cdf908cc1..c8afacb64 100644
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -1971,14 +1972,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1972,14 +1973,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
  
@@ -350,7 +350,7 @@ index 777bc95ee..265077048 100644
  
              return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 5135308fb..899619009 100644
+index 3bc57ef91..e0d97d2c8 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -34,6 +34,7 @@ public interface IEntityAccess {

patches/server/0030-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From 63a27259e3672fa56ce6c6952ec89b6b9caeba91 Mon Sep 17 00:00:00 2001
+From edb03f00873ebbc1019e08b8ac1c1cdf03ce4659 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c8afacb64..b64e287db 100644
+index 128409516..e54d8f595 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1343,6 +1343,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1344,6 +1344,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
  

patches/server/0037-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 3a361398ad21e98a81237dd15cff86cd3aa94201 Mon Sep 17 00:00:00 2001
+From d1cf022928b0c3dee8838a58215fc5cfef8fb2c2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -18,10 +18,10 @@ Subject: [PATCH] Implement AFK API
  11 files changed, 111 insertions(+), 25 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b64e287db..944199404 100644
+index e54d8f595..3533dbcd5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1435,6 +1435,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1436,6 +1436,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return MathHelper.c(f * f + f1 * f1 + f2 * f2);
      }
  
@@ -106,10 +106,10 @@ index f3278d356..219a274f9 100644
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 899619009..d9f246b87 100644
+index e0d97d2c8..e1a7926d7 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
-@@ -125,28 +125,18 @@ public interface IEntityAccess {
+@@ -150,28 +150,18 @@ public interface IEntityAccess {
          return entityhuman;
      }
  

patches/server/0044-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From 6c262a836b9e397bba5943f9f130ecdf09a26063 Mon Sep 17 00:00:00 2001
+From 25bbc9ac23524b9aa48af17f295ef5d60d90c834 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:52 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
@@ -86,7 +86,7 @@ index 09c7c1318..6880cdd7f 100644
                      break;
                      // CraftBukkit start - add the block to our list
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 944199404..ceba4f355 100644
+index 3533dbcd5..b609808df 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -169,9 +169,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 944199404..ceba4f355 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2283,6 +2283,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2285,6 +2285,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.world.getMethodProfiler().enter("portal");
                      this.ag = i;
                      this.portalCooldown = this.ba();

patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From c10b2b1a786a5b0fc07c60b9665db2e502a51492 Mon Sep 17 00:00:00 2001
+From 67a83ab0381a8c7bcc1c66908354ca49433b88b9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ceba4f355..ae119067e 100644
+index b609808df..2e9496136 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1570,6 +1570,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1571,6 +1571,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isCollidable() {

patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch

@@ -1,4 +1,4 @@
-From 0237527ce0f7c3b8ff3b2e2a513d8ad51484356b Mon Sep 17 00:00:00 2001
+From 28e69a3ee02a3c62d369a19a53df26930bd1ae6d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -15,7 +15,7 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
  8 files changed, 58 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index fa893b14b..a60e4ef36 100644
+index e625842e5..f126d8d63 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -437,6 +437,7 @@ public class ChunkRegionLoader {
@@ -27,10 +27,10 @@ index fa893b14b..a60e4ef36 100644
                      // Paper start
                      if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ae119067e..6406e6c5d 100644
+index 2e9496136..2a4603214 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1587,6 +1587,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1588,6 +1588,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  

patches/server/0091-Add-item-entity-options.patch

@@ -1,4 +1,4 @@
-From 78498ce0b82d11b1ec78e6a598e14fb8a4e2b1db Mon Sep 17 00:00:00 2001
+From 9a407c03071a9286e414bd4fe4feadc61e9132b7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -10,10 +10,10 @@ Subject: [PATCH] Add item entity options
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6406e6c5d..e5a2414c1 100644
+index 2a4603214..fac9fe23a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1318,6 +1318,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1319,6 +1319,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  

patches/server/0094-Fix-the-dead-lagging-the-server.patch

@@ -1,4 +1,4 @@
-From ef29b912a54e3489dfada87a8006f210cd2e3681 Mon Sep 17 00:00:00 2001
+From 349b3023f48e71d5352cd02b3538f1d0aece1d42 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix the dead lagging the server
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f04319b1f..074a0ee0c 100644
+index ca524a7db..b57f26373 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1404,7 +1404,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1405,7 +1405,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
          this.lastYaw = this.yaw;
          this.lastPitch = this.pitch;