Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
86daffa2 Fix AssertionError when player hand set to empty type
This commit is contained in:
William Blake Galbreath
2019-12-09 19:28:05 -06:00
parent 8cb622fe75
commit fbc3f0d6bf
10 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 3032599d38...86daffa21c

2
current-paper
View File

@@ -1 +1 @@
1.14.4--9734925f9661a7e59a6223188ebe761f54ef1238
1.14.4--a4717835bfbca341833599834ed588ff48ff07cc

14
patches/server/0004-cows-to-mooshroom-when-fed-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 2fd28ca4cf131345d155c77e0282089205b553ab Mon Sep 17 00:00:00 2001
From 365204adec74f584e4009dbe535d916eb01cca2e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -11,7 +11,7 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
4 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e8def7f81..40ab9daad 100644
index e8def7f812..40ab9daade 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1049,6 +1049,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index e8def7f81..40ab9daad 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 2c8bbf20a..2446e61c2 100644
index 2c8bbf20ae..2446e61c2b 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -124,10 +124,10 @@ index 2c8bbf20a..2446e61c2 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 f675ad2f5..0abca1a5b 100644
index addbafe66a..f61784fab2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2746,8 +2746,14 @@ public abstract class EntityLiving extends Entity {
@@ -2747,8 +2747,14 @@ public abstract class EntityLiving extends Entity {
this.aM = f;
}
@@ -145,7 +145,7 @@ index f675ad2f5..0abca1a5b 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6f378b5f6..26e95035b 100644
index 6f378b5f69..26e95035b2 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 {
@@ -159,5 +159,5 @@ index 6f378b5f6..26e95035b 100644
+ }
}
--
2.23.0.rc1
2.24.0.rc1

168
patches/server/0010-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 0cee0c4b5ebb3c7301a90f9888de6d2750cbbac5 Mon Sep 17 00:00:00 2001
From cd7a9a5456600a746914ef7d5c717fac8a84cfb7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -92,7 +92,7 @@ Subject: [PATCH] Integrate ridables
create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.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 @@
@@ -113,7 +113,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 dd787b7b6..27ae09757 100644
index dd787b7b65..27ae097578 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 dd787b7b6..27ae09757 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 {
@@ -208,7 +208,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 72474211b..8a8acf14a 100644
index 72474211bc..8a8acf14ae 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -14,6 +14,10 @@ public class EntityBat extends EntityAmbient {
@@ -252,7 +252,7 @@ index 72474211b..8a8acf14a 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..8b8423c6b 100644
index 89f1bfa41d..8b8423c6b3 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 {
@@ -297,7 +297,7 @@ index 89f1bfa41..8b8423c6b 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 f4660233e..d526fc6f5 100644
index f4660233e8..d526fc6f50 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 {
@@ -380,7 +380,7 @@ index f4660233e..d526fc6f5 100644
private final EntityCat a;
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 {
@@ -392,7 +392,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..92aa9f229 100644
index f1dfdd4ff8..92aa9f2295 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 {
@@ -421,7 +421,7 @@ index f1dfdd4ff..92aa9f229 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 {
@@ -433,7 +433,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 2446e61c2..5c8fef33b 100644
index 2446e61c2b..5c8fef33b1 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -9,11 +9,13 @@ public class EntityCow extends EntityAnimal {
@@ -451,7 +451,7 @@ index 2446e61c2..5c8fef33b 100644
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
if (net.pl3x.purpur.PurpurConfig.feedMushroomsToCows > 0) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem(), Blocks.BROWN_MUSHROOM.getItem()), false)); else // Purpur
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index bcb727630..038ff1d93 100644
index bcb7276308..038ff1d93c 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -21,11 +21,13 @@ public class EntityCreeper extends EntityMonster {
@@ -529,7 +529,7 @@ index bcb727630..038ff1d93 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
index 063fb7053..2dfcea548 100644
index 063fb70534..2dfcea5482 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 {
@@ -590,7 +590,7 @@ index 063fb7053..2dfcea548 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 6f0094e6d..b0ba05aaf 100644
index 6f0094e6dc..b0ba05aaf7 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 {
@@ -629,7 +629,7 @@ index 6f0094e6d..b0ba05aaf 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index c8c74f2b3..6a6367a2e 100644
index c8c74f2b3e..6a6367a2e1 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 {
@@ -641,7 +641,7 @@ index c8c74f2b3..6a6367a2e 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 a94ed1ae0..a438d3041 100644
index a94ed1ae08..a438d30414 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 {
@@ -661,7 +661,7 @@ index a94ed1ae0..a438d3041 100644
this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, 1.0D, false));
this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D, 0.0F));
diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index c2be69fc5..b39c1e95a 100644
index c2be69fc5c..b39c1e95a7 100644
--- a/src/main/java/net/minecraft/server/EntityEndermite.java
+++ b/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -9,17 +9,19 @@ public class EntityEndermite extends EntityMonster {
@@ -686,7 +686,7 @@ index c2be69fc5..b39c1e95a 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index 77139f251..8d923a34c 100644
index 77139f2517..8d923a34c3 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 {
@@ -715,7 +715,7 @@ index 77139f251..8d923a34c 100644
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index 90479feb4..884d14e1c 100644
index 90479feb49..884d14e1c0 100644
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -72,13 +72,10 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -773,7 +773,7 @@ index 90479feb4..884d14e1c 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 ca38ccf76..0a2540ae7 100644
index ca38ccf768..0a2540ae7c 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 {
@@ -923,7 +923,7 @@ index ca38ccf76..0a2540ae7 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
index f25c828df..c5c49b719 100644
index f25c828df9..c5c49b7192 100644
--- a/src/main/java/net/minecraft/server/EntityGhast.java
+++ b/src/main/java/net/minecraft/server/EntityGhast.java
@@ -10,12 +10,14 @@ public class EntityGhast extends EntityFlying implements IMonster {
@@ -960,7 +960,7 @@ index f25c828df..c5c49b719 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 f23d0380f..29e7639ad 100644
index f23d0380ff..29e7639ad6 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 {
@@ -974,7 +974,7 @@ index f23d0380f..29e7639ad 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
index afb982d42..d782fb138 100644
index afb982d428..d782fb138a 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 {
@@ -1048,7 +1048,7 @@ index afb982d42..d782fb138 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 7248d46cf..9bf969d92 100644
index 7248d46cfb..9bf969d92f 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 {
@@ -1060,7 +1060,7 @@ index 7248d46cf..9bf969d92 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 e60eedb54..2177a4370 100644
index e60eedb544..2177a4370e 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
@@ -1075,7 +1075,7 @@ index e60eedb54..2177a4370 100644
this.loadChest();
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index 0aa77914c..61cf6723c 100644
index 0aa77914ca..61cf6723c6 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 {
@@ -1090,7 +1090,7 @@ index 0aa77914c..61cf6723c 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
index 1160929e1..3318e274f 100644
index 1160929e1b..3318e274f8 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 {
@@ -1105,7 +1105,7 @@ index 1160929e1..3318e274f 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index cd73cde8d..8b5ceec8d 100644
index cd73cde8d5..8b5ceec8d8 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -362,9 +362,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1132,7 +1132,7 @@ index cd73cde8d..8b5ceec8d 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 cc37b5ff1..5ed268ea9 100644
index cc37b5ff16..5ed268ea9f 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
@@ -1152,7 +1152,7 @@ index cc37b5ff1..5ed268ea9 100644
this.goalSelector.a(4, new EntityIllagerIllusioner.b());
this.goalSelector.a(5, new EntityIllagerIllusioner.a());
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index d00e99cdb..47090db89 100644
index d00e99cdba..47090db890 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;
@@ -1247,7 +1247,7 @@ index d00e99cdb..47090db89 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..2c34ab337 100644
index 8e463111bb..2c34ab337a 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -8,11 +8,13 @@ public class EntityIronGolem extends EntityGolem {
@@ -1265,7 +1265,7 @@ index 8e463111b..2c34ab337 100644
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D));
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4b59f6081..d71fb40cb 100644
index 06ea1a282f..8f62fd48a1 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 {
@@ -1303,7 +1303,7 @@ index 4b59f6081..d71fb40cb 100644
}
protected void co() {
@@ -2039,7 +2048,7 @@ public abstract class EntityLiving extends Entity {
@@ -2040,7 +2049,7 @@ public abstract class EntityLiving extends Entity {
return 0.42F;
}
@@ -1312,7 +1312,7 @@ index 4b59f6081..d71fb40cb 100644
float f;
if (this.hasEffect(MobEffects.JUMP)) {
@@ -2050,6 +2059,7 @@ public abstract class EntityLiving extends Entity {
@@ -2051,6 +2060,7 @@ public abstract class EntityLiving extends Entity {
Vec3D vec3d = this.getMot();
@@ -1320,7 +1320,7 @@ index 4b59f6081..d71fb40cb 100644
this.setMot(vec3d.x, (double) f, vec3d.z);
if (this.isSprinting()) {
float f1 = this.yaw * 0.017453292F;
@@ -2268,10 +2278,12 @@ public abstract class EntityLiving extends Entity {
@@ -2269,10 +2279,12 @@ public abstract class EntityLiving extends Entity {
return this.onGround ? this.db() * (0.21600002F / (f * f * f)) : this.aO;
}
@@ -1334,7 +1334,7 @@ index 4b59f6081..d71fb40cb 100644
this.bD = f;
}
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index a5dade7d0..72372497d 100644
index a5dade7d05..72372497d9 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -16,6 +16,29 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -1408,7 +1408,7 @@ index a5dade7d0..72372497d 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 b60a167f8..39bf1bf9c 100644
index b60a167f80..39bf1bf9c3 100644
--- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java
+++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
@@ -9,6 +9,7 @@ public class EntityLlamaTrader extends EntityLlama {
@@ -1434,7 +1434,7 @@ index b60a167f8..39bf1bf9c 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 c7c466560..3a79634e4 100644
index c7c466560e..3a79634e44 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 {
@@ -1455,7 +1455,7 @@ index c7c466560..3a79634e4 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 af3b826a4..068e75ce6 100644
index af3b826a4d..068e75ce64 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 {
@@ -1467,7 +1467,7 @@ index af3b826a4..068e75ce6 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index edc5f696c..e7ee45917 100644
index edc5f696c0..e7ee45917c 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 {
@@ -1487,7 +1487,7 @@ index edc5f696c..e7ee45917 100644
this.goalSelector.a(7, new PathfinderGoalLeapAtTarget(this, 0.3F));
this.goalSelector.a(8, new PathfinderGoalOcelotAttack(this));
diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
index 479ef6b92..697b1bccc 100644
index 479ef6b920..697b1bccc0 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 {
@@ -1594,7 +1594,7 @@ index 479ef6b92..697b1bccc 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index a7cdb5e7a..0eeb11055 100644
index a7cdb5e7a2..0eeb110554 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 {
@@ -1665,7 +1665,7 @@ index a7cdb5e7a..0eeb11055 100644
this.goalSelector.a(2, this.goalSit);
this.goalSelector.a(2, new PathfinderGoalFollowOwnerParrot(this, 1.0D, 5.0F, 1.0F));
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 7bc7b3366..69a1c79e7 100644
index 7bc7b33665..69a1c79e74 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 {
@@ -1765,7 +1765,7 @@ index 7bc7b3366..69a1c79e7 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 7136e274a..81ba9f240 100644
index 7136e274af..81ba9f2408 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -17,11 +17,13 @@ public class EntityPig extends EntityAnimal {
@@ -1825,7 +1825,7 @@ index 7136e274a..81ba9f240 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index 4f260f814..5760a1836 100644
index 4f260f8143..5760a18361 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 {
@@ -1846,7 +1846,7 @@ index 4f260f814..5760a1836 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
index 79a330650..33b0f25f6 100644
index 79a330650b..33b0f25f6d 100644
--- a/src/main/java/net/minecraft/server/EntityPillager.java
+++ b/src/main/java/net/minecraft/server/EntityPillager.java
@@ -11,12 +11,14 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow,
@@ -1865,7 +1865,7 @@ index 79a330650..33b0f25f6 100644
this.goalSelector.a(3, new PathfinderGoalCrossbowAttack<>(this, 1.0D, 8.0F));
this.goalSelector.a(8, new PathfinderGoalRandomStroll(this, 0.6D));
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
index b1ee334cf..727f30ede 100644
index b1ee334cf1..727f30edea 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 {
@@ -1936,7 +1936,7 @@ index b1ee334cf..727f30ede 100644
public e() {
diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
index f5d384add..ad1decd47 100644
index f5d384adda..ad1decd472 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 {
@@ -1957,7 +1957,7 @@ index f5d384add..ad1decd47 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index 10fca4977..d48610df3 100644
index 10fca49776..d48610df3a 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 {
@@ -1988,7 +1988,7 @@ index 10fca4977..d48610df3 100644
double d0 = this.moveController.c();
diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
index 971ea097b..0df665f9b 100644
index 971ea097be..0df665f9bd 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 {
@@ -2008,7 +2008,7 @@ index 971ea097b..0df665f9b 100644
this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 0.4D));
this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java
index b600f30eb..8c60e26c7 100644
index b600f30eb1..8c60e26c70 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 {
@@ -2020,7 +2020,7 @@ index b600f30eb..8c60e26c7 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index ec13d4f37..30fa8e5ca 100644
index ec13d4f37d..30fa8e5cab 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;
@@ -2059,7 +2059,7 @@ index ec13d4f37..30fa8e5ca 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 aec2e2456..615285623 100644
index aec2e24565..6152856239 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 {
@@ -2079,7 +2079,7 @@ index aec2e2456..615285623 100644
this.goalSelector.a(4, new EntityShulker.a());
this.goalSelector.a(7, new EntityShulker.e());
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
index eb3c56fef..d689715b3 100644
index eb3c56fefd..d689715b3e 100644
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -9,12 +9,14 @@ public class EntitySilverfish extends EntityMonster {
@@ -2098,7 +2098,7 @@ index eb3c56fef..d689715b3 100644
this.goalSelector.a(4, new PathfinderGoalMeleeAttack(this, 1.0D, false));
this.goalSelector.a(5, new EntitySilverfish.PathfinderGoalSilverfishHideInBlock(this));
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 {
@@ -2110,7 +2110,7 @@ index 0e78d5c62..908e51b63 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
index 8f1b5a550..18a34de63 100644
index 8f1b5a5502..18a34de63d 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
@@ -28,6 +28,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -2122,7 +2122,7 @@ index 8f1b5a550..18a34de63 100644
this.goalSelector.a(3, new PathfinderGoalFleeSun(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalAvoidTarget<>(this, EntityWolf.class, 6.0F, 1.0D, 1.2D));
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
index 2eb53864f..eda880703 100644
index 2eb53864f2..eda880703e 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 {
@@ -2134,7 +2134,7 @@ index 2eb53864f..eda880703 100644
public static boolean b(EntityTypes<EntitySkeletonStray> 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 872f79cc6..ed03d3122 100644
index 872f79cc67..ed03d31221 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 {
@@ -2146,7 +2146,7 @@ index 872f79cc6..ed03d3122 100644
}
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index 253ff9594..af3876a6c 100644
index 253ff9594c..af3876a6c8 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -29,11 +29,13 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -2173,7 +2173,7 @@ index 253ff9594..af3876a6c 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 4e9cc7137..42bb90b9c 100644
index 4e9cc7137d..42bb90b9c5 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -13,10 +13,12 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -2198,7 +2198,7 @@ index 4e9cc7137..42bb90b9c 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..9c210b8b9 100644
index 3929c86f8b..9c210b8b90 100644
--- a/src/main/java/net/minecraft/server/EntitySpider.java
+++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -9,11 +9,13 @@ public class EntitySpider extends EntityMonster {
@@ -2216,7 +2216,7 @@ index 3929c86f8..9c210b8b9 100644
this.goalSelector.a(4, new EntitySpider.PathfinderGoalSpiderMeleeAttack(this));
this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 0.8D));
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index a4d2ff64d..d4e8a0989 100644
index a4d2ff64d8..d4e8a0989b 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -21,14 +21,16 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -2305,7 +2305,7 @@ index a4d2ff64d..d4e8a0989 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
index 2f99caf6f..6b2957cb5 100644
index 2f99caf6fc..6b2957cb56 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 {
@@ -2322,7 +2322,7 @@ index 2f99caf6f..6b2957cb5 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 {
@@ -2334,7 +2334,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 0bd80e562..6bd2aeaad 100644
index 0bd80e5623..6bd2aeaad3 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 {
@@ -2461,7 +2461,7 @@ index 0bd80e562..6bd2aeaad 100644
if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().n()) {
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 f8308c96b..f8600cc07 100644
index f8308c96be..f8600cc07f 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -266,6 +266,10 @@ public class EntityTypes<T extends Entity> {
@@ -2476,7 +2476,7 @@ index f8308c96b..f8600cc07 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 51c05376d..f76a61ac6 100644
index 51c05376da..f76a61ac6d 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 {
@@ -2521,7 +2521,7 @@ index 51c05376d..f76a61ac6 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 ffbd6e926..a2eef22cc 100644
index ffbd6e9269..a2eef22ccd 100644
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -15,12 +15,14 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -2540,7 +2540,7 @@ index ffbd6e926..a2eef22cc 100644
this.goalSelector.a(2, new EntityIllagerAbstract.b(this));
this.goalSelector.a(3, new EntityRaider.a(this, 10.0F));
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 0b849f37c..bee22c4df 100644
index 0b849f37c5..bee22c4df4 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 {
@@ -2562,7 +2562,7 @@ index 0b849f37c..bee22c4df 100644
this.goalSelector.a(2, new PathfinderGoalRandomStrollLand(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 8b3052b11..575f04651 100644
index 8b3052b113..575f046512 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 {
@@ -2584,7 +2584,7 @@ index 8b3052b11..575f04651 100644
this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D));
this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index 02492663a..bec92f199 100644
index 02492663ac..bec92f1998 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 {
@@ -2619,7 +2619,7 @@ index 02492663a..bec92f199 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 99b2e7815..96676a786 100644
index d747d36f84..61c427f18b 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -37,6 +37,7 @@ public class EntityZombie extends EntityMonster {
@@ -2639,7 +2639,7 @@ index 99b2e7815..96676a786 100644
this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
index 4c8b2dd09..2a8167067 100644
index 4c8b2dd094..2a81670672 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 {
@@ -2651,7 +2651,7 @@ index 4c8b2dd09..2a8167067 100644
public static boolean b(EntityTypes<EntityZombieHusk> 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 d2bd3bb31..e67980b69 100644
index d2bd3bb319..e67980b698 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -22,6 +22,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -2672,7 +2672,7 @@ index d2bd3bb31..e67980b69 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 960361ff7..d3409155e 100644
index 960361ff74..d3409155ed 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 {
@@ -2811,7 +2811,7 @@ index 960361ff7..d3409155e 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 @@
@@ -2891,7 +2891,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 @@
@@ -2974,7 +2974,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 @@
@@ -3042,7 +3042,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 @@
@@ -3113,7 +3113,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 @@
@@ -3161,7 +3161,7 @@ index 000000000..74ff48259
+}
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..e3a9fd9d2
index 0000000000..e3a9fd9d21
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
@@ -0,0 +1,20 @@
@@ -3186,7 +3186,7 @@ index 000000000..e3a9fd9d2
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 33f56b85e..ffd137228 100644
index 33f56b85ea..ffd1372284 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -723,5 +723,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -3206,7 +3206,7 @@ index 33f56b85e..ffd137228 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 {
@@ -3227,5 +3227,5 @@ index 56c233872..b19970c88 100644
+ // Purpur end
}
--
2.23.0.rc1
2.24.0.rc1

14
patches/server/0014-Add-regen-effect-to-campfires.patch
View File

@@ -1,4 +1,4 @@
From 32ebf82f0284a63de5bcf419010cb4fd26cd4ba2 Mon Sep 17 00:00:00 2001
From d1441171fe52cc2c70c4b430da37f123705ca7cb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Add regen effect to campfires
@@ -11,10 +11,10 @@ Subject: [PATCH] Add regen effect to campfires
4 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 545283ed7..587fe2b36 100644
index 8f62fd48a1..7ae79f0bd4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2719,10 +2719,19 @@ public abstract class EntityLiving extends Entity {
@@ -2720,10 +2720,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {
@@ -38,7 +38,7 @@ index 545283ed7..587fe2b36 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 998336557..2642e86f7 100644
index 9983365575..2642e86f76 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
@@ -82,7 +82,7 @@ index 998336557..2642e86f7 100644
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
index 2317adde4..f112a848f 100644
index 2317adde44..f112a848f1 100644
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
@@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -151,7 +151,7 @@ index 2317adde4..f112a848f 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 30f11fe26..314fd584b 100644
index 30f11fe261..314fd584b8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -60,4 +60,27 @@ public class PurpurWorldConfig {
@@ -183,5 +183,5 @@ index 30f11fe26..314fd584b 100644
+ }
}
--
2.20.1
2.24.0.rc1

6
patches/server/0020-Allow-color-codes-on-signs.patch
View File

@@ -1,4 +1,4 @@
From 79c73f8dbdd6592ee6e072ac6d0f85243f4cdd5a Mon Sep 17 00:00:00 2001
From 495e5af821f0288659b8814f61ced10d1c7fd210 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Allow color codes on signs
@@ -23,10 +23,10 @@ index c747b5deb3..d5f80be598 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ae17cdf234..afc1a5f858 100644
index c9872cbd0c..03c9fc9180 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2561,6 +2561,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2565,6 +2565,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end

28
patches/server/0041-Ladders-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 48791694b27ee61585777c5ea1ca56edf1a0d01e Mon Sep 17 00:00:00 2001
From 7c1721ffce29e4ae704f090e5f01c993f1117224 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 457d973af..468d6cc3e 100644
index 457d973af8..468d6cc3e1 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1522,6 +1522,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index 457d973af..468d6cc3e 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 3b30e75e3..f7b9c1aa5 100644
index 02595cfccd..8bd864cb39 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -45,7 +45,7 @@ index 3b30e75e3..f7b9c1aa5 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index 8a8acf14a..88b94505c 100644
index 8a8acf14ae..88b94505ca 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -54,7 +54,7 @@ public class EntityBat extends EntityAmbient {
@@ -58,7 +58,7 @@ index 8a8acf14a..88b94505c 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 32b7f7805..b5bcd1f80 100644
index 32b7f78050..b5bcd1f80d 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -71,7 +71,7 @@ index 32b7f7805..b5bcd1f80 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 2177a4370..05a5169c1 100644
index 2177a4370e..05a5169c1d 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -84,10 +84,10 @@ index 2177a4370..05a5169c1 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index eb397b6bc..b4230fcc4 100644
index 6cb7cb44ae..7000275d85 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2613,7 +2613,7 @@ public abstract class EntityLiving extends Entity {
@@ -2614,7 +2614,7 @@ public abstract class EntityLiving extends Entity {
protected void doTick() {}
protected void collideNearby() {
@@ -96,7 +96,7 @@ index eb397b6bc..b4230fcc4 100644
if (!list.isEmpty()) {
int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
@@ -2751,8 +2751,10 @@ public abstract class EntityLiving extends Entity {
@@ -2752,8 +2752,10 @@ public abstract class EntityLiving extends Entity {
}
@Override
@@ -110,7 +110,7 @@ index eb397b6bc..b4230fcc4 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index c5b4057c3..d5a28392a 100644
index c5b4057c33..d5a28392ac 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -82,7 +82,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -123,7 +123,7 @@ index c5b4057c3..d5a28392a 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 0eeb11055..7c2c3119b 100644
index 0eeb110554..7c2c3119bb 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -351,7 +351,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -136,7 +136,7 @@ index 0eeb11055..7c2c3119b 100644
}
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 56739e6ed..0bac6e424 100644
index 56739e6ed5..0bac6e4245 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -33,11 +33,16 @@ public final class IEntitySelector {
@@ -158,7 +158,7 @@ index 56739e6ed..0bac6e424 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).dG())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0cdb4bbaf..b38de26d6 100644
index 1a49dd4d80..f7e1da705d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -146,6 +146,11 @@ public class PurpurConfig {
@@ -174,5 +174,5 @@ index 0cdb4bbaf..b38de26d6 100644
private static void fixItemPositionDesync() {
fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
--
2.23.0.rc1
2.24.0.rc1

20
patches/server/0046-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From a0468b7a01c8907e20df05df3e4fe30039379bd2 Mon Sep 17 00:00:00 2001
From 50ee92ba6f2975ede6a73c18885ae44c44d4227c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 25 Jul 2019 18:07:37 -0500
Subject: [PATCH] Implement elytra settings
@@ -13,10 +13,10 @@ Subject: [PATCH] Implement elytra settings
6 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b4230fcc4..213683674 100644
index 7000275d85..b5f0b01c36 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2592,9 +2592,16 @@ public abstract class EntityLiving extends Entity {
@@ -2593,9 +2593,16 @@ public abstract class EntityLiving extends Entity {
if (itemstack.getItem() == Items.ELYTRA && ItemElytra.e(itemstack)) {
flag = true;
if (!this.world.isClientSide && (this.bp + 1) % 20 == 0) {
@@ -36,7 +36,7 @@ index b4230fcc4..213683674 100644
}
} else {
flag = false;
@@ -3240,6 +3247,7 @@ public abstract class EntityLiving extends Entity {
@@ -3241,6 +3248,7 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -45,7 +45,7 @@ index b4230fcc4..213683674 100644
this.world.broadcastEntityEffect(this, d(enumitemslot));
}
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index 9e86ef4ce..832cea636 100644
index 9e86ef4ce2..832cea636b 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -38,6 +38,14 @@ public class ItemFireworks extends Item {
@@ -64,7 +64,7 @@ index 9e86ef4ce..832cea636 100644
itemstack.subtract(1);
} else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 41e889165..43e89b99b 100644
index 41e8891651..43e89b99b1 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -402,7 +402,7 @@ public final class ItemStack {
@@ -90,7 +90,7 @@ index 41e889165..43e89b99b 100644
if (this.count == 1 && t0 instanceof EntityHuman) {
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this);
diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java
index c40815736..28f9f6e40 100644
index c408157368..28f9f6e405 100644
--- a/src/main/java/net/minecraft/server/ItemTrident.java
+++ b/src/main/java/net/minecraft/server/ItemTrident.java
@@ -93,6 +93,16 @@ public class ItemTrident extends Item {
@@ -111,7 +111,7 @@ index c40815736..28f9f6e40 100644
entityhuman.q(20);
if (entityhuman.onGround) {
diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
index d2eb861af..b89f9fe7b 100644
index d2eb861af2..b89f9fe7b1 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -93,6 +93,7 @@ public class Vec3D implements IPosition {
@@ -123,7 +123,7 @@ index d2eb861af..b89f9fe7b 100644
return this.x * this.x + this.y * this.y + this.z * this.z;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8d01cdc8e..059cf85f4 100644
index 8d01cdc8e3..059cf85f4f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -130,4 +130,17 @@ public class PurpurWorldConfig {
@@ -145,5 +145,5 @@ index 8d01cdc8e..059cf85f4 100644
+ }
}
--
2.23.0.rc1
2.24.0.rc1

6
patches/server/0064-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From c08a0854ea28663d5311401118b0ef20e2f1bb0b Mon Sep 17 00:00:00 2001
From 2338e165900308afbfa6299b3a5077fef2e21d6e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -22,7 +22,7 @@ index 8e93f1540b..470f92c4fb 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6f584d515f..b40bea8e8b 100644
index b066ed57dc..9c3727ecd1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index 6f584d515f..b40bea8e8b 100644
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2652,6 +2668,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2656,6 +2672,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

6
patches/server/0067-Add-entity-jump-API.patch
View File

@@ -1,4 +1,4 @@
From bcf6c9b4668bc6328c419236371755f9302f0a46 Mon Sep 17 00:00:00 2001
From 90e2b818af21de79de11ebcf0020b6c89f9ce293 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 23:34:48 -0500
Subject: [PATCH] Add entity jump API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add entity jump API
2 files changed, 16 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2136836748..b59b1ab19c 100644
index b5f0b01c36..fbe13d9dac 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2556,8 +2556,10 @@ public abstract class EntityLiving extends Entity {
@@ -2557,8 +2557,10 @@ public abstract class EntityLiving extends Entity {
} else if (this.aD()) {
this.c(TagsFluid.LAVA);
} else if ((this.onGround || this.Q > 0.0D && this.Q <= 0.4D) && this.jumpTicks == 0) {