diff --git a/Paper b/Paper index 0f06d3806..ffecc4e26 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 0f06d380626807b24c5281546cfb890840435de9 +Subproject commit ffecc4e264bcb83b4eaf2601f8242dca8e78b9b0 diff --git a/current-paper b/current-paper index df02991cd..960a84ee5 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--029c5687efac68dae543dcdae06aa5afe9c0d787 +1.15.2--a9536f61ce85126c99f052f1e7a45f0d413ec8f0 diff --git a/patches/api/0007-Implement-AFK-API.patch b/patches/api/0007-Implement-AFK-API.patch index 821192622..451796782 100644 --- a/patches/api/0007-Implement-AFK-API.patch +++ b/patches/api/0007-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From 47f895fa7d4f5d6efc3fd329a7be976f1c296863 Mon Sep 17 00:00:00 2001 +From a6ae43a653ae0fbe98bc01c3d5c55900a4009e07 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 10 Aug 2019 22:19:56 -0500 Subject: [PATCH] Implement AFK API @@ -87,10 +87,10 @@ index 000000000..0c8b3e5e4 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3600b4c84..3009fa3ca 100644 +index 787bb144b..edc481170 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1823,4 +1823,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1830,4 +1830,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 38f42c349..94c6ea399 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From dd81bbb0f301d276c38962221b2de0b042a46e41 Mon Sep 17 00:00:00 2001 +From 5d1842e8868cd3cc2af5fb15ac2d86524a82999a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml -index 55679af92..a7ee9396a 100644 +index 55679af926..a7ee9396a0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -94,7 +94,7 @@ index 55679af92..a7ee9396a 100644 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index cd6e25923..bb227bc0f 100644 +index cd6e259239..bb227bc0fb 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @@ -107,10 +107,10 @@ index cd6e25923..bb227bc0f 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 36fff92f3..ad744ff63 100644 +index a386c1ab48..6c305ed535 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1515,7 +1515,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 26 Mar 2020 13:17:09 -0500 Subject: [PATCH] Add language asset purpur.lang @@ -12,10 +12,10 @@ Subject: [PATCH] Add language asset purpur.lang create mode 100644 src/main/resources/purpur.lang diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index fb38975830..74085c0511 100644 +index 202068314e..31e51fcec3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1561,6 +1561,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1562,6 +1562,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void a(IChatBaseComponent ichatbasecomponent, ChatMessageType chatmessagetype) { diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch index 20f313008..a1ab86d87 100644 --- a/patches/server/0007-Ridables.patch +++ b/patches/server/0007-Ridables.patch @@ -1,4 +1,4 @@ -From 3abc1359f398d88bc8f87a26e50e9c3083647a08 Mon Sep 17 00:00:00 2001 +From 870e5224aba790735b263d869c87d3df33edab3f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Feb 2020 19:53:59 -0600 Subject: [PATCH] Ridables @@ -115,7 +115,7 @@ Subject: [PATCH] Ridables create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index 3fdb52007..7e67292c2 100644 +index 3fdb52007a..7e67292c2e 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -104,6 +104,7 @@ public class AxisAlignedBB { @@ -135,7 +135,7 @@ index 3fdb52007..7e67292c2 100644 return this.grow(d0, d0, d0); } diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java -index 1d9ba04da..2bade947e 100644 +index 1d9ba04daa..2bade947ee 100644 --- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java +++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java @@ -1,6 +1,6 @@ @@ -156,7 +156,7 @@ index 1d9ba04da..2bade947e 100644 this.d = false; this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java -index a5c4cbb67..efe6afde9 100644 +index a5c4cbb67f..efe6afde9b 100644 --- a/src/main/java/net/minecraft/server/ControllerMove.java +++ b/src/main/java/net/minecraft/server/ControllerMove.java @@ -6,9 +6,9 @@ public class ControllerMove { @@ -173,7 +173,7 @@ index a5c4cbb67..efe6afde9 100644 public ControllerMove(EntityInsentient entityinsentient) { diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java -index 816d301f1..f7344d3ae 100644 +index 816d301f1c..f7344d3aec 100644 --- a/src/main/java/net/minecraft/server/DamageSource.java +++ b/src/main/java/net/minecraft/server/DamageSource.java @@ -57,6 +57,7 @@ public class DamageSource { @@ -198,7 +198,7 @@ index 816d301f1..f7344d3ae 100644 this.C = true; return this; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 96a47dd1c..a3bee7bf2 100644 +index 96a47dd1c2..a3bee7bf23 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -361,7 +361,7 @@ index 96a47dd1c..a3bee7bf2 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index 3d27f0964..822316a65 100644 +index 3d27f0964a..822316a65f 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -86,7 +86,7 @@ public abstract class EntityAgeable extends EntityCreature { @@ -374,7 +374,7 @@ index 3d27f0964..822316a65 100644 } diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java -index 34239160b..592408bac 100644 +index 34239160be..592408bac9 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -14,9 +14,44 @@ public class EntityBat extends EntityAmbient { @@ -465,7 +465,7 @@ index 34239160b..592408bac 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index dd1d246ae..f0f83baac 100644 +index dd1d246aeb..f0f83baac8 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -646,7 +646,7 @@ index dd1d246ae..f0f83baac 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java -index da6a3fa2c..d02130e0d 100644 +index da6a3fa2c8..d02130e0d1 100644 --- a/src/main/java/net/minecraft/server/EntityBlaze.java +++ b/src/main/java/net/minecraft/server/EntityBlaze.java @@ -10,6 +10,7 @@ public class EntityBlaze extends EntityMonster { @@ -736,7 +736,7 @@ index da6a3fa2c..d02130e0d 100644 if (this.c <= 0) { this.c = 100; diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index b3bdc194a..8b9222d77 100644 +index b3bdc194ab..8b9222d778 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -42,6 +42,23 @@ public class EntityCat extends EntityTameableAnimal { @@ -830,7 +830,7 @@ index b3bdc194a..8b9222d77 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java -index 23ced2c7b..5b86b36f6 100644 +index 23ced2c7bb..5b86b36f6a 100644 --- a/src/main/java/net/minecraft/server/EntityCaveSpider.java +++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java @@ -8,6 +8,23 @@ public class EntityCaveSpider extends EntitySpider { @@ -858,7 +858,7 @@ index 23ced2c7b..5b86b36f6 100644 protected void initAttributes() { super.initAttributes(); diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index 65795fc89..5505b7ee9 100644 +index 65795fc896..5505b7ee94 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -17,9 +17,27 @@ public class EntityChicken extends EntityAnimal { @@ -898,7 +898,7 @@ index 65795fc89..5505b7ee9 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..0153a821e 100644 +index 1e3782122a..0153a821ee 100644 --- a/src/main/java/net/minecraft/server/EntityCod.java +++ b/src/main/java/net/minecraft/server/EntityCod.java @@ -6,6 +6,23 @@ public class EntityCod extends EntityFishSchool { @@ -926,7 +926,7 @@ index 1e3782122..0153a821e 100644 protected ItemStack l() { return new ItemStack(Items.COD_BUCKET); diff --git a/src/main/java/net/minecraft/server/EntityComplexPart.java b/src/main/java/net/minecraft/server/EntityComplexPart.java -index a0b35c869..144e89f22 100644 +index a0b35c8699..144e89f224 100644 --- a/src/main/java/net/minecraft/server/EntityComplexPart.java +++ b/src/main/java/net/minecraft/server/EntityComplexPart.java @@ -47,4 +47,11 @@ public class EntityComplexPart extends Entity { @@ -942,7 +942,7 @@ index a0b35c869..144e89f22 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 2c8bbf20a..723a9fa1e 100644 +index 2c8bbf20ae..723a9fa1ee 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -11,9 +11,27 @@ public class EntityCow extends EntityAnimal { @@ -974,7 +974,7 @@ index 2c8bbf20a..723a9fa1e 100644 this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D)); this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT), false)); diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 45dfc8104..48fd8e716 100644 +index 45dfc8104a..48fd8e716b 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -23,16 +23,35 @@ public class EntityCreeper extends EntityMonster { @@ -1090,7 +1090,7 @@ index 45dfc8104..48fd8e716 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index ce78586ea..81570b37b 100644 +index ce78586ea0..81570b37bb 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -1,5 +1,12 @@ @@ -1241,7 +1241,7 @@ index ce78586ea..81570b37b 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 77885f67f..63f5969b1 100644 +index 77885f67ff..63f5969b10 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -19,6 +19,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -1304,7 +1304,7 @@ index 77885f67f..63f5969b1 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 2887cb14e..a6a79f5e9 100644 +index 2887cb14e4..a6a79f5e9a 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 { @@ -1461,7 +1461,7 @@ index 2887cb14e..a6a79f5e9 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 212636dcb..de30ce483 100644 +index 212636dcb2..de30ce483f 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -27,9 +27,27 @@ public class EntityEnderman extends EntityMonster { @@ -1560,7 +1560,7 @@ index 212636dcb..de30ce483 100644 if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) { // CraftBukkit start - Place event diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java -index e4bd2796a..5eaf1920b 100644 +index e4bd2796a4..5eaf1920b2 100644 --- a/src/main/java/net/minecraft/server/EntityEndermite.java +++ b/src/main/java/net/minecraft/server/EntityEndermite.java @@ -12,13 +12,32 @@ public class EntityEndermite extends EntityMonster { @@ -1597,7 +1597,7 @@ index e4bd2796a..5eaf1920b 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); } diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index b030fe957..179a26129 100644 +index b030fe9577..179a261296 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -12,10 +12,28 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -1662,7 +1662,7 @@ index b030fe957..179a26129 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java -index b853fd0d9..b8d786fad 100644 +index b853fd0d9b..b8d786fad5 100644 --- a/src/main/java/net/minecraft/server/EntityFish.java +++ b/src/main/java/net/minecraft/server/EntityFish.java @@ -72,9 +72,10 @@ public abstract class EntityFish extends EntityWaterAnimal { @@ -1716,7 +1716,7 @@ index b853fd0d9..b8d786fad 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 82a32d5db..4f53090d3 100644 +index 82a32d5dbf..4f53090d3d 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -55,6 +55,23 @@ public class EntityFox extends EntityAnimal { @@ -1854,7 +1854,7 @@ index 82a32d5db..4f53090d3 100644 } diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java -index e1c2540d1..46841df71 100644 +index e1c2540d14..46841df718 100644 --- a/src/main/java/net/minecraft/server/EntityGhast.java +++ b/src/main/java/net/minecraft/server/EntityGhast.java @@ -14,11 +14,47 @@ public class EntityGhast extends EntityFlying implements IMonster { @@ -1937,7 +1937,7 @@ index e1c2540d1..46841df71 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 d9e5eaad1..ff8a41a53 100644 +index d9e5eaad12..ff8a41a539 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java @@ -4,8 +4,33 @@ public class EntityGiantZombie extends EntityMonster { @@ -1975,7 +1975,7 @@ index d9e5eaad1..ff8a41a53 100644 protected float b(EntityPose entitypose, EntitySize entitysize) { return 10.440001F; diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java -index e69cb334f..97040872b 100644 +index e69cb334fb..97040872bc 100644 --- a/src/main/java/net/minecraft/server/EntityGuardian.java +++ b/src/main/java/net/minecraft/server/EntityGuardian.java @@ -24,15 +24,39 @@ public class EntityGuardian extends EntityMonster { @@ -2076,7 +2076,7 @@ index e69cb334f..97040872b 100644 Vec3D vec3d = new Vec3D(this.b - this.i.locX(), this.c - this.i.locY(), this.d - this.i.locZ()); double d0 = vec3d.f(); diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java -index 7484bfeea..f231340d9 100644 +index 7484bfeea0..f231340d90 100644 --- a/src/main/java/net/minecraft/server/EntityGuardianElder.java +++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java @@ -16,6 +16,23 @@ public class EntityGuardianElder extends EntityGuardian { @@ -2104,7 +2104,7 @@ index 7484bfeea..f231340d9 100644 public void initAttributes() { super.initAttributes(); diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index a6fb4ba5b..98b1e9375 100644 +index a6fb4ba5b9..98b1e93759 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -19,6 +19,13 @@ public class EntityHorse extends EntityHorseAbstract { @@ -2122,7 +2122,7 @@ index a6fb4ba5b..98b1e9375 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index c56efe035..e7ba83f32 100644 +index c56efe035a..e7ba83f32a 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -38,12 +38,39 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -2175,7 +2175,7 @@ index c56efe035..e7ba83f32 100644 } diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java -index 9a52decdc..64d80081f 100644 +index 9a52decdca..64d80081f7 100644 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java @@ -6,6 +6,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract { @@ -2193,7 +2193,7 @@ index 9a52decdc..64d80081f 100644 protected SoundEffect getSoundAmbient() { super.getSoundAmbient(); diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java -index 4dd4d91eb..a9f26efe6 100644 +index 4dd4d91eba..a9f26efe66 100644 --- a/src/main/java/net/minecraft/server/EntityHorseMule.java +++ b/src/main/java/net/minecraft/server/EntityHorseMule.java @@ -6,6 +6,13 @@ public class EntityHorseMule extends EntityHorseChestedAbstract { @@ -2211,7 +2211,7 @@ index 4dd4d91eb..a9f26efe6 100644 protected SoundEffect getSoundAmbient() { super.getSoundAmbient(); diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index 290cb9337..7bf76e5a0 100644 +index 290cb9337c..7bf76e5a0b 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -12,6 +12,18 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -2252,7 +2252,7 @@ index 290cb9337..7bf76e5a0 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index 5782a25ec..c87fc523f 100644 +index 5782a25ecd..c87fc523f1 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -8,6 +8,18 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -2282,7 +2282,7 @@ index 5782a25ec..c87fc523f 100644 + protected void ez() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 7afcde608..f372c13d8 100644 +index 8a3f2b5e40..4cf420de0b 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving { @@ -2309,7 +2309,7 @@ index 7afcde608..f372c13d8 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 81b7cd06f..3e6722cfc 100644 +index 81b7cd06f2..3e6722cfce 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -19,10 +19,28 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -2350,7 +2350,7 @@ index 81b7cd06f..3e6722cfc 100644 this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300)); this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300)); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 1991cee43..d0a5687f0 100644 +index 1991cee43d..d0a5687f03 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -2442,7 +2442,7 @@ index 1991cee43..d0a5687f0 100644 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 7f6a56776..288a043fb 100644 +index 7f6a567760..288a043fbd 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -17,8 +17,26 @@ public class EntityIronGolem extends EntityGolem { @@ -2497,7 +2497,7 @@ index 7f6a56776..288a043fb 100644 float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dfb9421a1..53925d526 100644 +index dfb9421a15..53925d526e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -75,7 +75,7 @@ public abstract class EntityLiving extends Entity { @@ -2570,7 +2570,7 @@ index dfb9421a1..53925d526 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 193dbfc5f..7a4e64a3d 100644 +index 193dbfc5f6..7a4e64a3d0 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -16,8 +16,47 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -2675,7 +2675,7 @@ index 193dbfc5f..7a4e64a3d 100644 return i == -1 ? null : EnumColor.fromColorIndex(i); diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java -index 4cebd67e8..08c4ca3f3 100644 +index 4cebd67e85..08c4ca3f36 100644 --- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java +++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java @@ -11,6 +11,23 @@ public class EntityLlamaTrader extends EntityLlama { @@ -2716,7 +2716,7 @@ index 4cebd67e8..08c4ca3f3 100644 @Override public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java -index 1fdc248ba..a5a36af21 100644 +index 1fdc248ba8..a5a36af217 100644 --- a/src/main/java/net/minecraft/server/EntityMagmaCube.java +++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java @@ -8,6 +8,23 @@ public class EntityMagmaCube extends EntitySlime { @@ -2744,7 +2744,7 @@ index 1fdc248ba..a5a36af21 100644 protected void initAttributes() { super.initAttributes(); diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 3706c31aa..b20f4afd3 100644 +index 3706c31aad..b20f4afd3f 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -20,6 +20,23 @@ public class EntityMushroomCow extends EntityCow { @@ -2772,7 +2772,7 @@ index 3706c31aa..b20f4afd3 100644 public float a(BlockPosition blockposition, IWorldReader iworldreader) { return iworldreader.getType(blockposition.down()).getBlock() == Blocks.MYCELIUM ? 10.0F : iworldreader.w(blockposition) - 0.5F; diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index d9a7b8ac1..8fdf34857 100644 +index d9a7b8ac1e..8fdf348573 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -16,6 +16,23 @@ public class EntityOcelot extends EntityAnimal { @@ -2815,7 +2815,7 @@ index d9a7b8ac1..8fdf34857 100644 this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bw)); } diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index f50ed1908..87ed9a8ca 100644 +index f50ed19080..87ed9a8ca0 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -46,6 +46,23 @@ public class EntityPanda extends EntityAnimal { @@ -2961,7 +2961,7 @@ index f50ed1908..87ed9a8ca 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index 94e57a2d8..7ba2f3a35 100644 +index 94e57a2d85..7ba2f3a351 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -62,12 +62,83 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -3062,7 +3062,7 @@ index 94e57a2d8..7ba2f3a35 100644 this.goalSelector.a(2, this.goalSit); this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true)); diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 90eeddb1a..c392085d0 100644 +index 90eeddb1af..c392085d0b 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -22,6 +22,40 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -3249,7 +3249,7 @@ index 90eeddb1a..c392085d0 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 8d277566e..e6a7f8ef3 100644 +index 8d277566e9..e6a7f8ef37 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -19,9 +19,27 @@ public class EntityPig extends EntityAnimal { @@ -3320,7 +3320,7 @@ index 8d277566e..e6a7f8ef3 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 9dd028b55..fb9ef88ea 100644 +index 9dd028b558..fb9ef88ea3 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -17,6 +17,23 @@ public class EntityPigZombie extends EntityZombie { @@ -3348,7 +3348,7 @@ index 9dd028b55..fb9ef88ea 100644 public void setLastDamager(@Nullable EntityLiving entityliving) { super.setLastDamager(entityliving); diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java -index 0357c9da9..98a657cec 100644 +index 0357c9da93..98a657cece 100644 --- a/src/main/java/net/minecraft/server/EntityPillager.java +++ b/src/main/java/net/minecraft/server/EntityPillager.java @@ -13,15 +13,34 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow, @@ -3387,10 +3387,10 @@ index 0357c9da9..98a657cec 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index edccd632b..3edba1e5a 100644 +index 31e51fcec3..363c3298de 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1292,6 +1292,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1293,6 +1293,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void a(float f, float f1, boolean flag, boolean flag1) { @@ -3398,7 +3398,7 @@ index edccd632b..3edba1e5a 100644 if (this.isPassenger()) { if (f >= -1.0F && f <= 1.0F) { this.aZ = f; -@@ -1304,7 +1305,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1305,7 +1306,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.jumping = flag; this.setSneaking(flag1); } @@ -3407,7 +3407,7 @@ index edccd632b..3edba1e5a 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index f8e29a02d..0a3906bde 100644 +index f8e29a02d3..0a3906bde0 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -17,6 +17,23 @@ public class EntityPolarBear extends EntityAnimal { @@ -3499,7 +3499,7 @@ index f8e29a02d..0a3906bde 100644 public d() { diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java -index 98af9a223..d0e3e251e 100644 +index 98af9a2235..d0e3e251e1 100644 --- a/src/main/java/net/minecraft/server/EntityPufferFish.java +++ b/src/main/java/net/minecraft/server/EntityPufferFish.java @@ -17,6 +17,23 @@ public class EntityPufferFish extends EntityFish { @@ -3536,7 +3536,7 @@ index 98af9a223..d0e3e251e 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 2ed2d0b6b..9040ab1c5 100644 +index 2ed2d0b6bb..9040ab1c54 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -26,9 +26,27 @@ public class EntityRabbit extends EntityAnimal { @@ -3691,7 +3691,7 @@ index 2ed2d0b6b..9040ab1c5 100644 this.d = flag; } diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java -index fd25ce102..98d182a4c 100644 +index fd25ce1026..98d182a4ce 100644 --- a/src/main/java/net/minecraft/server/EntityRavager.java +++ b/src/main/java/net/minecraft/server/EntityRavager.java @@ -20,14 +20,33 @@ public class EntityRavager extends EntityRaider { @@ -3729,7 +3729,7 @@ index fd25ce102..98d182a4c 100644 this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true)); diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java -index 6be29f307..189515b0f 100644 +index 6be29f3078..189515b0ff 100644 --- a/src/main/java/net/minecraft/server/EntitySalmon.java +++ b/src/main/java/net/minecraft/server/EntitySalmon.java @@ -6,6 +6,23 @@ public class EntitySalmon extends EntityFishSchool { @@ -3757,7 +3757,7 @@ index 6be29f307..189515b0f 100644 public int es() { return 5; diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index d5ffdc110..d4f2642d3 100644 +index d5ffdc110d..d4f2642d3d 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -55,10 +55,28 @@ public class EntitySheep extends EntityAnimal { @@ -3790,7 +3790,7 @@ index d5ffdc110..d4f2642d3 100644 this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D)); this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false)); diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java -index 0d2ceff6f..46379588c 100644 +index 0d2ceff6f2..46379588c1 100644 --- a/src/main/java/net/minecraft/server/EntityShulker.java +++ b/src/main/java/net/minecraft/server/EntityShulker.java @@ -32,6 +32,23 @@ public class EntityShulker extends EntityGolem implements IMonster { @@ -3840,7 +3840,7 @@ index 0d2ceff6f..46379588c 100644 @Override public boolean a() { diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 08c2a22f7..dff20567b 100644 +index 08c2a22f7a..dff20567b3 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -11,13 +11,32 @@ public class EntitySilverfish extends EntityMonster { @@ -3885,7 +3885,7 @@ index 08c2a22f7..dff20567b 100644 public void g() { diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java -index 0e78d5c62..8e6efeb7b 100644 +index 0e78d5c62c..8e6efeb7b7 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -6,6 +6,23 @@ public class EntitySkeleton extends EntitySkeletonAbstract { @@ -3913,7 +3913,7 @@ index 0e78d5c62..8e6efeb7b 100644 protected SoundEffect getSoundAmbient() { return SoundEffects.ENTITY_SKELETON_AMBIENT; diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index 3c95c0428..8bc4e8515 100644 +index 3c95c0428b..8bc4e85156 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -3932,7 +3932,7 @@ index 3c95c0428..8bc4e8515 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java -index 2eb53864f..a930fb840 100644 +index 2eb53864f2..a930fb8401 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java @@ -8,6 +8,23 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract { @@ -3960,7 +3960,7 @@ index 2eb53864f..a930fb840 100644 return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition)); } diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java -index 98e042424..8aa0a6699 100644 +index 98e042424c..8aa0a6699f 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java @@ -9,6 +9,23 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract { @@ -3988,7 +3988,7 @@ index 98e042424..8aa0a6699 100644 protected SoundEffect getSoundAmbient() { return SoundEffects.ENTITY_WITHER_SKELETON_AMBIENT; diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 2efc18df9..1469e3b23 100644 +index 2efc18df94..1469e3b23c 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -32,12 +32,31 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -4065,7 +4065,7 @@ index 2efc18df9..1469e3b23 100644 } else { this.h = ControllerMove.Operation.WAIT; diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 07ca1a498..941873513 100644 +index 07ca1a4987..941873513f 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -14,12 +14,31 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { @@ -4127,7 +4127,7 @@ index 07ca1a498..941873513 100644 } diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java -index d02db5659..d3708a7b0 100644 +index d02db56595..d3708a7b0e 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -11,14 +11,33 @@ public class EntitySpider extends EntityMonster { @@ -4165,7 +4165,7 @@ index d02db5659..d3708a7b0 100644 this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class)); this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class)); diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 92efe4e7f..b967135ac 100644 +index 92efe4e7f5..b967135ac3 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -25,10 +25,28 @@ public class EntitySquid extends EntityWaterAnimal { @@ -4274,7 +4274,7 @@ index 92efe4e7f..b967135ac 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java -index 9b2eea71c..d55c6cb33 100644 +index 9b2eea71cc..d55c6cb339 100644 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java @@ -135,6 +135,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal { @@ -4286,7 +4286,7 @@ index 9b2eea71c..d55c6cb33 100644 return entityliving == this.getOwner(); } diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java -index ef8f373be..992978463 100644 +index ef8f373bea..992978463d 100644 --- a/src/main/java/net/minecraft/server/EntityTropicalFish.java +++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java @@ -19,6 +19,23 @@ public class EntityTropicalFish extends EntityFishSchool { @@ -4314,7 +4314,7 @@ index ef8f373be..992978463 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index b24a5100b..469549206 100644 +index b24a5100b4..4695492068 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,6 +27,23 @@ public class EntityTurtle extends EntityAnimal { @@ -4462,7 +4462,7 @@ index b24a5100b..469549206 100644 if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) { double d0 = this.b - this.i.locX(); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 0f04bcc8b..5a7494947 100644 +index 0f04bcc8b7..5a7494947c 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -259,6 +259,12 @@ public class EntityTypes { @@ -4479,7 +4479,7 @@ index 0f04bcc8b..5a7494947 100644 if (this.bg == null) { this.bg = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this)); diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index cf274666c..d919f44ab 100644 +index cf274666c7..d919f44ab8 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -19,6 +19,50 @@ public class EntityVex extends EntityMonster { @@ -4593,7 +4593,7 @@ index cf274666c..d919f44ab 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/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 6e0020ae0..3eaac031f 100644 +index 6e0020ae0b..3eaac031fb 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -68,6 +68,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -4626,7 +4626,7 @@ index 6e0020ae0..3eaac031f 100644 public BehaviorController getBehaviorController() { return (BehaviorController) super.getBehaviorController(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 2ad8dba5c..4e9c5e84a 100644 +index 2ad8dba5c0..4e9c5e84a9 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -20,6 +20,23 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -4662,7 +4662,7 @@ index 2ad8dba5c..4e9c5e84a 100644 this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityZombie.class, 8.0F, 0.5D, 0.5D)); this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityEvoker.class, 12.0F, 0.5D, 0.5D)); diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index c974c02e9..6ba920134 100644 +index c974c02e92..6ba920134a 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -17,14 +17,33 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -4700,7 +4700,7 @@ index c974c02e9..6ba920134 100644 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true)); diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 1432d3f6b..447387bd7 100644 +index 1432d3f6bf..447387bd78 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -24,6 +24,23 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -4743,7 +4743,7 @@ index 1432d3f6b..447387bd7 100644 this.targetSelector.a(2, this.bz); this.targetSelector.a(3, this.bA); diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 8977c3516..ad97fe7ea 100644 +index 8977c3516b..ad97fe7eaa 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -18,7 +18,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -4876,7 +4876,7 @@ index 8977c3516..ad97fe7ea 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index eec1e26b6..47f0b2df6 100644 +index eec1e26b6e..47f0b2df6c 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -30,10 +30,28 @@ public class EntityWolf extends EntityTameableAnimal { @@ -5050,7 +5050,7 @@ index eec1e26b6..47f0b2df6 100644 private final EntityWolf j; diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 07ebc1d81..8d1f04415 100644 +index 07ebc1d816..8d1f04415e 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -44,11 +44,30 @@ public class EntityZombie extends EntityMonster { @@ -5085,7 +5085,7 @@ index 07ebc1d81..8d1f04415 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index da8446d05..db252ba4e 100644 +index da8446d05d..db252ba4e0 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie { @@ -5113,7 +5113,7 @@ index da8446d05..db252ba4e 100644 return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition)); } diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 8082fa617..ebbfcb75a 100644 +index 8082fa617a..ebbfcb75a4 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -25,6 +25,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -5141,7 +5141,7 @@ index 8082fa617..ebbfcb75a 100644 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/minecraft/server/FoodInfo.java b/src/main/java/net/minecraft/server/FoodInfo.java -index b35fe21a6..5b0f35c73 100644 +index b35fe21a6d..5b0f35c730 100644 --- a/src/main/java/net/minecraft/server/FoodInfo.java +++ b/src/main/java/net/minecraft/server/FoodInfo.java @@ -30,6 +30,7 @@ public class FoodInfo { @@ -5153,7 +5153,7 @@ index b35fe21a6..5b0f35c73 100644 return this.c; } diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java -index da49f6e5a..7b5d60264 100644 +index da49f6e5ae..7b5d602649 100644 --- a/src/main/java/net/minecraft/server/ItemDye.java +++ b/src/main/java/net/minecraft/server/ItemDye.java @@ -42,6 +42,7 @@ public class ItemDye extends Item { @@ -5165,7 +5165,7 @@ index da49f6e5a..7b5d60264 100644 return this.b; } diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java -index c4aa38ddf..3d52a396e 100644 +index c4aa38ddf1..3d52a396e6 100644 --- a/src/main/java/net/minecraft/server/MathHelper.java +++ b/src/main/java/net/minecraft/server/MathHelper.java @@ -263,6 +263,7 @@ public class MathHelper { @@ -5185,7 +5185,7 @@ index c4aa38ddf..3d52a396e 100644 return f1 + f * (f2 - f1); } diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index 134f7d001..d65979673 100644 +index 134f7d0013..d659796737 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -28,6 +28,7 @@ public abstract class PathfinderGoal { @@ -5197,7 +5197,7 @@ index 134f7d001..d65979673 100644 // Paper start - remove streams from pathfindergoalselector this.goalTypes.clear(); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java -index e07c7674a..3c077b687 100644 +index e07c7674a5..3c077b6870 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java @@ -4,8 +4,8 @@ import java.util.EnumSet; @@ -5220,7 +5220,7 @@ index e07c7674a..3c077b687 100644 this.a.a(-1); } else if (this.a.h((Entity) this.b) > 49.0D) { diff --git a/src/main/java/net/minecraft/server/ProjectileHelper.java b/src/main/java/net/minecraft/server/ProjectileHelper.java -index 1b796ba5b..7dbe3500e 100644 +index 1b796ba5b3..7dbe3500e9 100644 --- a/src/main/java/net/minecraft/server/ProjectileHelper.java +++ b/src/main/java/net/minecraft/server/ProjectileHelper.java @@ -15,6 +15,7 @@ public final class ProjectileHelper { @@ -5232,7 +5232,7 @@ index 1b796ba5b..7dbe3500e 100644 return a(entity, flag, false, (Entity) null, raytrace_blockcollisionoption, false, predicate, axisalignedbb); } diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java -index 0c7f094e5..62a081006 100644 +index 0c7f094e54..62a0810062 100644 --- a/src/main/java/net/minecraft/server/Vec3D.java +++ b/src/main/java/net/minecraft/server/Vec3D.java @@ -27,6 +27,7 @@ public class Vec3D implements IPosition { @@ -5260,10 +5260,10 @@ index 0c7f094e5..62a081006 100644 return new Vec3D(this.x * d0, this.y * d1, this.z * d2); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 67e46376a..d1e316cc4 100644 +index d468a8076a..ba08855b1c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -975,6 +975,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -977,6 +977,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } } @@ -5271,7 +5271,7 @@ index 67e46376a..d1e316cc4 100644 public boolean a(AxisAlignedBB axisalignedbb, Material material) { int i = MathHelper.floor(axisalignedbb.minX); int j = MathHelper.f(axisalignedbb.maxX); -@@ -1610,4 +1611,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1612,4 +1613,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @Override public BiomeManager d() { return this.biomeManager; } @@ -5283,7 +5283,7 @@ index 67e46376a..d1e316cc4 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index eda37fa43..69f99a993 100644 +index eda37fa43f..69f99a993d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -64,4 +64,603 @@ public class PurpurWorldConfig { @@ -5892,7 +5892,7 @@ index eda37fa43..69f99a993 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..828e1b873 +index 0000000000..828e1b8730 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java @@ -0,0 +1,75 @@ @@ -5973,7 +5973,7 @@ index 000000000..828e1b873 +} 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..0a5d6d46c +index 0000000000..0a5d6d46c2 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java @@ -0,0 +1,86 @@ @@ -6065,7 +6065,7 @@ index 000000000..0a5d6d46c +} 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..349125070 +index 0000000000..3491250704 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java @@ -0,0 +1,53 @@ @@ -6124,7 +6124,7 @@ index 000000000..349125070 +} 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..f75375936 +index 0000000000..f753759361 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java @@ -0,0 +1,61 @@ @@ -6191,7 +6191,7 @@ index 000000000..f75375936 +} 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..e75e58067 +index 0000000000..e75e580670 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java @@ -0,0 +1,43 @@ @@ -6240,7 +6240,7 @@ index 000000000..e75e58067 +} diff --git a/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java new file mode 100644 -index 000000000..7189cc569 +index 0000000000..7189cc569f --- /dev/null +++ b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java @@ -0,0 +1,119 @@ @@ -6365,7 +6365,7 @@ index 000000000..7189cc569 +} diff --git a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java new file mode 100644 -index 000000000..f9e680efd +index 0000000000..f9e680efd2 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java @@ -0,0 +1,126 @@ @@ -6497,7 +6497,7 @@ index 000000000..f9e680efd +} diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java new file mode 100644 -index 000000000..6e50344c0 +index 0000000000..6e50344c07 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java @@ -0,0 +1,21 @@ @@ -6523,7 +6523,7 @@ index 000000000..6e50344c0 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index dfa15372b..350aa6754 100644 +index dfa15372b8..350aa67549 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1057,4 +1057,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -6559,7 +6559,7 @@ index dfa15372b..350aa6754 100644 + // Purpur end } diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang -index 0967ef424..7125c0477 100644 +index 0967ef424b..7125c0477e 100644 --- a/src/main/resources/purpur.lang +++ b/src/main/resources/purpur.lang @@ -1 +1,3 @@ @@ -6568,5 +6568,5 @@ index 0967ef424..7125c0477 100644 + "cannot.ride.mob": "You cannot mount that mob" +} -- -2.25.0.windows.1 +2.24.0 diff --git a/patches/server/0033-Signs-allow-color-codes.patch b/patches/server/0033-Signs-allow-color-codes.patch index f6fa43177..6b49f004c 100644 --- a/patches/server/0033-Signs-allow-color-codes.patch +++ b/patches/server/0033-Signs-allow-color-codes.patch @@ -1,4 +1,4 @@ -From ed2e473ff72e59a43f39ac0dcfbefcfce11e5827 Mon Sep 17 00:00:00 2001 +From eeec38fa2de8b3b9d2c0ac2e87327f92d83ba207 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Signs allow color codes @@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes 4 files changed, 25 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b99ae9a7b8..24460ab531 100644 +index 363c3298de..a0990bcf72 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1132,6 +1132,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1133,6 +1133,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void openSign(TileEntitySign tileentitysign) { tileentitysign.a((EntityHuman) this); diff --git a/patches/server/0039-Implement-AFK-API.patch b/patches/server/0039-Implement-AFK-API.patch index cc0b2ea73..6600adaed 100644 --- a/patches/server/0039-Implement-AFK-API.patch +++ b/patches/server/0039-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From 7e6b7af3b6081ab19c08cb19001e14be79870ae6 Mon Sep 17 00:00:00 2001 +From eaf0f8b22feee7eba44b04113dbcd6e8a30ce6ca Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] Implement AFK API @@ -18,7 +18,7 @@ Subject: [PATCH] Implement AFK API 11 files changed, 111 insertions(+), 25 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3bc4327a1..8a2fcb37f 100644 +index 3bc4327a10..8a2fcb37f9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1420,6 +1420,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -30,7 +30,7 @@ index 3bc4327a1..8a2fcb37f 100644 double d3 = this.locX() - d0; double d4 = this.locY() - d1; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index f372c13d8..d69854b5c 100644 +index 4cf420de0b..1ffe38e151 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -50,10 +50,10 @@ index f372c13d8..d69854b5c 100644 super(EntityTypes.PLAYER, world); this.bV = ItemStack.a; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b2bf1be75..f98780d0e 100644 +index a0990bcf72..c1d264fd05 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1624,8 +1624,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1626,8 +1626,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void resetIdleTimer() { this.cj = SystemUtils.getMonotonicMillis(); @@ -106,7 +106,7 @@ index b2bf1be75..f98780d0e 100644 return this.serverStatisticManager; } diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 899619009..d9f246b87 100644 +index 8996190090..d9f246b874 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -125,28 +125,18 @@ public interface IEntityAccess { @@ -151,7 +151,7 @@ index 899619009..d9f246b87 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index e1fdee279..4665671ef 100644 +index e1fdee2794..4665671ef6 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -171,7 +171,7 @@ index e1fdee279..4665671ef 100644 public static Predicate a(double d0, double d1, double d2, double d3) { double d4 = d3 * d3; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 895e34ed3..f92516069 100644 +index 895e34ed34..f92516069a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -223,6 +223,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -206,7 +206,7 @@ index 895e34ed3..f92516069 100644 if (from.getX() != Double.MAX_VALUE) { Location oldTo = to.clone(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e98747903..0e30dcb87 100644 +index e98747903c..0e30dcb87b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -393,7 +393,7 @@ public class WorldServer extends World { @@ -228,7 +228,7 @@ index e98747903..0e30dcb87 100644 } else if (entityplayer.isSleeping()) { ++j; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c6bf9395c..76f8c8fed 100644 +index c6bf9395c1..76f8c8fed1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -138,6 +138,17 @@ public class PurpurWorldConfig { @@ -250,10 +250,10 @@ index c6bf9395c..76f8c8fed 100644 public boolean batRidableInWater = false; public boolean batRequireShiftToMount = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 33cac5fcb..aa6f67cad 100644 +index b76379a17c..b7571d0866 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2057,4 +2057,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2079,4 +2079,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return spigot; } // Spigot end @@ -276,7 +276,7 @@ index 33cac5fcb..aa6f67cad 100644 + // Purpur end } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 795817177..17c4d7ec9 100644 +index 795817177a..17c4d7ec9b 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -146,6 +146,7 @@ public class ActivationRange @@ -288,7 +288,7 @@ index 795817177..17c4d7ec9 100644 ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange ); ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange ); diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang -index 7125c0477..e925e1374 100644 +index 7125c0477e..e925e1374d 100644 --- a/src/main/resources/purpur.lang +++ b/src/main/resources/purpur.lang @@ -1,3 +1,5 @@ @@ -299,5 +299,5 @@ index 7125c0477..e925e1374 100644 + "idle.timeout.broadcast.back": "§e§o%s is no longer AFK" } -- -2.25.0.windows.1 +2.24.0 diff --git a/patches/server/0044-Make-the-GUI-better.patch b/patches/server/0044-Make-the-GUI-better.patch index a2cac4c32..7e6c05576 100644 --- a/patches/server/0044-Make-the-GUI-better.patch +++ b/patches/server/0044-Make-the-GUI-better.patch @@ -1,4 +1,4 @@ -From fdc280962c3c49742d6ae7a72fb8b93f39a54ab8 Mon Sep 17 00:00:00 2001 +From 9a29dc58c1f787698d5f9d6036003100854fe061 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 16 Jan 2020 14:59:16 -0600 Subject: [PATCH] Make the GUI better @@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index e614570d3..bd9c123d5 100644 +index 018def64aa..fe474e4eba 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository; @@ -88,10 +88,10 @@ index e614570d3..bd9c123d5 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ad744ff63..87fb666a6 100644 +index 6c305ed535..525f2ae98e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1322,6 +1322,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant -- -2.25.0.windows.1 +2.24.0 diff --git a/patches/server/0045-Players-should-not-cram-to-death.patch b/patches/server/0045-Players-should-not-cram-to-death.patch index 032ec0b62..3b8d82ead 100644 --- a/patches/server/0045-Players-should-not-cram-to-death.patch +++ b/patches/server/0045-Players-should-not-cram-to-death.patch @@ -1,4 +1,4 @@ -From dc9f0ba242e502afa865cf21bb60515bb5b9e32a Mon Sep 17 00:00:00 2001 +From b99562a41571949aab6301245c8bab7f94ec3f97 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:01:46 -0500 Subject: [PATCH] Players should not cram to death @@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d94ca2acf0..3a4c88bd8a 100644 +index c1d264fd05..38555711c4 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1106,7 +1106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1107,7 +1107,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public boolean isInvulnerable(DamageSource damagesource) { diff --git a/patches/server/0049-Implement-lagging-threshold.patch b/patches/server/0049-Implement-lagging-threshold.patch index 9170f3a80..316ce4815 100644 --- a/patches/server/0049-Implement-lagging-threshold.patch +++ b/patches/server/0049-Implement-lagging-threshold.patch @@ -1,4 +1,4 @@ -From 1077bb31b20403c89c96f5d76feedc4e5f52a926 Mon Sep 17 00:00:00 2001 +From 8280d55e029417caa9b62ea83b5b0c4cdcd0c97b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:16 -0500 Subject: [PATCH] Implement lagging threshold @@ -10,10 +10,10 @@ Subject: [PATCH] Implement lagging threshold 3 files changed, 14 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 36dbef247d..3b1ad9d4f1 100644 +index 525f2ae98e..38b0fa8e00 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -183,6 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 28 Jul 2019 01:27:37 -0500 Subject: [PATCH] Add 5 second tps average in /tps @@ -10,10 +10,10 @@ Subject: [PATCH] Add 5 second tps average in /tps 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3b1ad9d4f1..69970e0ab9 100644 +index 38b0fa8e00..1f1d2745d7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -182,7 +182,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 19 Oct 2019 01:42:50 -0500 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases @@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d1e316cc4..a917c8ee1 100644 +index ba08855b1c..f7f584f981 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1417,8 +1417,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1419,8 +1419,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return blockposition; } @@ -25,7 +25,7 @@ index d1e316cc4..a917c8ee1 100644 public boolean a(EntityHuman entityhuman, BlockPosition blockposition) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0f5bd0a17..b9b23c980 100644 +index 0f5bd0a17a..b9b23c9803 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -383,12 +383,16 @@ public class CraftWorld implements World { @@ -50,5 +50,5 @@ index 0f5bd0a17..b9b23c980 100644 return true; } catch (Exception e) { -- -2.25.0.windows.1 +2.24.0 diff --git a/patches/server/0089-UPnP-Port-Forwarding-Service.patch b/patches/server/0089-UPnP-Port-Forwarding-Service.patch index ae6faa4e0..eed6eab59 100644 --- a/patches/server/0089-UPnP-Port-Forwarding-Service.patch +++ b/patches/server/0089-UPnP-Port-Forwarding-Service.patch @@ -1,4 +1,4 @@ -From 2a12603d40aef4ce8c5de8d7603ffbcbd84b292f Mon Sep 17 00:00:00 2001 +From 8bee092c8f217306aa04de3bab74a97f77b96fdf Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service @@ -6,11 +6,11 @@ Subject: [PATCH] UPnP Port Forwarding Service --- pom.xml | 10 ++++ .../net/minecraft/server/DedicatedServer.java | 25 ++++++++++ - .../net/minecraft/server/MinecraftServer.java | 12 +++++ + .../net/minecraft/server/MinecraftServer.java | 10 ++++ .../java/net/pl3x/purpur/PurpurConfig.java | 5 ++ .../net/pl3x/purpur/gui/info/JInfoPanel.java | 3 ++ .../pl3x/purpur/gui/info/UPnPComponent.java | 47 +++++++++++++++++++ - 6 files changed, 102 insertions(+) + 6 files changed, 100 insertions(+) create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java diff --git a/pom.xml b/pom.xml @@ -42,7 +42,7 @@ index a7ee9396a0..93fba088f4 100644 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index bd9c123d56..7e8286b573 100644 +index fe474e4eba..18fdaf53ef 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -78,10 +78,10 @@ index bd9c123d56..7e8286b573 100644 // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up server.loadPlugins(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 69970e0ab9..fab3e3d784 100644 +index 1f1d2745d7..fc255ddfd1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -186,6 +186,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 21 Mar 2020 11:47:39 -0500 Subject: [PATCH] Configurable server mod name @@ -9,10 +9,10 @@ Subject: [PATCH] Configurable server mod name 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f83e6de09..dd2620d31 100644 +index fc255ddfd1..6f14ed2726 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1535,7 +1535,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 26 Mar 2020 19:06:22 -0500 Subject: [PATCH] Configurable TPS Catchup @@ -9,10 +9,10 @@ Subject: [PATCH] Configurable TPS Catchup 2 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e3c326c340..cebb45ec76 100644 +index 6f14ed2726..3c8acd884a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -961,6 +961,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 2 Apr 2020 00:28:06 -0500 Subject: [PATCH] Optimize Chunk Ticks @@ -10,10 +10,10 @@ Subject: [PATCH] Optimize Chunk Ticks 3 files changed, 51 insertions(+), 63 deletions(-) diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index f741a034e8..d5b4861c45 100644 +index ba6bdc40a7..e490423d8d 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -646,11 +646,12 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -656,11 +656,12 @@ public class ChunkProviderServer extends IChunkProvider { int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED); BlockPosition blockposition = this.world.getSpawn(); // CraftBukkit start - Other mob type spawn tick rate @@ -31,7 +31,7 @@ index f741a034e8..d5b4861c45 100644 // CraftBukkit end this.world.getMethodProfiler().enter("naturalSpawnCount"); -@@ -676,15 +677,17 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -686,15 +687,17 @@ public class ChunkProviderServer extends IChunkProvider { this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings this.world.getMethodProfiler().exit(); @@ -58,7 +58,7 @@ index f741a034e8..d5b4861c45 100644 final int[] chunksTicked = {0}; this.playerChunkMap.forEachVisibleChunk((playerchunk) -> { // Paper - safe iterator incase chunk loads, also no wrapping Optional optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); -@@ -704,40 +707,11 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -714,40 +717,11 @@ public class ChunkProviderServer extends IChunkProvider { if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot this.world.getMethodProfiler().enter("spawner"); this.world.timings.mobSpawn.startTiming(); // Spigot diff --git a/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch index 866dc2520..d47bbfed2 100644 --- a/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch +++ b/patches/server/0120-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch @@ -1,4 +1,4 @@ -From fcf79cdd6ddb8adcb2a81596411637ce49d2b740 Mon Sep 17 00:00:00 2001 +From eee0baf2a50d6d122b8a33bc530da14dca1b6b01 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 3 Apr 2020 02:21:13 -0700 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server @@ -12,10 +12,10 @@ chunks. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a712ae3c4..8f78fe511 100644 +index 3c8acd884a..b879d5f87a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1070,7 +1070,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] YAPFA - Disable mojang profiler @@ -13,7 +13,7 @@ Subject: [PATCH] YAPFA - Disable mojang profiler create mode 100644 src/main/java/net/pl3x/purpur/GameProfilerNoop.java diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java -index f0d72ea39..e38a68406 100644 +index f0d72ea39d..e38a684060 100644 --- a/src/main/java/net/minecraft/server/CommandDebug.java +++ b/src/main/java/net/minecraft/server/CommandDebug.java @@ -22,6 +22,7 @@ public class CommandDebug { @@ -43,7 +43,7 @@ index f0d72ea39..e38a68406 100644 throw CommandDebug.b.create(); } else { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8f78fe511..93ecf378b 100644 +index b879d5f87a..2e2d298b7d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant