From 86da2ca8ad359dc6b3cd48e75c0fe35a964b1397 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 18 Jul 2019 14:55:21 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: a41d51f0 ServerExceptionEvent can be fired off main 920ad7c7 Use getChunkIfLoadedImmediately in places (#2297) 0708fa36 Updated Upstream (CraftBukkit/Spigot) --- Paper | 2 +- current-paper | 2 +- ...cows-to-mooshroom-when-fed-mushrooms.patch | 14 +- ...ed-to-crystals-and-crystals-shoot-ph.patch | 16 +- patches/server/0011-Integrate-ridables.patch | 272 +++++++++--------- .../0027-Allow-color-codes-on-signs.patch | 10 +- .../server/0036-Controllable-Minecarts.patch | 12 +- ...ities-from-moving-in-unloaded-chunks.patch | 6 +- ...1-Asynchronous-chunk-IO-and-loading.patch} | 32 +-- ...sLoaded-calls-should-NOT-load-chunks.patch | 53 ---- ...ment-optional-per-player-mob-spawns.patch} | 10 +- ...atch => 0053-Tulips-change-fox-type.patch} | 2 +- ...an-teleporting-into-unloaded-chunks.patch} | 2 +- ...pawning-reinforcements-in-unloaded-.patch} | 2 +- ...-mends-most-damages-equipment-first.patch} | 2 +- 15 files changed, 192 insertions(+), 245 deletions(-) rename patches/server/{0052-Asynchronous-chunk-IO-and-loading.patch => 0051-Asynchronous-chunk-IO-and-loading.patch} (99%) delete mode 100644 patches/server/0051-isLoaded-calls-should-NOT-load-chunks.patch rename patches/server/{0053-Implement-optional-per-player-mob-spawns.patch => 0052-Implement-optional-per-player-mob-spawns.patch} (98%) rename patches/server/{0054-Tulips-change-fox-type.patch => 0053-Tulips-change-fox-type.patch} (98%) rename patches/server/{0055-Prevent-enderman-teleporting-into-unloaded-chunks.patch => 0054-Prevent-enderman-teleporting-into-unloaded-chunks.patch} (94%) rename patches/server/{0056-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch => 0055-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch} (95%) rename patches/server/{0057-Mending-mends-most-damages-equipment-first.patch => 0056-Mending-mends-most-damages-equipment-first.patch} (98%) diff --git a/Paper b/Paper index 767ac20c2..a41d51f09 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 767ac20c2c63438929b16313dbc6c85305789ef7 +Subproject commit a41d51f098820e61c2d3a4337cca5e8d23cfe33c diff --git a/current-paper b/current-paper index 8e078a090..6061faadc 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.3--c6a5c51dde48b9f77bbbf0ffcd79eb7ed3032ec8 +1.14.3--39454a78e19cf565bb6a92416f8c7dfb615b2d9a diff --git a/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch b/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch index f3635aaf5..601b2eb1a 100644 --- a/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch +++ b/patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch @@ -1,4 +1,4 @@ -From d81500d5df09102a2ad579f7a97e75b131868bce Mon Sep 17 00:00:00 2001 +From 75fe428f000ffd41067998de596f76d9c5688285 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:10:30 -0500 Subject: [PATCH] cows to mooshroom when fed mushrooms @@ -11,10 +11,10 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms 4 files changed, 85 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0a2c9a9f8..dd7da4117 100644 +index 9485bc4810..58ccb3fc47 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1048,6 +1048,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1049,6 +1049,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return false; } @@ -22,7 +22,7 @@ index 0a2c9a9f8..dd7da4117 100644 public void a(SoundEffect soundeffect, float f, float f1) { if (!this.isSilent()) { this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1); -@@ -2545,6 +2546,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2546,6 +2547,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.invulnerable = flag; } @@ -31,7 +31,7 @@ index 0a2c9a9f8..dd7da4117 100644 this.setPositionRotation(entity.locX, entity.locY, entity.locZ, entity.yaw, entity.pitch); } diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index d2c2e3cc3..c3aef0b2a 100644 +index d2c2e3cc33..c3aef0b2a1 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -16,7 +16,7 @@ public class EntityCow extends EntityAnimal { @@ -125,7 +125,7 @@ index d2c2e3cc3..c3aef0b2a 100644 public EntityCow createChild(EntityAgeable entityageable) { return (EntityCow) EntityTypes.COW.a(this.world); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d44ea9ec5..84bc1a629 100644 +index d44ea9ec5d..84bc1a6290 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2742,8 +2742,14 @@ public abstract class EntityLiving extends Entity { @@ -146,7 +146,7 @@ index d44ea9ec5..84bc1a629 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b0f0040a4..d433eca03 100644 +index b0f0040a4a..d433eca03b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -130,4 +130,9 @@ public class PurpurConfig { diff --git a/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 5ca1bb785..9cce2cfb7 100644 --- a/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -1,4 +1,4 @@ -From f6c6b9e66cc428f9b1b9f697c6dfedaba39c2ef2 Mon Sep 17 00:00:00 2001 +From 0c3db9d4235a0c274c801aa229b9753e09203337 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:26:06 -0500 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms @@ -12,7 +12,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms 5 files changed, 219 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java -index 730a15f33..31454349a 100644 +index 730a15f332..31454349a2 100644 --- a/src/main/java/net/minecraft/server/DamageSource.java +++ b/src/main/java/net/minecraft/server/DamageSource.java @@ -77,6 +77,7 @@ public class DamageSource { @@ -24,10 +24,10 @@ index 730a15f33..31454349a 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 dd7da4117..adfd6e855 100644 +index 58ccb3fc47..2646e156b0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1399,6 +1399,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1400,6 +1400,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return d3 * d3 + d4 * d4 + d5 * d5; } @@ -35,7 +35,7 @@ index dd7da4117..adfd6e855 100644 public double h(Entity entity) { return this.c(entity.ci()); } -@@ -1918,14 +1919,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1919,14 +1920,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return this.a(new ItemStack(imaterial), (float) i); } @@ -54,7 +54,7 @@ index dd7da4117..adfd6e855 100644 return null; } else if (this.world.isClientSide) { diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java -index 801552fc6..ad88cc982 100644 +index 801552fc61..ad88cc9822 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity { @@ -122,7 +122,7 @@ index 801552fc6..ad88cc982 100644 @Override protected void b(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index b672ac5c2..e75914c2b 100644 +index b672ac5c2a..e75914c2b1 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -8,9 +8,10 @@ import javax.annotation.Nullable; @@ -351,7 +351,7 @@ index b672ac5c2..e75914c2b 100644 @Override diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 3a86c519c..9a0521f2a 100644 +index 3a86c519c0..9a0521f2a5 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -30,6 +30,7 @@ public interface IEntityAccess { diff --git a/patches/server/0011-Integrate-ridables.patch b/patches/server/0011-Integrate-ridables.patch index a062f09a5..13791f4e2 100644 --- a/patches/server/0011-Integrate-ridables.patch +++ b/patches/server/0011-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From da7579b21c43d655f722bc1d24bec3f76cc8d2d3 Mon Sep 17 00:00:00 2001 +From 1e17bc769d460b8161bbff4589eba49755e8f532 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -144,7 +144,7 @@ Subject: [PATCH] Integrate ridables create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java -index 454627f65..df3d6cf28 100644 +index 454627f65e..df3d6cf281 100644 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java @@ -1,6 +1,6 @@ @@ -165,7 +165,7 @@ index 454627f65..df3d6cf28 100644 this.d = false; this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0ff92183f..01c8452bb 100644 +index 2646e156b0..7a3b819e70 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -195,7 +195,7 @@ index 0ff92183f..01c8452bb 100644 public boolean noclip; public float M; protected final Random random; -@@ -2124,7 +2127,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2125,7 +2128,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } else { this.passengers.add(entity); } @@ -210,7 +210,7 @@ index 0ff92183f..01c8452bb 100644 } return true; // CraftBukkit } -@@ -2159,6 +2168,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2160,6 +2169,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return false; } // Spigot end @@ -223,7 +223,7 @@ index 0ff92183f..01c8452bb 100644 this.passengers.remove(entity); entity.j = 60; } -@@ -3275,4 +3290,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -3276,4 +3291,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke public void setMot(double d0, double d1, double d2) { this.setMot(new Vec3D(d0, d1, d2)); } @@ -245,7 +245,7 @@ index 0ff92183f..01c8452bb 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index e87754ef3..553245ebe 100644 +index e87754ef33..553245ebe9 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -70,7 +70,7 @@ public abstract class EntityAgeable extends EntityCreature { @@ -258,7 +258,7 @@ index e87754ef3..553245ebe 100644 } diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java -index e5d8fe253..7b9dff70e 100644 +index e5d8fe2534..7b9dff70e3 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -4,6 +4,7 @@ import java.time.LocalDate; @@ -310,7 +310,7 @@ index e5d8fe253..7b9dff70e 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java -index 89f1bfa41..6dba5eecc 100644 +index 89f1bfa41d..6dba5eecc8 100644 --- a/src/main/java/net/minecraft/server/EntityBlaze.java +++ b/src/main/java/net/minecraft/server/EntityBlaze.java @@ -10,6 +10,10 @@ public class EntityBlaze extends EntityMonster { @@ -357,7 +357,7 @@ index 89f1bfa41..6dba5eecc 100644 return entityliving != null && entityliving.isAlive() && this.a.c(entityliving); diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index feb3e4b59..51c1f30a4 100644 +index feb3e4b59d..51c1f30a47 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 { @@ -479,7 +479,7 @@ index feb3e4b59..51c1f30a4 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java -index 89c9306df..e9ec28362 100644 +index 89c9306df5..e9ec283625 100644 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java @@ -6,6 +6,7 @@ public class EntityCaveSpider extends EntitySpider { @@ -491,7 +491,7 @@ index 89c9306df..e9ec28362 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index f1dfdd4ff..6342c4cd2 100644 +index f1dfdd4ff8..6342c4cd23 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -13,6 +13,7 @@ public class EntityChicken extends EntityAnimal { @@ -512,7 +512,7 @@ index f1dfdd4ff..6342c4cd2 100644 this.forceDrops = true; // CraftBukkit this.a((IMaterial) Items.EGG); diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java -index 1e3782122..c0b066d18 100644 +index 1e3782122a..c0b066d188 100644 --- a/src/main/java/net/minecraft/server/EntityCod.java +++ b/src/main/java/net/minecraft/server/EntityCod.java @@ -4,6 +4,7 @@ public class EntityCod extends EntityFishSchool { @@ -524,7 +524,7 @@ index 1e3782122..c0b066d18 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index c3aef0b2a..087ce8739 100644 +index c3aef0b2a1..087ce87390 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -9,6 +9,7 @@ public class EntityCow extends EntityAnimal { @@ -536,7 +536,7 @@ index c3aef0b2a..087ce8739 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index fd3f53e90..8db6405ff 100644 +index fd3f53e90d..8db6405ff4 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -21,6 +21,7 @@ public class EntityCreeper extends EntityMonster { @@ -608,7 +608,7 @@ index fd3f53e90..8db6405ff 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index 662624b72..9a3b46b4b 100644 +index 662624b727..9a3b46b4b9 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -18,6 +18,7 @@ public class EntityDolphin extends EntityWaterAnimal { @@ -689,7 +689,7 @@ index 662624b72..9a3b46b4b 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 158c05d1e..4422d1975 100644 +index 158c05d1e1..4422d19751 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -12,6 +12,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -794,7 +794,7 @@ index 158c05d1e..4422d1975 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index bec173e41..72226d4c4 100644 +index bec173e411..72226d4c4d 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -806,7 +806,7 @@ index bec173e41..72226d4c4 100644 this.setHealth(this.getMaxHealth()); this.noclip = true; diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 0989c07cf..f551192a0 100644 +index 0989c07cf5..f551192a04 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -22,6 +22,7 @@ public class EntityEnderman extends EntityMonster { @@ -858,7 +858,7 @@ index 0989c07cf..f551192a0 100644 if (!this.i.f(this.j)) { return false; diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java -index 41107e978..6d04a4ee4 100644 +index 41107e9784..6d04a4ee49 100644 --- a/src/main/java/net/minecraft/server/EntityEndermite.java +++ b/src/main/java/net/minecraft/server/EntityEndermite.java @@ -10,6 +10,7 @@ public class EntityEndermite extends EntityMonster { @@ -879,7 +879,7 @@ index 41107e978..6d04a4ee4 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index 96dab0a46..ae0e134d9 100644 +index 96dab0a46b..ae0e134d9b 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -9,6 +9,7 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -924,7 +924,7 @@ index 96dab0a46..ae0e134d9 100644 return false; } else { diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java -index 2b97e92eb..b857b0882 100644 +index 2b97e92eb4..b857b08821 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 { @@ -985,7 +985,7 @@ index 2b97e92eb..b857b0882 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index f9ba3b856..487628999 100644 +index f9ba3b8561..4876289992 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal { @@ -1304,7 +1304,7 @@ index f9ba3b856..487628999 100644 return false; } else if (EntityFox.this.getGoalTarget() == null && EntityFox.this.getLastDamager() == null) { diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java -index bf29faa8a..54899d299 100644 +index bf29faa8a3..54899d2990 100644 --- a/src/main/java/net/minecraft/server/EntityGhast.java +++ b/src/main/java/net/minecraft/server/EntityGhast.java @@ -10,6 +10,7 @@ public class EntityGhast extends EntityFlying implements IMonster { @@ -1358,7 +1358,7 @@ index bf29faa8a..54899d299 100644 if (this.j-- <= 0) { this.j += this.i.getRandom().nextInt(5) + 2; diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index bcbade19e..b7e2022b1 100644 +index bcbade19ea..b7e2022b19 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java @@ -5,7 +5,9 @@ public class EntityGiantZombie extends EntityMonster { @@ -1372,7 +1372,7 @@ index bcbade19e..b7e2022b1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java -index 31db5b525..6c46756d4 100644 +index 31db5b5254..6c46756d49 100644 --- a/src/main/java/net/minecraft/server/EntityGuardian.java +++ b/src/main/java/net/minecraft/server/EntityGuardian.java @@ -23,8 +23,15 @@ public class EntityGuardian extends EntityMonster { @@ -1454,7 +1454,7 @@ index 31db5b525..6c46756d4 100644 } diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java -index cf53c7a3a..99eab220c 100644 +index cf53c7a3a1..99eab220c2 100644 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java @@ -9,6 +9,7 @@ public class EntityGuardianElder extends EntityGuardian { @@ -1466,7 +1466,7 @@ index cf53c7a3a..99eab220c 100644 if (this.goalRandomStroll != null) { this.goalRandomStroll.setTimeBetweenMovement(400); diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index e08eaddef..6f4e9ed1a 100644 +index e08eaddef3..6f4e9ed1af 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -38,6 +38,10 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -1481,7 +1481,7 @@ index e08eaddef..6f4e9ed1a 100644 this.loadChest(); } diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index d28119583..3f5759ca4 100644 +index d281195834..3f5759ca46 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -179,4 +179,10 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -1496,7 +1496,7 @@ index d28119583..3f5759ca4 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index 5e6ab622d..891370caf 100644 +index 5e6ab622d9..891370caf3 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -79,4 +79,10 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -1511,7 +1511,7 @@ index 5e6ab622d..891370caf 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 61da5d365..8b1f56acc 100644 +index 61da5d365d..8b1f56acc2 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -347,9 +347,21 @@ public abstract class EntityHuman extends EntityLiving { @@ -1538,7 +1538,7 @@ index 61da5d365..8b1f56acc 100644 this.setSneaking(false); } else { diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 76641682b..8c3363472 100644 +index 76641682b1..8c33634726 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -9,6 +9,7 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -1566,7 +1566,7 @@ index 76641682b..8c3363472 100644 } diff --git a/src/main/java/net/minecraft/server/EntityIllagerWizard.java b/src/main/java/net/minecraft/server/EntityIllagerWizard.java -index 7e0f55d72..0f498df5b 100644 +index 7e0f55d725..0f498df5bd 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerWizard.java +++ b/src/main/java/net/minecraft/server/EntityIllagerWizard.java @@ -115,6 +115,7 @@ public abstract class EntityIllagerWizard extends EntityIllagerAbstract { @@ -1594,7 +1594,7 @@ index 7e0f55d72..0f498df5b 100644 } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index c73d2ff5d..94f43b1e0 100644 +index c73d2ff5da..94f43b1e0d 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -10,6 +10,7 @@ import java.util.UUID; @@ -1689,7 +1689,7 @@ index c73d2ff5d..94f43b1e0 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 8e463111b..fd6a926ca 100644 +index 8e463111bb..fd6a926cae 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -8,6 +8,7 @@ public class EntityIronGolem extends EntityGolem { @@ -1701,7 +1701,7 @@ index 8e463111b..fd6a926ca 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 60ddadbfe..7e59a7b30 100644 +index 60ddadbfe1..7e59a7b302 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity { @@ -1770,7 +1770,7 @@ index 60ddadbfe..7e59a7b30 100644 this.bD = f; } diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java -index a17316c77..b34a258c2 100644 +index a17316c77a..b34a258c22 100644 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java @@ -6,6 +6,7 @@ public class EntityMagmaCube extends EntitySlime { @@ -1791,7 +1791,7 @@ index a17316c77..b34a258c2 100644 this.setMot(vec3d.x, (double) (0.42F + (float) this.getSize() * 0.1F), vec3d.z); diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index f4f60c38d..f868ea114 100644 +index f4f60c38d0..f868ea1146 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -18,6 +18,7 @@ public class EntityMushroomCow extends EntityCow { @@ -1803,7 +1803,7 @@ index f4f60c38d..f868ea114 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 0f1c25959..4d9bf81bf 100644 +index 0f1c259595..4d9bf81bff 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -14,6 +14,7 @@ public class EntityOcelot extends EntityAnimal { @@ -1829,7 +1829,7 @@ index 0f1c25959..4d9bf81bf 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index 2bec33d8a..cc729ef33 100644 +index 2bec33d8ad..cc729ef33e 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -37,6 +37,7 @@ public class EntityPanda extends EntityAnimal { @@ -2032,7 +2032,7 @@ index 2bec33d8a..cc729ef33 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index 94e973ffb..d743ddb9c 100644 +index 94e973ffba..d743ddb9c5 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -21,7 +21,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -2055,7 +2055,7 @@ index 94e973ffb..d743ddb9c 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index e75914c2b..008f5c6fa 100644 +index e75914c2b1..008f5c6fa2 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -2210,7 +2210,7 @@ index e75914c2b..008f5c6fa 100644 EntityPhantom.this.yaw += 180.0F; this.j = 0.1F; diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 0d099d2fd..fd7c5136f 100644 +index 0d099d2fd6..fd7c5136f1 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -18,6 +18,7 @@ public class EntityPig extends EntityAnimal { @@ -2264,7 +2264,7 @@ index 0d099d2fd..fd7c5136f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 151eef84a..786592da1 100644 +index 151eef84ac..786592da12 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -14,6 +14,7 @@ public class EntityPigZombie extends EntityZombie { @@ -2293,7 +2293,7 @@ index 151eef84a..786592da1 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java -index 90a046410..e7c31ff5a 100644 +index 90a0464102..e7c31ff5af 100644 --- a/src/main/java/net/minecraft/server/EntityPillager.java +++ b/src/main/java/net/minecraft/server/EntityPillager.java @@ -11,6 +11,7 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow, @@ -2305,7 +2305,7 @@ index 90a046410..e7c31ff5a 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index 3516fe764..8389ea123 100644 +index 3516fe7645..8389ea1237 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -15,6 +15,7 @@ public class EntityPolarBear extends EntityAnimal { @@ -2384,7 +2384,7 @@ index 3516fe764..8389ea123 100644 return false; } else { diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java -index f5d384add..175e43f7f 100644 +index f5d384adda..175e43f7fe 100644 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java @@ -15,6 +15,7 @@ public class EntityPufferFish extends EntityFish { @@ -2412,7 +2412,7 @@ index f5d384add..175e43f7f 100644 return !list.isEmpty(); diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 76394603c..821f9300e 100644 +index 76394603c3..821f9300e2 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -15,6 +15,7 @@ public class EntityRabbit extends EntityAnimal { @@ -2433,7 +2433,7 @@ index 76394603c..821f9300e 100644 double d0 = this.moveController.c(); diff --git a/src/main/java/net/minecraft/server/EntityRaider.java b/src/main/java/net/minecraft/server/EntityRaider.java -index dccd098d4..709a4c77d 100644 +index dccd098d41..709a4c77df 100644 --- a/src/main/java/net/minecraft/server/EntityRaider.java +++ b/src/main/java/net/minecraft/server/EntityRaider.java @@ -278,6 +278,7 @@ public abstract class EntityRaider extends EntityMonsterPatrolling { @@ -2477,7 +2477,7 @@ index dccd098d4..709a4c77d 100644 if (this.b.el() && !this.b.ek().a() && this.b.dY() && !ItemStack.matches(this.b.getEquipment(EnumItemSlot.HEAD), Raid.s())) { diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java -index dc8bac553..9a1ae546e 100644 +index dc8bac5530..9a1ae546e3 100644 --- a/src/main/java/net/minecraft/server/EntityRavager.java +++ b/src/main/java/net/minecraft/server/EntityRavager.java @@ -16,6 +16,7 @@ public class EntityRavager extends EntityRaider { @@ -2489,7 +2489,7 @@ index dc8bac553..9a1ae546e 100644 this.f = 20; } diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java -index 725806f16..4ee2b012f 100644 +index 725806f163..4ee2b012fe 100644 --- a/src/main/java/net/minecraft/server/EntitySalmon.java +++ b/src/main/java/net/minecraft/server/EntitySalmon.java @@ -4,6 +4,7 @@ public class EntitySalmon extends EntityFishSchool { @@ -2501,7 +2501,7 @@ index 725806f16..4ee2b012f 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index a3daceb85..1a6e93452 100644 +index a3daceb856..1a6e934522 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; @@ -2533,7 +2533,7 @@ index a3daceb85..1a6e93452 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java -index a1c018b14..39b8591ae 100644 +index a1c018b14a..39b8591ae5 100644 --- a/src/main/java/net/minecraft/server/EntityShulker.java +++ b/src/main/java/net/minecraft/server/EntityShulker.java @@ -26,6 +26,7 @@ public class EntityShulker extends EntityGolem implements IMonster { @@ -2583,7 +2583,7 @@ index a1c018b14..39b8591ae 100644 } diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 2979cc8b6..4bb086323 100644 +index 2979cc8b66..4bb086323d 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -10,6 +10,7 @@ public class EntitySilverfish extends EntityMonster { @@ -2619,7 +2619,7 @@ index 2979cc8b6..4bb086323 100644 } diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java -index 0e78d5c62..908e51b63 100644 +index 0e78d5c62c..908e51b636 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -4,6 +4,7 @@ public class EntitySkeleton extends EntitySkeletonAbstract { @@ -2631,7 +2631,7 @@ index 0e78d5c62..908e51b63 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java -index de2a5240d..f094e285a 100644 +index de2a5240df..f094e285ad 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java @@ -6,6 +6,7 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract { @@ -2643,7 +2643,7 @@ index de2a5240d..f094e285a 100644 public static boolean b(EntityTypes entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) { diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java -index 9abc14a48..bc08bb616 100644 +index 9abc14a481..bc08bb6168 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java @@ -6,6 +6,7 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract { @@ -2655,7 +2655,7 @@ index 9abc14a48..bc08bb616 100644 } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index a59b66e66..2feb9d67b 100644 +index a59b66e663..2feb9d67b4 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -29,6 +29,7 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -2676,7 +2676,7 @@ index a59b66e66..2feb9d67b 100644 this.setMot(vec3d.x, 0.41999998688697815D, vec3d.z); diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 1fed1d6e7..389372ba4 100644 +index 1fed1d6e75..389372ba41 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -13,6 +13,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { @@ -2696,7 +2696,7 @@ index 1fed1d6e7..389372ba4 100644 for (int l = 0; l < 4; ++l) { diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java -index 3929c86f8..a3b24cdc6 100644 +index 3929c86f8b..a3b24cdc63 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -9,6 +9,7 @@ public class EntitySpider extends EntityMonster { @@ -2730,7 +2730,7 @@ index 3929c86f8..a3b24cdc6 100644 if (f >= 0.5F && this.a.getRandom().nextInt(100) == 0) { diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index bcea73a40..abc6210d7 100644 +index bcea73a40b..abc6210d7f 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -21,6 +21,7 @@ public class EntitySquid extends EntityWaterAnimal { @@ -2816,7 +2816,7 @@ index bcea73a40..abc6210d7 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java -index 1c6b36769..358a6edaf 100644 +index 1c6b36769b..358a6edaf6 100644 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java @@ -127,6 +127,12 @@ public abstract class EntityTameableAnimal extends EntityAnimal { @@ -2833,7 +2833,7 @@ index 1c6b36769..358a6edaf 100644 this.setTamed(true); this.setOwnerUUID(entityhuman.getUniqueID()); diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java -index 2e537c203..03b49a7c7 100644 +index 2e537c2032..03b49a7c76 100644 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java @@ -17,6 +17,7 @@ public class EntityTropicalFish extends EntityFishSchool { @@ -2845,7 +2845,7 @@ index 2e537c203..03b49a7c7 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 0037d1380..02a21641c 100644 +index 0037d13806..02a21641ca 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -22,6 +22,7 @@ public class EntityTurtle extends EntityAnimal { @@ -2949,7 +2949,7 @@ index 0037d1380..02a21641c 100644 return false; } else { diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index c32f40a60..ad58a3c9a 100644 +index c32f40a60f..ad58a3c9ac 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -263,6 +263,10 @@ public class EntityTypes { @@ -2964,7 +2964,7 @@ index c32f40a60..ad58a3c9a 100644 return getNameComponent().getString(); } diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index 47fceb57e..8c13c78b5 100644 +index 47fceb57ee..8c13c78b5f 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -15,6 +15,7 @@ public class EntityVex extends EntityMonster { @@ -3031,7 +3031,7 @@ index 47fceb57e..8c13c78b5 100644 Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX, this.c - EntityVex.this.locY, this.d - EntityVex.this.locZ); double d0 = vec3d.f(); diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 44531af41..7be42a471 100644 +index 44531af417..7be42a4710 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -15,6 +15,7 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -3067,7 +3067,7 @@ index 44531af41..7be42a471 100644 return entityvindicator.el() && entityvindicator.random.nextInt(10) == 0 && super.a(); diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 9fea75024..66b336ee6 100644 +index 9fea750248..66b336ee6a 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -22,6 +22,7 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -3079,7 +3079,7 @@ index 9fea75024..66b336ee6 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index b3c7f8814..374ed9a3a 100644 +index b3c7f8814c..374ed9a3aa 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -35,6 +35,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -3099,7 +3099,7 @@ index b3c7f8814..374ed9a3a 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index 80354beb4..f1561a927 100644 +index 80354beb4d..f1561a927e 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -28,6 +28,7 @@ public class EntityWolf extends EntityTameableAnimal { @@ -3119,7 +3119,7 @@ index 80354beb4..f1561a927 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 2a3997149..9dfddd980 100644 +index 2a3997149a..9dfddd980b 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -35,6 +35,7 @@ public class EntityZombie extends EntityMonster { @@ -3131,7 +3131,7 @@ index 2a3997149..9dfddd980 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index 26262bbcb..7fd5825b5 100644 +index 26262bbcb6..7fd5825b59 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -6,6 +6,7 @@ public class EntityZombieHusk extends EntityZombie { @@ -3143,7 +3143,7 @@ index 26262bbcb..7fd5825b5 100644 public static boolean b(EntityTypes entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) { diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 4d475d963..f0ae05ea9 100644 +index 4d475d9633..f0ae05ea9d 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -20,6 +20,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -3155,7 +3155,7 @@ index 4d475d963..f0ae05ea9 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java -index 08aea9969..c6e9b044f 100644 +index 08aea9969d..c6e9b044f7 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalArrowAttack.java @@ -37,6 +37,7 @@ public class PathfinderGoalArrowAttack extends PathfinderGoal { @@ -3175,7 +3175,7 @@ index 08aea9969..c6e9b044f 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java -index 5626f551b..3c47d74dc 100644 +index 5626f551b5..3c47d74dc4 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalAvoidTarget.java @@ -18,12 +18,7 @@ public class PathfinderGoalAvoidTarget extends Pathfinde @@ -3209,7 +3209,7 @@ index 5626f551b..3c47d74dc 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBeg.java b/src/main/java/net/minecraft/server/PathfinderGoalBeg.java -index d5935715f..66216ea8c 100644 +index d5935715f0..66216ea8ce 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBeg.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBeg.java @@ -21,12 +21,14 @@ public class PathfinderGoalBeg extends PathfinderGoal { @@ -3228,7 +3228,7 @@ index d5935715f..66216ea8c 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java b/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java -index b0559d306..48db74c10 100644 +index b0559d3066..48db74c10b 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBowShoot.java @@ -28,6 +28,7 @@ public class PathfinderGoalBowShoot ext @@ -3248,7 +3248,7 @@ index b0559d306..48db74c10 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java -index 373db5c60..6c536cac0 100644 +index 373db5c608..6c536cac05 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreakDoor.java @@ -27,6 +27,7 @@ public class PathfinderGoalBreakDoor extends PathfinderGoalDoorInteract { @@ -3268,7 +3268,7 @@ index 373db5c60..6c536cac0 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java -index 0cc34400b..db7048e7a 100644 +index 0cc34400be..db7048e7a4 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java @@ -29,16 +29,18 @@ public class PathfinderGoalBreed extends PathfinderGoal { @@ -3292,7 +3292,7 @@ index 0cc34400b..db7048e7a 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java b/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java -index 8707cb5af..28b2aa2ce 100644 +index 8707cb5afa..28b2aa2ce1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalCatSitOnBed.java @@ -15,6 +15,7 @@ public class PathfinderGoalCatSitOnBed extends PathfinderGoalGotoTarget { @@ -3304,7 +3304,7 @@ index 8707cb5af..28b2aa2ce 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java -index c834b9934..87b844a70 100644 +index c834b99348..87b844a701 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalCrossbowAttack.java @@ -21,6 +21,7 @@ public class PathfinderGoalCrossbowAttack list = this.a.world.a(EntityVillager.class, this.c, this.a, axisalignedbb); List list1 = this.a.world.a(this.c, (EntityLiving) this.a, axisalignedbb); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java b/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java -index e4088249c..d5d06c85d 100644 +index e4088249c0..d5d06c85db 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalDoorInteract.java @@ -45,6 +45,7 @@ public abstract class PathfinderGoalDoorInteract extends PathfinderGoal { @@ -3356,7 +3356,7 @@ index e4088249c..d5d06c85d 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java b/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java -index 420ef53e4..987b15ffe 100644 +index 420ef53e4a..987b15ffea 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalDoorOpen.java @@ -13,6 +13,7 @@ public class PathfinderGoalDoorOpen extends PathfinderGoalDoorInteract { @@ -3368,7 +3368,7 @@ index 420ef53e4..987b15ffe 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java b/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java -index e9679bb46..ae9b5eee9 100644 +index e9679bb46f..ae9b5eee96 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalEatTile.java @@ -22,6 +22,7 @@ public class PathfinderGoalEatTile extends PathfinderGoal { @@ -3388,7 +3388,7 @@ index e9679bb46..ae9b5eee9 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java b/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java -index eb4d86f22..343b74c93 100644 +index eb4d86f226..343b74c937 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFishSchool.java @@ -20,6 +20,7 @@ public class PathfinderGoalFishSchool extends PathfinderGoal { @@ -3408,7 +3408,7 @@ index eb4d86f22..343b74c93 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java b/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java -index b18f7c516..ecb48fe45 100644 +index b18f7c516a..ecb48fe459 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFleeSun.java @@ -22,6 +22,7 @@ public class PathfinderGoalFleeSun extends PathfinderGoal { @@ -3428,7 +3428,7 @@ index b18f7c516..ecb48fe45 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java -index 7fac14fb6..845cb071b 100644 +index 7fac14fb66..845cb071b7 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowBoat.java @@ -16,6 +16,7 @@ public class PathfinderGoalFollowBoat extends PathfinderGoal { @@ -3448,7 +3448,7 @@ index 7fac14fb6..845cb071b 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java -index 1d19ffee9..5fc43105b 100644 +index 1d19ffee9d..5fc43105b5 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowEntity.java @@ -34,6 +34,7 @@ public class PathfinderGoalFollowEntity extends PathfinderGoal { @@ -3468,7 +3468,7 @@ index 1d19ffee9..5fc43105b 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java -index 896d2d56a..55318e137 100644 +index 896d2d56aa..55318e137a 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowOwner.java @@ -34,6 +34,7 @@ public class PathfinderGoalFollowOwner extends PathfinderGoal { @@ -3488,7 +3488,7 @@ index 896d2d56a..55318e137 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java b/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java -index 63b7777c0..78b3d63c1 100644 +index 63b7777c08..78b3d63c13 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFollowParent.java @@ -17,6 +17,7 @@ public class PathfinderGoalFollowParent extends PathfinderGoal { @@ -3508,7 +3508,7 @@ index 63b7777c0..78b3d63c1 100644 return false; } else if (!this.b.isAlive()) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java -index 1dcfa8ab4..32ef8cf5b 100644 +index 1dcfa8ab47..32ef8cf5b1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java @@ -31,6 +31,7 @@ public abstract class PathfinderGoalGotoTarget extends PathfinderGoal { @@ -3528,7 +3528,7 @@ index 1dcfa8ab4..32ef8cf5b 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index f09374413..32176bbf2 100644 +index f093744136..32176bbf2a 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -10,6 +10,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { @@ -3540,7 +3540,7 @@ index f09374413..32176bbf2 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java -index c9a8ede5b..ea774597f 100644 +index c9a8ede5b2..ea774597f5 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHurtByTarget.java @@ -20,6 +20,7 @@ public class PathfinderGoalHurtByTarget extends PathfinderGoalTarget { @@ -3552,7 +3552,7 @@ index c9a8ede5b..ea774597f 100644 EntityLiving entityliving = this.e.getLastDamager(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java -index 84d2cf8df..856a79653 100644 +index 84d2cf8df6..856a796534 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalJumpOnBlock.java @@ -11,6 +11,7 @@ public class PathfinderGoalJumpOnBlock extends PathfinderGoalGotoTarget { @@ -3564,7 +3564,7 @@ index 84d2cf8df..856a79653 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java -index b89d16136..08767e28b 100644 +index b89d161360..08767e28b4 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalLeapAtTarget.java @@ -16,6 +16,7 @@ public class PathfinderGoalLeapAtTarget extends PathfinderGoal { @@ -3584,7 +3584,7 @@ index b89d16136..08767e28b 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java -index 72df549ed..7291385d8 100644 +index 72df549eda..7291385d80 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java @@ -18,6 +18,7 @@ public class PathfinderGoalLlamaFollow extends PathfinderGoal { @@ -3604,7 +3604,7 @@ index 72df549ed..7291385d8 100644 double d0 = this.a.h((Entity) this.a.eK()); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java -index 614a8471d..a57752bd2 100644 +index 614a8471da..a57752bd24 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalLookAtPlayer.java @@ -34,6 +34,7 @@ public class PathfinderGoalLookAtPlayer extends PathfinderGoal { @@ -3624,7 +3624,7 @@ index 614a8471d..a57752bd2 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java -index a4894853f..10d5f20cf 100644 +index a4894853f4..10d5f20cfd 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalLookAtTradingPlayer.java @@ -11,6 +11,7 @@ public class PathfinderGoalLookAtTradingPlayer extends PathfinderGoalLookAtPlaye @@ -3636,7 +3636,7 @@ index a4894853f..10d5f20cf 100644 this.b = this.f.getTrader(); return true; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java -index 702a75087..6d49d8437 100644 +index 702a75087c..6d49d8437d 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalMeleeAttack.java @@ -25,6 +25,7 @@ public class PathfinderGoalMeleeAttack extends PathfinderGoal { @@ -3656,7 +3656,7 @@ index 702a75087..6d49d8437 100644 return entityliving == null ? false : (!entityliving.isAlive() ? false : (!this.e ? !this.a.getNavigation().n() : (!this.a.a(new BlockPosition(entityliving)) ? false : !(entityliving instanceof EntityHuman) || !entityliving.isSpectator() && !((EntityHuman) entityliving).isCreative()))); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java -index 9dc89d995..1d5974427 100644 +index 9dc89d9953..1d59744274 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java @@ -33,6 +33,7 @@ public class PathfinderGoalMoveThroughVillage extends PathfinderGoal { @@ -3676,7 +3676,7 @@ index 9dc89d995..1d5974427 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java -index 294ea6679..eb2da3457 100644 +index 294ea66799..eb2da34571 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsRestriction.java @@ -18,6 +18,7 @@ public class PathfinderGoalMoveTowardsRestriction extends PathfinderGoal { @@ -3696,7 +3696,7 @@ index 294ea6679..eb2da3457 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java -index c38aedf62..32bd2e1ee 100644 +index c38aedf623..32bd2e1ee1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveTowardsTarget.java @@ -21,6 +21,7 @@ public class PathfinderGoalMoveTowardsTarget extends PathfinderGoal { @@ -3716,7 +3716,7 @@ index c38aedf62..32bd2e1ee 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java -index 53399e311..d03130fcf 100644 +index 53399e3115..d03130fcfd 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java @@ -29,6 +29,7 @@ public class PathfinderGoalNearestAttackableTarget exten @@ -3728,7 +3728,7 @@ index 53399e311..d03130fcf 100644 return false; } else { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java -index 579dc99df..5dc3f7a2d 100644 +index 579dc99df0..5dc3f7a2d1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTargetWitch.java @@ -17,6 +17,7 @@ public class PathfinderGoalNearestAttackableTargetWitch @@ -3740,7 +3740,7 @@ index 579dc99df..5dc3f7a2d 100644 } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java -index 90eed77e1..87b9df53b 100644 +index 90eed77e18..87b9df53b0 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestHealableRaider.java @@ -21,6 +21,7 @@ public class PathfinderGoalNearestHealableRaider extends @@ -3752,7 +3752,7 @@ index 90eed77e1..87b9df53b 100644 if (!((EntityRaider) this.e).el()) { return false; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java -index 28b4b76ec..37f2c0660 100644 +index 28b4b76ecd..37f2c06606 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestVillage.java @@ -19,6 +19,7 @@ public class PathfinderGoalNearestVillage extends PathfinderGoal { @@ -3772,7 +3772,7 @@ index 28b4b76ec..37f2c0660 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java b/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java -index bf52ecc40..2bb7e0c1e 100644 +index bf52ecc401..2bb7e0c1e8 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalOcelotAttack.java @@ -17,6 +17,7 @@ public class PathfinderGoalOcelotAttack extends PathfinderGoal { @@ -3792,7 +3792,7 @@ index bf52ecc40..2bb7e0c1e 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java b/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java -index 59822905a..f35318926 100644 +index 59822905a5..f35318926b 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalOfferFlower.java @@ -16,6 +16,7 @@ public class PathfinderGoalOfferFlower extends PathfinderGoal { @@ -3812,7 +3812,7 @@ index 59822905a..f35318926 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java -index 5b99b0ddd..4724d1b8c 100644 +index 5b99b0ddd9..4724d1b8c1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java @@ -16,6 +16,7 @@ public class PathfinderGoalOwnerHurtByTarget extends PathfinderGoalTarget { @@ -3824,7 +3824,7 @@ index 5b99b0ddd..4724d1b8c 100644 EntityLiving entityliving = this.a.getOwner(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java -index eb99159c8..14254931c 100644 +index eb99159c8f..14254931c3 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java @@ -16,6 +16,7 @@ public class PathfinderGoalOwnerHurtTarget extends PathfinderGoalTarget { @@ -3836,7 +3836,7 @@ index eb99159c8..14254931c 100644 EntityLiving entityliving = this.a.getOwner(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java -index f399683b7..33b616a60 100644 +index f399683b74..33b616a601 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java @@ -19,6 +19,7 @@ public class PathfinderGoalPanic extends PathfinderGoal { @@ -3856,7 +3856,7 @@ index f399683b7..33b616a60 100644 if ((this.a.ticksLived - this.a.hurtTimestamp) > 100) { this.a.setLastDamager((EntityLiving) null); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalPerch.java b/src/main/java/net/minecraft/server/PathfinderGoalPerch.java -index 9fc352436..3cad98d72 100644 +index 9fc3524369..3cad98d721 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalPerch.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalPerch.java @@ -12,6 +12,7 @@ public class PathfinderGoalPerch extends PathfinderGoal { @@ -3868,7 +3868,7 @@ index 9fc352436..3cad98d72 100644 boolean flag = entityplayer != null && !entityplayer.isSpectator() && !entityplayer.abilities.isFlying && !entityplayer.isInWater(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRaid.java b/src/main/java/net/minecraft/server/PathfinderGoalRaid.java -index dd498a707..91a96e6e2 100644 +index dd498a7070..91a96e6e22 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRaid.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRaid.java @@ -18,11 +18,13 @@ public class PathfinderGoalRaid extends PathfinderGoal { @@ -3886,7 +3886,7 @@ index dd498a707..91a96e6e2 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java -index 316205ebf..8cc9f4fe1 100644 +index 316205ebfa..8cc9f4fe13 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRandomLookaround.java @@ -16,11 +16,13 @@ public class PathfinderGoalRandomLookaround extends PathfinderGoal { @@ -3904,7 +3904,7 @@ index 316205ebf..8cc9f4fe1 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java -index e74b16948..6688219cf 100644 +index e74b169484..6688219cf6 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRandomStroll.java @@ -26,6 +26,7 @@ public class PathfinderGoalRandomStroll extends PathfinderGoal { @@ -3924,7 +3924,7 @@ index e74b16948..6688219cf 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java b/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java -index f572f3367..218c35bf7 100644 +index f572f33673..218c35bf77 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRandomTargetNonTamed.java @@ -14,11 +14,13 @@ public class PathfinderGoalRandomTargetNonTamed extends @@ -3942,7 +3942,7 @@ index f572f3367..218c35bf7 100644 } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java -index 31c441201..ada48a7aa 100644 +index 31c4412012..ada48a7aa1 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java @@ -23,6 +23,7 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget { @@ -3954,7 +3954,7 @@ index 31c441201..ada48a7aa 100644 return false; } else if (this.c > 0) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java b/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java -index e964907b0..b8fa65560 100644 +index e964907b05..b8fa65560c 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRestrictSun.java @@ -10,6 +10,7 @@ public class PathfinderGoalRestrictSun extends PathfinderGoal { @@ -3966,7 +3966,7 @@ index e964907b0..b8fa65560 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSit.java b/src/main/java/net/minecraft/server/PathfinderGoalSit.java -index 3bb38030c..b766e7552 100644 +index 3bb38030cc..b766e7552e 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSit.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSit.java @@ -14,11 +14,13 @@ public class PathfinderGoalSit extends PathfinderGoal { @@ -3984,7 +3984,7 @@ index 3bb38030c..b766e7552 100644 return this.willSit && this.entity.getGoalTarget() == null; // CraftBukkit - Allow sitting for wild animals } else if (this.entity.av()) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java -index 3a081935f..9e0c58629 100644 +index 3a081935fa..9e0c58629c 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalStrollVillage.java @@ -10,6 +10,7 @@ public class PathfinderGoalStrollVillage extends PathfinderGoalRandomStroll { @@ -3996,7 +3996,7 @@ index 3a081935f..9e0c58629 100644 BlockPosition blockposition = new BlockPosition(this.a); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTame.java b/src/main/java/net/minecraft/server/PathfinderGoalTame.java -index 04acbc825..5a8fd74df 100644 +index 04acbc8250..5a8fd74df2 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTame.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTame.java @@ -18,6 +18,7 @@ public class PathfinderGoalTame extends PathfinderGoal { @@ -4016,7 +4016,7 @@ index 04acbc825..5a8fd74df 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java -index 95afc8eee..59a50e549 100644 +index 95afc8eeec..59a50e5499 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTarget.java @@ -27,6 +27,7 @@ public abstract class PathfinderGoalTarget extends PathfinderGoal { @@ -4028,7 +4028,7 @@ index 95afc8eee..59a50e549 100644 if (entityliving == null) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java -index 0b036f29c..c12a3e6a6 100644 +index 0b036f29cf..c12a3e6a6f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -41,6 +41,7 @@ public class PathfinderGoalTempt extends PathfinderGoal { @@ -4048,7 +4048,7 @@ index 0b036f29c..c12a3e6a6 100644 if (this.a.h((Entity) this.target) < 36.0D) { if (this.target.e(this.e, this.f, this.g) > 0.010000000000000002D) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java b/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java -index 9d37bd1a8..0ead41f0d 100644 +index 9d37bd1a8a..0ead41f0dd 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTradeWithPlayer.java @@ -13,6 +13,7 @@ public class PathfinderGoalTradeWithPlayer extends PathfinderGoal { @@ -4060,7 +4060,7 @@ index 9d37bd1a8..0ead41f0d 100644 return false; } else if (this.a.isInWater()) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java b/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java -index e6c5b968b..c9f3680ba 100644 +index e6c5b968b1..c9f3680ba3 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalUseItem.java @@ -19,11 +19,13 @@ public class PathfinderGoalUseItem extends Pathfinde @@ -4078,7 +4078,7 @@ index e6c5b968b..c9f3680ba 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWater.java b/src/main/java/net/minecraft/server/PathfinderGoalWater.java -index 65b6bcdbd..fbc36ff7a 100644 +index 65b6bcdbde..fbc36ff7ae 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWater.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWater.java @@ -12,6 +12,7 @@ public class PathfinderGoalWater extends PathfinderGoal { @@ -4090,7 +4090,7 @@ index 65b6bcdbd..fbc36ff7a 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java b/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java -index a2fc2cd80..8f064526b 100644 +index a2fc2cd802..8f064526b2 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWaterJump.java @@ -14,6 +14,7 @@ public class PathfinderGoalWaterJump extends PathfinderGoalWaterJumpAbstract { @@ -4110,7 +4110,7 @@ index a2fc2cd80..8f064526b 100644 return (d0 * d0 >= 0.029999999329447746D || this.b.pitch == 0.0F || Math.abs(this.b.pitch) >= 10.0F || !this.b.isInWater()) && !this.b.onGround; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 7faa0c6ac..8bf8384a2 100644 +index 7faa0c6ac7..8bf8384a2a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -131,6 +131,11 @@ public class PurpurConfig { @@ -4245,7 +4245,7 @@ index 7faa0c6ac..8bf8384a2 100644 } diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java new file mode 100644 -index 000000000..99e184d36 +index 0000000000..99e184d36e --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java @@ -0,0 +1,74 @@ @@ -4325,7 +4325,7 @@ index 000000000..99e184d36 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java new file mode 100644 -index 000000000..d64a66274 +index 0000000000..d64a66274b --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java @@ -0,0 +1,77 @@ @@ -4408,7 +4408,7 @@ index 000000000..d64a66274 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java new file mode 100644 -index 000000000..b0b504c7d +index 0000000000..b0b504c7dc --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java @@ -0,0 +1,62 @@ @@ -4476,7 +4476,7 @@ index 000000000..b0b504c7d +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java new file mode 100644 -index 000000000..a353069b7 +index 0000000000..a353069b78 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java @@ -0,0 +1,65 @@ @@ -4547,7 +4547,7 @@ index 000000000..a353069b7 +} diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java new file mode 100644 -index 000000000..74ff48259 +index 0000000000..74ff48259c --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java @@ -0,0 +1,42 @@ @@ -4594,7 +4594,7 @@ index 000000000..74ff48259 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 98f62d776..83eeab5c3 100644 +index 98f62d7760..83eeab5c37 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -710,5 +710,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -4614,7 +4614,7 @@ index 98f62d776..83eeab5c3 100644 // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 56c233872..b19970c88 100644 +index 56c233872b..b19970c883 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -75,4 +75,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/patches/server/0027-Allow-color-codes-on-signs.patch b/patches/server/0027-Allow-color-codes-on-signs.patch index a3c06fcf8..8962f3edb 100644 --- a/patches/server/0027-Allow-color-codes-on-signs.patch +++ b/patches/server/0027-Allow-color-codes-on-signs.patch @@ -1,4 +1,4 @@ -From 7e414462234062bc6c9f42a832f59a3c51685801 Mon Sep 17 00:00:00 2001 +From b252252f673aa20d595976740254bf3a61637ca4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Allow color codes on signs @@ -23,10 +23,10 @@ index 633fe836dd..160c03efd8 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6d6e50313e..671d1085e0 100644 +index c900e32cd4..f55e19c9b0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2592,6 +2592,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -2598,6 +2598,7 @@ public class PlayerConnection implements PacketListenerPlayIn { } } // Paper end @@ -35,7 +35,7 @@ index 6d6e50313e..671d1085e0 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index dd7889a4f9..2f9db45a12 100644 +index 7e5d815938..f5e3b0b30d 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -122,6 +122,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -60,7 +60,7 @@ index dd7889a4f9..2f9db45a12 100644 @Override public PacketPlayOutTileEntityData getUpdatePacket() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7f996591fa..490c2ede60 100644 +index ee92fd26e6..1238864e7c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -91,4 +91,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0036-Controllable-Minecarts.patch b/patches/server/0036-Controllable-Minecarts.patch index 4478f6d35..d2c94f13c 100644 --- a/patches/server/0036-Controllable-Minecarts.patch +++ b/patches/server/0036-Controllable-Minecarts.patch @@ -1,4 +1,4 @@ -From ad2037fa2e77e678c33d9b5ae04401be4fe5559a Mon Sep 17 00:00:00 2001 +From 49183cb290d3f37e227f35085aa5a8c878c5a926 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 29 Jun 2019 02:32:40 -0500 Subject: [PATCH] Controllable Minecarts @@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index cf5d829f6..66824d1a7 100644 +index 7a3b819e70..b1afdf71bb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1294,6 +1294,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1295,6 +1295,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.inLava = true; } @@ -23,7 +23,7 @@ index cf5d829f6..66824d1a7 100644 return this.inLava; } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 6df2930e2..c5b4057c3 100644 +index 6df2930e2d..c5b4057c33 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -4,6 +4,7 @@ import java.util.Iterator; @@ -86,7 +86,7 @@ index 6df2930e2..c5b4057c3 100644 this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ)); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java -index 764427456..456eced16 100644 +index 7644274562..456eced16c 100644 --- a/src/main/java/net/minecraft/server/ItemMinecart.java +++ b/src/main/java/net/minecraft/server/ItemMinecart.java @@ -103,8 +103,10 @@ public class ItemMinecart extends Item { @@ -111,7 +111,7 @@ index 764427456..456eced16 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a86b3fc9c..99c13caee 100644 +index a86b3fc9ce..99c13caee6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,9 +1,13 @@ diff --git a/patches/server/0050-Prevent-entities-from-moving-in-unloaded-chunks.patch b/patches/server/0050-Prevent-entities-from-moving-in-unloaded-chunks.patch index ac8cff324..8a6973010 100644 --- a/patches/server/0050-Prevent-entities-from-moving-in-unloaded-chunks.patch +++ b/patches/server/0050-Prevent-entities-from-moving-in-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From d1315aeff30dfaa93dec34425ac1e3c0e4ee0ce1 Mon Sep 17 00:00:00 2001 +From 45acaf6afc185ca3d39f570cc64f16a12b9b3dfa Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 12 Jul 2019 16:18:55 -0500 Subject: [PATCH] Prevent entities from moving in unloaded chunks @@ -8,10 +8,10 @@ Subject: [PATCH] Prevent entities from moving in unloaded chunks 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f1975fa36e..23fea2b6e8 100644 +index b1afdf71bb..79fb1c6c8e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -576,6 +576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -577,6 +577,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke int j = MathHelper.floor(this.locY - 0.20000000298023224D); int k = MathHelper.floor(this.locZ); BlockPosition blockposition = new BlockPosition(i, j, k); diff --git a/patches/server/0052-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch similarity index 99% rename from patches/server/0052-Asynchronous-chunk-IO-and-loading.patch rename to patches/server/0051-Asynchronous-chunk-IO-and-loading.patch index c98493657..7d26f8b82 100644 --- a/patches/server/0052-Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/0051-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From da939406c7900f95e4c1888e8672968e38afe69a Mon Sep 17 00:00:00 2001 +From c4a6f06f03a00f7c612b574ea996db5218711cd3 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -1593,7 +1593,7 @@ index 0000000000..8dbaaba3cd + +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index db9113994e..4f7c442264 100644 +index d76860daf8..32a469025e 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -147,11 +147,143 @@ public class ChunkProviderServer extends IChunkProvider { @@ -1971,7 +1971,7 @@ index 0324a90ca5..430cd70cf5 100644 public String getServerIp() { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index a439277813..f25ca782b9 100644 +index 89b72da828..089a20c835 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -57,7 +57,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -1992,7 +1992,7 @@ index a439277813..f25ca782b9 100644 private final File x; private final PlayerMap playerMap; public final Int2ObjectMap trackedEntities; -@@ -101,7 +101,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -126,7 +126,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { this.lightEngine = new LightEngineThreaded(ilightaccess, this, this.world.getWorldProvider().g(), threadedmailbox2, this.q.a(threadedmailbox2, false)); this.u = new PlayerChunkMap.a(executor, iasynctaskhandler); this.m = supplier; @@ -2001,7 +2001,7 @@ index a439277813..f25ca782b9 100644 this.setViewDistance(i); } -@@ -261,6 +261,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -286,6 +286,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @Override public void close() throws IOException { this.q.close(); @@ -2009,7 +2009,7 @@ index a439277813..f25ca782b9 100644 this.n.close(); super.close(); } -@@ -308,7 +309,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -333,7 +334,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { shouldSave = ((Chunk) ichunkaccess).lastSaved + world.paperConfig.autoSavePeriod <= world.getTime(); } @@ -2018,7 +2018,7 @@ index a439277813..f25ca782b9 100644 ++savedThisTick; playerchunk.m(); } -@@ -328,11 +329,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -353,11 +354,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { protected void unloadChunks(BooleanSupplier booleansupplier) { GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); @@ -2034,7 +2034,7 @@ index a439277813..f25ca782b9 100644 } gameprofilerfiller.exit(); -@@ -386,7 +391,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -411,7 +416,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { ((Chunk) ichunkaccess).setLoaded(false); } @@ -2043,7 +2043,7 @@ index a439277813..f25ca782b9 100644 if (this.loadedChunks.remove(i) && ichunkaccess instanceof Chunk) { Chunk chunk = (Chunk) ichunkaccess; -@@ -462,26 +467,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -487,26 +492,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } } @@ -2089,7 +2089,7 @@ index a439277813..f25ca782b9 100644 } catch (ReportedException reportedexception) { Throwable throwable = reportedexception.getCause(); -@@ -495,7 +504,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -520,7 +529,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } return Either.left(new ProtoChunk(chunkcoordintpair, ChunkConverter.a, this.world)); // Paper - Anti-Xray @@ -2108,7 +2108,7 @@ index a439277813..f25ca782b9 100644 } private CompletableFuture> b(PlayerChunk playerchunk, ChunkStatus chunkstatus) { -@@ -701,18 +720,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -726,18 +745,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { return this.v.get(); } @@ -2159,7 +2159,7 @@ index a439277813..f25ca782b9 100644 ichunkaccess.setLastSaved(this.world.getTime()); ichunkaccess.setNeedsSaving(false); -@@ -723,27 +766,33 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -748,27 +791,33 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { NBTTagCompound nbttagcompound; if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) { @@ -2196,7 +2196,7 @@ index a439277813..f25ca782b9 100644 } protected void setViewDistance(int i) { -@@ -808,6 +857,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -833,6 +882,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { return Iterables.unmodifiableIterable(this.visibleChunks.values()); } @@ -2239,7 +2239,7 @@ index a439277813..f25ca782b9 100644 @Nullable public NBTTagCompound readChunkData(ChunkCoordIntPair chunkcoordintpair) throws IOException { // Paper - private -> public NBTTagCompound nbttagcompound = this.read(chunkcoordintpair); -@@ -830,12 +915,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -855,12 +940,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { // Paper start - chunk status cache "api" public ChunkStatus getChunkStatusOnDiskIfCached(ChunkCoordIntPair chunkPos) { @@ -2270,7 +2270,7 @@ index a439277813..f25ca782b9 100644 RegionFile regionFile = this.getRegionFile(chunkPos, false); if (!regionFile.chunkExists(chunkPos)) { -@@ -847,17 +950,49 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -872,17 +975,49 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { if (status != null) { return status; } @@ -2322,7 +2322,7 @@ index a439277813..f25ca782b9 100644 // Paper end // Spigot Start -@@ -1197,6 +1332,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1222,6 +1357,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } diff --git a/patches/server/0051-isLoaded-calls-should-NOT-load-chunks.patch b/patches/server/0051-isLoaded-calls-should-NOT-load-chunks.patch deleted file mode 100644 index a39302ca1..000000000 --- a/patches/server/0051-isLoaded-calls-should-NOT-load-chunks.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 72375763835b492551ee6f6a3ebaba8d66e9988f Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Fri, 12 Jul 2019 17:45:16 -0500 -Subject: [PATCH] isLoaded calls should NOT load chunks... - ---- - src/main/java/net/minecraft/server/ChunkProviderServer.java | 2 +- - src/main/java/net/minecraft/server/FluidTypeLava.java | 2 +- - src/main/java/net/minecraft/server/World.java | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 539c65f855..db9113994e 100644 ---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java -+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -164,7 +164,7 @@ public class ChunkProviderServer extends IChunkProvider { - for (int l = 0; l < 4; ++l) { - if (k == this.cachePos[l] && chunkstatus == this.cacheStatus[l]) { - ichunkaccess = this.cacheChunk[l]; -- if (ichunkaccess != null) { // CraftBukkit - the chunk can become accessible in the meantime TODO for non-null chunks it might also make sense to check that the chunk's state hasn't changed in the meantime -+ if (ichunkaccess != null || !flag) { // CraftBukkit - the chunk can become accessible in the meantime TODO for non-null chunks it might also make sense to check that the chunk's state hasn't changed in the meantime // Purpur - put flag back - return ichunkaccess; - } - } -diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java -index 2f9578e1cf..5f404fb721 100644 ---- a/src/main/java/net/minecraft/server/FluidTypeLava.java -+++ b/src/main/java/net/minecraft/server/FluidTypeLava.java -@@ -94,7 +94,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { - } - - private boolean b(IWorldReader iworldreader, BlockPosition blockposition) { -- return blockposition.getY() >= 0 && blockposition.getY() < 256 && !iworldreader.isLoaded(blockposition) ? false : iworldreader.getType(blockposition).getMaterial().isBurnable(); -+ return blockposition.getY() >= 0 && blockposition.getY() < 256 && !((WorldServer)iworldreader).isLoaded(blockposition) ? false : iworldreader.getType(blockposition).getMaterial().isBurnable(); // Purpur - } - - @Override -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c86c9d1ecc..c80c659a38 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -133,7 +133,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose - } - - public Chunk getChunkIfLoaded(int x, int z) { -- return ((ChunkProviderServer) this.chunkProvider).getChunkAt(x, z, false); -+ return (Chunk) getChunkIfLoadedImmediately(x, z); // Purpur - } - - protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { --- -2.20.1 - diff --git a/patches/server/0053-Implement-optional-per-player-mob-spawns.patch b/patches/server/0052-Implement-optional-per-player-mob-spawns.patch similarity index 98% rename from patches/server/0053-Implement-optional-per-player-mob-spawns.patch rename to patches/server/0052-Implement-optional-per-player-mob-spawns.patch index 1e74bd275..9be6af0a3 100644 --- a/patches/server/0053-Implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0052-Implement-optional-per-player-mob-spawns.patch @@ -1,4 +1,4 @@ -From 3ff085046cf1d3efc53b2dec884c4d5b75cd0df3 Mon Sep 17 00:00:00 2001 +From 9a9594c015e50f2e5bec425ef0ba6c9bd11cb674 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Tue, 11 Jun 2019 22:22:16 -0400 Subject: [PATCH] Implement optional per player mob spawns @@ -29,7 +29,7 @@ index ff520d9e86..5ed02f6485 100644 public boolean asynchronous; public EngineMode engineMode; diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 4f7c442264..9f6c362dd1 100644 +index 32a469025e..688573276d 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -582,9 +582,21 @@ public class ChunkProviderServer extends IChunkProvider { @@ -57,10 +57,10 @@ index 4f7c442264..9f6c362dd1 100644 } } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index f25ca782b9..a235df4185 100644 +index 089a20c835..038b0f9fb1 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -105,6 +105,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -130,6 +130,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { this.setViewDistance(i); } @@ -68,7 +68,7 @@ index f25ca782b9..a235df4185 100644 private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) { double d0 = (double) (chunkcoordintpair.x * 16 + 8); double d1 = (double) (chunkcoordintpair.z * 16 + 8); -@@ -1157,6 +1158,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1182,6 +1183,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } diff --git a/patches/server/0054-Tulips-change-fox-type.patch b/patches/server/0053-Tulips-change-fox-type.patch similarity index 98% rename from patches/server/0054-Tulips-change-fox-type.patch rename to patches/server/0053-Tulips-change-fox-type.patch index 3a3895508..af9b443e8 100644 --- a/patches/server/0054-Tulips-change-fox-type.patch +++ b/patches/server/0053-Tulips-change-fox-type.patch @@ -1,4 +1,4 @@ -From dc255f32785831cfa041105a377ea880926762f8 Mon Sep 17 00:00:00 2001 +From 902ff47413092187f4aa5dcd657b3d497e7c0c85 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Jul 2019 15:56:22 -0500 Subject: [PATCH] Tulips change fox type diff --git a/patches/server/0055-Prevent-enderman-teleporting-into-unloaded-chunks.patch b/patches/server/0054-Prevent-enderman-teleporting-into-unloaded-chunks.patch similarity index 94% rename from patches/server/0055-Prevent-enderman-teleporting-into-unloaded-chunks.patch rename to patches/server/0054-Prevent-enderman-teleporting-into-unloaded-chunks.patch index 162b37c70..e50507f5c 100644 --- a/patches/server/0055-Prevent-enderman-teleporting-into-unloaded-chunks.patch +++ b/patches/server/0054-Prevent-enderman-teleporting-into-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 3aa92d8e98f4ef431ad18fe137bbdd01f4a2f970 Mon Sep 17 00:00:00 2001 +From c5ee4071c9329bf54928f2701a7d7402e56d9b88 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Jul 2019 18:41:37 -0500 Subject: [PATCH] Prevent enderman teleporting into unloaded chunks diff --git a/patches/server/0056-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch b/patches/server/0055-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch similarity index 95% rename from patches/server/0056-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch rename to patches/server/0055-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch index 44cb90a7a..1f67669c0 100644 --- a/patches/server/0056-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch +++ b/patches/server/0055-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch @@ -1,4 +1,4 @@ -From bc6361e47b89f6a225b13b5c2dfb44d1f2f7968f Mon Sep 17 00:00:00 2001 +From 2743ab191c1f49d276cac635ad2c2d1893847ddb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Jul 2019 18:50:05 -0500 Subject: [PATCH] Prevent zombies spawning reinforcements in unloaded chunks diff --git a/patches/server/0057-Mending-mends-most-damages-equipment-first.patch b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch similarity index 98% rename from patches/server/0057-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0056-Mending-mends-most-damages-equipment-first.patch index eef40b795..34eb87a77 100644 --- a/patches/server/0057-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch @@ -1,4 +1,4 @@ -From b3cc317cb6d83594cd0aaa508019925a939d03a5 Mon Sep 17 00:00:00 2001 +From b766921c717b726c90756aecad10a8603016a11c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 14 Jul 2019 19:52:47 -0500 Subject: [PATCH] Mending mends most damages equipment first