From 87559bd84c394f31a456e4f53a12036c27fdcc11 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 18 Mar 2020 23:33:12 -0500 Subject: [PATCH] Fix save projectiles to disk option not covering all projectiles --- patches/server/0004-decompile-fixes.patch | 184 ++++++++++-------- ...o-disable-saving-projectiles-to-disk.patch | 132 ++++++++++++- ...-arrow-despawn-counter-fixes-MC-1257.patch | 10 +- 3 files changed, 230 insertions(+), 96 deletions(-) diff --git a/patches/server/0004-decompile-fixes.patch b/patches/server/0004-decompile-fixes.patch index 45807740d..f5e59fdce 100644 --- a/patches/server/0004-decompile-fixes.patch +++ b/patches/server/0004-decompile-fixes.patch @@ -1,4 +1,4 @@ -From b5058389746648812a8af122af30dae32048f40f Mon Sep 17 00:00:00 2001 +From 78df18c4d04fbb1762b3561c4470429cf8f2aa13 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 13:39:06 -0600 Subject: [PATCH] decompile-fixes @@ -80,6 +80,7 @@ Subject: [PATCH] decompile-fixes .../net/minecraft/server/BiomeWarmOcean.java | 10 +++---- .../net/minecraft/server/EntityBlaze.java | 2 +- .../java/net/minecraft/server/EntityCat.java | 2 +- + .../minecraft/server/EntityEnderSignal.java | 2 +- .../net/minecraft/server/EntityEndermite.java | 2 +- .../net/minecraft/server/EntityEvoker.java | 2 +- .../java/net/minecraft/server/EntityFish.java | 6 +---- @@ -87,10 +88,10 @@ Subject: [PATCH] decompile-fixes .../net/minecraft/server/EntitySheep.java | 6 ++--- .../net/minecraft/server/EntityWitch.java | 4 +-- .../server/WorldGenFeatureConfigured.java | 2 +- - 83 files changed, 222 insertions(+), 228 deletions(-) + 84 files changed, 223 insertions(+), 229 deletions(-) diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java -index de831ed87..9c38f8907 100644 +index de831ed87e..9c38f8907a 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 { @@ -107,7 +108,7 @@ index de831ed87..9c38f8907 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 5ae19373d..2a6dafccd 100644 +index 5ae19373d6..2a6dafccdd 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 { @@ -124,7 +125,7 @@ index 5ae19373d..2a6dafccd 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 262740414..f4e9345ae 100644 +index 2627404141..f4e9345aeb 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 { @@ -141,7 +142,7 @@ index 262740414..f4e9345ae 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 a42098da5..58c30f652 100644 +index a42098da5c..58c30f6523 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 { @@ -156,7 +157,7 @@ index a42098da5..58c30f652 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 27fa23801..9437438c8 100644 +index 27fa238013..9437438c82 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 { @@ -171,7 +172,7 @@ index 27fa23801..9437438c8 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 51b1d39f5..3e5c23d31 100644 +index 51b1d39f53..3e5c23d31e 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 { @@ -186,7 +187,7 @@ index 51b1d39f5..3e5c23d31 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 b74f23cff..d5eb5c91c 100644 +index b74f23cff6..d5eb5c91c4 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 { @@ -201,7 +202,7 @@ index b74f23cff..d5eb5c91c 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 17fe3818d..e805f9568 100644 +index 17fe3818dd..e805f9568e 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 { @@ -216,7 +217,7 @@ index 17fe3818d..e805f9568 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 2c230be98..1b92f4567 100644 +index 2c230be98f..1b92f4567d 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 { @@ -233,7 +234,7 @@ index 2c230be98..1b92f4567 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 d96e820e0..b9a5cb63a 100644 +index d96e820e07..b9a5cb63a4 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 { @@ -261,7 +262,7 @@ index d96e820e0..b9a5cb63a 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 c7ed2e134..571c3d139 100644 +index c7ed2e134a..571c3d139d 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 { @@ -287,7 +288,7 @@ index c7ed2e134..571c3d139 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 c766dedfa..88400e77b 100644 +index c766dedfa9..88400e77bf 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 { @@ -304,7 +305,7 @@ index c766dedfa..88400e77b 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 187f11f58..8a8fc7dbd 100644 +index 187f11f584..8a8fc7dbd2 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 { @@ -319,7 +320,7 @@ index 187f11f58..8a8fc7dbd 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 97c56fb80..327e6847f 100644 +index 97c56fb803..327e6847f0 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 { @@ -334,7 +335,7 @@ index 97c56fb80..327e6847f 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 bea129314..651d44cb3 100644 +index bea1293144..651d44cb37 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 { @@ -362,7 +363,7 @@ index bea129314..651d44cb3 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 7a8784f18..257732dad 100644 +index 7a8784f18a..257732dad7 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 { @@ -383,7 +384,7 @@ index 7a8784f18..257732dad 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 9f5e9abc4..3752fc450 100644 +index 9f5e9abc41..3752fc4509 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 { @@ -400,7 +401,7 @@ index 9f5e9abc4..3752fc450 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 f79e438dc..1a0b56932 100644 +index f79e438dc4..1a0b569322 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 { @@ -415,7 +416,7 @@ index f79e438dc..1a0b56932 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 58a612528..8e19e0688 100644 +index 58a6125289..8e19e06889 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 { @@ -430,7 +431,7 @@ index 58a612528..8e19e0688 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 cd18533bb..69d4880c7 100644 +index cd18533bb0..69d4880c74 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 { @@ -445,7 +446,7 @@ index cd18533bb..69d4880c7 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 2c7f5940a..7661d5316 100644 +index 2c7f5940a4..7661d53161 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 { @@ -460,7 +461,7 @@ index 2c7f5940a..7661d5316 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 6e33c2363..05418f8fa 100644 +index 6e33c23632..05418f8fa1 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 { @@ -475,7 +476,7 @@ index 6e33c2363..05418f8fa 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 c6ac9506a..1d3f62432 100644 +index c6ac9506a7..1d3f624323 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 { @@ -503,7 +504,7 @@ index c6ac9506a..1d3f62432 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 570a1f66f..e849b411c 100644 +index 570a1f66f3..e849b411c6 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 { @@ -520,7 +521,7 @@ index 570a1f66f..e849b411c 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 8179e1c60..f7dea38eb 100644 +index 8179e1c603..f7dea38eb3 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 { @@ -537,7 +538,7 @@ index 8179e1c60..f7dea38eb 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 852c4bd9a..67d120bef 100644 +index 852c4bd9ab..67d120bef2 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 { @@ -556,7 +557,7 @@ index 852c4bd9a..67d120bef 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 3d649c600..2772bc6da 100644 +index 3d649c6004..2772bc6dac 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 { @@ -573,7 +574,7 @@ index 3d649c600..2772bc6da 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 915f20042..4be53fc0f 100644 +index 915f20042b..4be53fc0f6 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 { @@ -586,7 +587,7 @@ index 915f20042..4be53fc0f 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 f9ca6b889..888dfcd8d 100644 +index f9ca6b889a..888dfcd8d4 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 { @@ -624,7 +625,7 @@ index f9ca6b889..888dfcd8d 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 d5033de8a..ad9b4efe0 100644 +index d5033de8aa..ad9b4efe09 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 { @@ -639,7 +640,7 @@ index d5033de8a..ad9b4efe0 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 054b0e0ab..71606b0a7 100644 +index 054b0e0ab1..71606b0a71 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 { @@ -660,7 +661,7 @@ index 054b0e0ab..71606b0a7 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 44c410f75..984f94bb5 100644 +index 44c410f75c..984f94bb59 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 { @@ -683,7 +684,7 @@ index 44c410f75..984f94bb5 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 2f893ce91..95e501996 100644 +index 2f893ce918..95e5019968 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 { @@ -700,7 +701,7 @@ index 2f893ce91..95e501996 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 485861785..e624f9764 100644 +index 4858617859..e624f9764f 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 { @@ -715,7 +716,7 @@ index 485861785..e624f9764 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 a957f6124..1fe9c840a 100644 +index a957f6124b..1fe9c840a7 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 { @@ -730,7 +731,7 @@ index a957f6124..1fe9c840a 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 7b9bc967a..e2970ab00 100644 +index 7b9bc967a9..e2970ab00e 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 { @@ -747,7 +748,7 @@ index 7b9bc967a..e2970ab00 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 02246950d..ffe6b4344 100644 +index 02246950d0..ffe6b4344e 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 { @@ -762,7 +763,7 @@ index 02246950d..ffe6b4344 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 e6d4a2c39..b23c43305 100644 +index e6d4a2c397..b23c43305b 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 { @@ -781,7 +782,7 @@ index e6d4a2c39..b23c43305 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 f2dc5d1b5..efcb11bbe 100644 +index f2dc5d1b5c..efcb11bbe8 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 { @@ -798,7 +799,7 @@ index f2dc5d1b5..efcb11bbe 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 f6ec90c2d..328e939a6 100644 +index f6ec90c2d0..328e939a6f 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 { @@ -813,7 +814,7 @@ index f6ec90c2d..328e939a6 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 e9ad930d8..36bea710a 100644 +index e9ad930d88..36bea710a0 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 { @@ -828,7 +829,7 @@ index e9ad930d8..36bea710a 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 cdc182c22..22474d682 100644 +index cdc182c229..22474d682a 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 { @@ -843,7 +844,7 @@ index cdc182c22..22474d682 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 95e602a95..65d606d51 100644 +index 95e602a95f..65d606d51c 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 { @@ -858,7 +859,7 @@ index 95e602a95..65d606d51 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 57ef10afb..5ecec62f1 100644 +index 57ef10afb0..5ecec62f18 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 { @@ -873,7 +874,7 @@ index 57ef10afb..5ecec62f1 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 b9f81a044..14d4bd312 100644 +index b9f81a044f..14d4bd312e 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 { @@ -888,7 +889,7 @@ index b9f81a044..14d4bd312 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 3ce8d3cef..b5dab9d2a 100644 +index 3ce8d3cef5..b5dab9d2aa 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 { @@ -903,7 +904,7 @@ index 3ce8d3cef..b5dab9d2a 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 88b7b3746..d05cc38b5 100644 +index 88b7b37467..d05cc38b5e 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 { @@ -918,7 +919,7 @@ index 88b7b3746..d05cc38b5 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 7254bcf3e..21a77ee81 100644 +index 7254bcf3e5..21a77ee812 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 { @@ -933,7 +934,7 @@ index 7254bcf3e..21a77ee81 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 58bc1f234..0302efbdc 100644 +index 58bc1f2343..0302efbdc7 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 { @@ -948,7 +949,7 @@ index 58bc1f234..0302efbdc 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 cb620014b..51f92584b 100644 +index cb620014b7..51f92584b8 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 { @@ -963,7 +964,7 @@ index cb620014b..51f92584b 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 fd7e99106..ad9628b2a 100644 +index fd7e991062..ad9628b2aa 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 { @@ -989,7 +990,7 @@ index fd7e99106..ad9628b2a 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 efbb36d01..ff6090e3c 100644 +index efbb36d016..ff6090e3c1 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 { @@ -1008,7 +1009,7 @@ index efbb36d01..ff6090e3c 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 7804a4e32..a28222eb1 100644 +index 7804a4e329..a28222eb1d 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 { @@ -1023,7 +1024,7 @@ index 7804a4e32..a28222eb1 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 6522c8021..b84b868b1 100644 +index 6522c80214..b84b868b1a 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 { @@ -1045,7 +1046,7 @@ index 6522c8021..b84b868b1 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 30d680224..16bcf9bff 100644 +index 30d6802242..16bcf9bff0 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 { @@ -1068,7 +1069,7 @@ index 30d680224..16bcf9bff 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 5c9ab0864..9fa84c87f 100644 +index 5c9ab0864e..9fa84c87fa 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 { @@ -1091,7 +1092,7 @@ index 5c9ab0864..9fa84c87f 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 e023898b3..c12a89016 100644 +index e023898b38..c12a890165 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 { @@ -1110,7 +1111,7 @@ index e023898b3..c12a89016 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 8a0da661f..db8b20a6c 100644 +index 8a0da661fb..db8b20a6c7 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 { @@ -1125,7 +1126,7 @@ index 8a0da661f..db8b20a6c 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 1d2a37a41..2826c510d 100644 +index 1d2a37a41e..2826c510d8 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 { @@ -1140,7 +1141,7 @@ index 1d2a37a41..2826c510d 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 91e2b5903..e544a8f6b 100644 +index 91e2b59037..e544a8f6b9 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 { @@ -1155,7 +1156,7 @@ index 91e2b5903..e544a8f6b 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 501c36649..34660f9f8 100644 +index 501c36649e..34660f9f84 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 { @@ -1170,7 +1171,7 @@ index 501c36649..34660f9f8 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 62c1cfaef..8815c9590 100644 +index 62c1cfaef9..8815c95900 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 { @@ -1201,7 +1202,7 @@ index 62c1cfaef..8815c9590 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 29e448f5a..02584897e 100644 +index 29e448f5ad..02584897e9 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 { @@ -1225,7 +1226,7 @@ index 29e448f5a..02584897e 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 1352daa25..d85b01b95 100644 +index 1352daa258..d85b01b956 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 { @@ -1238,7 +1239,7 @@ index 1352daa25..d85b01b95 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 5cd569dcd..ae6e6ca89 100644 +index 5cd569dcdd..ae6e6ca896 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 { @@ -1257,7 +1258,7 @@ index 5cd569dcd..ae6e6ca89 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 e182f0400..4e19fe5ae 100644 +index e182f04008..4e19fe5ae9 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 { @@ -1272,7 +1273,7 @@ index e182f0400..4e19fe5ae 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 75d46c61d..05e833ffe 100644 +index 75d46c61dc..05e833ffed 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 { @@ -1287,7 +1288,7 @@ index 75d46c61d..05e833ffe 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 26fda2cf6..22e9789a3 100644 +index 26fda2cf69..22e9789a36 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 { @@ -1300,7 +1301,7 @@ index 26fda2cf6..22e9789a3 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 c06512864..a26d56aa4 100644 +index c065128649..a26d56aa45 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 { @@ -1313,7 +1314,7 @@ index c06512864..a26d56aa4 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 90e79b291..e47add3e4 100644 +index 90e79b2918..e47add3e43 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 { @@ -1331,7 +1332,7 @@ index 90e79b291..e47add3e4 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java -index c7d5317cc..ec92a8457 100644 +index c7d5317cc0..ec92a84579 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 { @@ -1344,7 +1345,7 @@ index c7d5317cc..ec92a8457 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 87fd7e146..c9ba33453 100644 +index 87fd7e1467..c9ba334535 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 { @@ -1356,7 +1357,7 @@ index 87fd7e146..c9ba33453 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java -index 3f8e18a2c..11dc5f637 100644 +index 3f8e18a2c7..11dc5f6374 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 { @@ -1375,7 +1376,7 @@ index 3f8e18a2c..11dc5f637 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 dd7916c09..e4dc7d198 100644 +index dd7916c090..e4dc7d198c 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 { @@ -1404,7 +1405,7 @@ index dd7916c09..e4dc7d198 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/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java -index 5b1d2c7f5..da6a3fa2c 100644 +index 5b1d2c7f50..da6a3fa2c8 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 { @@ -1417,7 +1418,7 @@ index 5b1d2c7f5..da6a3fa2c 100644 } diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 57af3835e..b3bdc194a 100644 +index 57af3835ee..b3bdc194ab 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 { @@ -1429,8 +1430,21 @@ index 57af3835e..b3bdc194a 100644 hashmap.put(0, new MinecraftKey("textures/entity/cat/tabby.png")); 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 +--- 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 { + + public void b(ItemStack itemstack) { + if (itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) { +- this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a((Object) itemstack.cloneItemStack(), (itemstack1) -> { ++ this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // Purpur - decompile error + itemstack1.setCount(1); + })); + } diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java -index b34695f2d..e4bd2796a 100644 +index b34695f2d0..e4bd2796a4 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 { @@ -1443,7 +1457,7 @@ index b34695f2d..e4bd2796a 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index 886268b09..b030fe957 100644 +index 886268b09e..b030fe9577 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 { @@ -1456,7 +1470,7 @@ index 886268b09..b030fe957 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 d332907b3..b853fd0d9 100644 +index d332907b3b..b853fd0d9b 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 { @@ -1473,7 +1487,7 @@ index d332907b3..b853fd0d9 100644 } diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index 140208761..94e57a2d8 100644 +index 1402087612..94e57a2d85 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 { @@ -1488,7 +1502,7 @@ index 140208761..94e57a2d8 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 a8ef98981..d5ffdc110 100644 +index a8ef98981d..d5ffdc110d 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; @@ -1512,7 +1526,7 @@ index a8ef98981..d5ffdc110 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 7b6b1ad17..1432d3f6b 100644 +index 7b6b1ad17b..1432d3f6bf 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 { @@ -1532,7 +1546,7 @@ index 7b6b1ad17..1432d3f6b 100644 this.targetSelector.a(3, this.bA); } diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java -index de8f1874a..73402f2b5 100644 +index de8f1874af..73402f2b5a 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 Date: Tue, 18 Feb 2020 20:07:08 -0600 Subject: [PATCH] Add option to disable saving projectiles to disk --- - .../net/minecraft/server/ChunkRegionLoader.java | 1 + + .../net/minecraft/server/ChunkRegionLoader.java | 2 +- + src/main/java/net/minecraft/server/Entity.java | 6 ++++++ + .../java/net/minecraft/server/EntityArrow.java | 7 +++++++ + .../net/minecraft/server/EntityEnderSignal.java | 7 +++++++ + .../net/minecraft/server/EntityFireworks.java | 7 +++++++ + .../net/minecraft/server/EntityLlamaSpit.java | 7 +++++++ + .../net/minecraft/server/EntityProjectile.java | 7 +++++++ .../java/net/pl3x/purpur/PurpurWorldConfig.java | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+) + 8 files changed, 58 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index d529b795c5..c6ea18ad75 100644 +index d529b795c5..e883365b0b 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -@@ -445,6 +445,7 @@ public class ChunkRegionLoader { +@@ -1,6 +1,5 @@ + package net.minecraft.server; + +-import co.aikar.timings.Timings; + import com.google.common.collect.Maps; + import it.unimi.dsi.fastutil.longs.LongOpenHashSet; + import it.unimi.dsi.fastutil.longs.LongSet; +@@ -445,6 +444,7 @@ public class ChunkRegionLoader { while (iterator1.hasNext()) { Entity entity = (Entity) iterator1.next(); -+ if (!worldserver.purpurConfig.saveProjectilesToDisk && entity instanceof EntityProjectile) continue; // Purpur ++ if (!entity.canSaveToDisk()) continue; // Purpur NBTTagCompound nbttagcompound4 = new NBTTagCompound(); // Paper start if ((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 945e2c0e47..a34d5b2d7d 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -1625,6 +1625,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + + } + ++ // Purpur start ++ public boolean canSaveToDisk() { ++ return true; ++ } ++ // Purpur end ++ + public boolean c(NBTTagCompound nbttagcompound) { + String s = this.getSaveID(); + +diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java +index 9c97edf9c9..48da1e662a 100644 +--- a/src/main/java/net/minecraft/server/EntityArrow.java ++++ b/src/main/java/net/minecraft/server/EntityArrow.java +@@ -68,6 +68,13 @@ public abstract class EntityArrow extends Entity implements IProjectile { + + } + ++ // Purpur start ++ @Override ++ public boolean canSaveToDisk() { ++ return world != null && world.purpurConfig.saveProjectilesToDisk; ++ } ++ // Purpur end ++ + public void a(SoundEffect soundeffect) { + this.av = soundeffect; + } +diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java +index 7ebd7da1c5..74f8257ecd 100644 +--- a/src/main/java/net/minecraft/server/EntityEnderSignal.java ++++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java +@@ -19,6 +19,13 @@ public class EntityEnderSignal extends Entity { + this.setPosition(d0, d1, d2); + } + ++ // Purpur start ++ @Override ++ public boolean canSaveToDisk() { ++ return world != null && world.purpurConfig.saveProjectilesToDisk; ++ } ++ // Purpur end ++ + public void b(ItemStack itemstack) { + if (itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) { + this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // Purpur - decompile error +diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java +index 278ef79d89..36238c224e 100644 +--- a/src/main/java/net/minecraft/server/EntityFireworks.java ++++ b/src/main/java/net/minecraft/server/EntityFireworks.java +@@ -21,6 +21,13 @@ public class EntityFireworks extends Entity implements IProjectile { + super(entitytypes, world); + } + ++ // Purpur start ++ @Override ++ public boolean canSaveToDisk() { ++ return world != null && world.purpurConfig.saveProjectilesToDisk; ++ } ++ // Purpur end ++ + // Spigot Start - copied from tick + @Override + public void inactiveTick() { +diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java +index b7a92e1002..b95ee50a4e 100644 +--- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java ++++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java +@@ -19,6 +19,13 @@ public class EntityLlamaSpit extends Entity implements IProjectile { + this.setPosition(entityllama.locX() - (double) (entityllama.getWidth() + 1.0F) * 0.5D * (double) MathHelper.sin(entityllama.aI * 0.017453292F), entityllama.getHeadY() - 0.10000000149011612D, entityllama.locZ() + (double) (entityllama.getWidth() + 1.0F) * 0.5D * (double) MathHelper.cos(entityllama.aI * 0.017453292F)); + } + ++ // Purpur start ++ @Override ++ public boolean canSaveToDisk() { ++ return world != null && world.purpurConfig.saveProjectilesToDisk; ++ } ++ // Purpur end ++ + @Override + public void tick() { + super.tick(); +diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java +index f5c8074dcf..674f2ccc7f 100644 +--- a/src/main/java/net/minecraft/server/EntityProjectile.java ++++ b/src/main/java/net/minecraft/server/EntityProjectile.java +@@ -35,6 +35,13 @@ public abstract class EntityProjectile extends Entity implements IProjectile { + this.projectileSource = (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity(); // CraftBukkit + } + ++ // Purpur start ++ @Override ++ public boolean canSaveToDisk() { ++ return world != null && world.purpurConfig.saveProjectilesToDisk; ++ } ++ // Purpur end ++ + public void a(Entity entity, float f, float f1, float f2, float f3, float f4) { + float f5 = -MathHelper.sin(f1 * 0.017453292F) * MathHelper.cos(f * 0.017453292F); + float f6 = -MathHelper.sin((f + f2) * 0.017453292F); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index 6ae1c0fe02..3a530de7f9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch b/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch index 7ab8f66b4..8704db567 100644 --- a/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch +++ b/patches/server/0098-Always-increment-arrow-despawn-counter-fixes-MC-1257.patch @@ -1,4 +1,4 @@ -From 14c3309df398c675f07b042f9ab4f73e3e0f7ba7 Mon Sep 17 00:00:00 2001 +From e2d878a725b2fc4fbc084a07f3b9e4dae6d02822 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] Always increment arrow despawn counter (fixes MC-125757) @@ -8,10 +8,10 @@ Subject: [PATCH] Always increment arrow despawn counter (fixes MC-125757) 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 9c97edf9c9..2dae2c1c89 100644 +index 48da1e662a..11d1dc8763 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java -@@ -147,6 +147,8 @@ public abstract class EntityArrow extends Entity implements IProjectile { +@@ -154,6 +154,8 @@ public abstract class EntityArrow extends Entity implements IProjectile { this.extinguish(); } @@ -20,7 +20,7 @@ index 9c97edf9c9..2dae2c1c89 100644 if (this.inGround && !flag) { if (this.aq != iblockdata && this.world.a(this.getBoundingBox().g(0.06D))) { this.inGround = false; -@@ -154,7 +156,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { +@@ -161,7 +163,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { this.despawnCounter = 0; this.as = 0; } else if (!this.world.isClientSide) { @@ -29,7 +29,7 @@ index 9c97edf9c9..2dae2c1c89 100644 } ++this.d; -@@ -275,6 +277,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { +@@ -282,6 +284,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { } }