Update Upstream (Pufferfish)

This commit is contained in:
Etil
2022-01-12 13:38:39 +01:00
parent 3087fabe00
commit 91f40e0e2d
12 changed files with 44 additions and 44 deletions

View File

@@ -2,7 +2,7 @@ group=wtf.etil.mirai
version=1.18.1-R0.1-SNAPSHOT
mcVersion=1.18.1
packageVersion=1_18_R1
pufferfishRef=809bd9f1cf87fe9e71a7a3f924398a405e32db04
pufferfishRef=5bf8730d9a8f621a40ab9b0c7a89f868b6161e28
org.gradle.caching=true
org.gradle.caching.debug=false

View File

@@ -262,7 +262,7 @@ index e80176708db486190dd527e3ade5fc690ceb39f7..4fa44b576404438d08085e1d8c82fa96
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index c7229e120d601619d2ea869d7aa506fb3b78cde4..2d2f1e3fe1c9314af18377458af74f8c6afa7603 100644
index 27791d82b3343f14ff99efd4aed2193ea276b852..484cdad55acbaaecd223186750e36b60fe8c4bfb 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -846,7 +846,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -332,10 +332,10 @@ index 5d8e9bdf5538b19681f21949368d862fab8a89ad..97c744508cc535418eba65fa722859c8
public ZeroBitStorage(int size) {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2c988e05299d530d483e21ab452de0a03e5bdcbd..fcbbe52452f3e9ad4dcdbcc5d2dc20fa5d098746 100644
index d4da096f22bd3c118304fb00c7b9763562b9c889..7d7a85508adbbe905a7b95c6b625bfed24ba330d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3022,7 +3022,7 @@ public abstract class LivingEntity extends Entity {
@@ -3021,7 +3021,7 @@ public abstract class LivingEntity extends Entity {
@Nullable
private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
Map<EquipmentSlot, ItemStack> map = null;

View File

@@ -194,10 +194,10 @@ index 03726227fdd60e9cf77213d50184abff438e01ef..8220cb49c2d4d46120615b298ce36d10
public BaseSpawner() {}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 6795132318a4e8b4c7a33b6f4b89a730ea66b97f..b8d83a0d56ce2285ee17c0b0226bd08d4cc304c0 100644
index 97f99a06b8954b08af9f4156abe8abdad359349a..e0e27004d67fd759903645cff8a491e5516aeea8 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -88,7 +88,7 @@ public class Explosion {
@@ -89,7 +89,7 @@ public class Explosion {
}
public Explosion(Level world, @Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, Explosion.BlockInteraction destructionType) {

View File

@@ -33,10 +33,10 @@ index bda7ec47f0a91055a4e86b8968c695a71c2c95aa..980c34a1b816e9c57e31255465626192
this.entitySliceManager = new io.papermc.paper.world.EntitySliceManager((ServerLevel)this); // Paper
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index f144ca888518f1bdb84ee811410937cba994245c..1ea91d49e29fa44296cca2dc97ed89233934ad01 100644
index a7a0b94ed22e6e3b9063a17d086f96140c6e95cf..1ce309610e2b868ed19a7158b02024e16e3bd6b9 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -428,6 +428,7 @@ public class SpigotWorldConfig
@@ -430,6 +430,7 @@ public class SpigotWorldConfig
this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 100 );
}
@@ -44,7 +44,7 @@ index f144ca888518f1bdb84ee811410937cba994245c..1ea91d49e29fa44296cca2dc97ed8923
public int tileMaxTickTime;
public int entityMaxTickTime;
private void maxTickTimes()
@@ -436,6 +437,8 @@ public class SpigotWorldConfig
@@ -438,6 +439,8 @@ public class SpigotWorldConfig
this.entityMaxTickTime = this.getInt("max-tick-time.entity", 50);
this.log("Tile Max Tick Time: " + this.tileMaxTickTime + "ms Entity max Tick Time: " + this.entityMaxTickTime + "ms");
}

View File

@@ -7,10 +7,10 @@ Original code by Starlis, licensed under GNU General Public License v3.0
You can find the original code on https://github.com/starlis/empirecraft
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index b8d83a0d56ce2285ee17c0b0226bd08d4cc304c0..804e335effeb42c6cc39ffbbefe386266c1b3d57 100644
index e0e27004d67fd759903645cff8a491e5516aeea8..354d6aa1fdead781ff7ff4c5e7fa261181ce754d 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -155,6 +155,7 @@ public class Explosion {
@@ -156,6 +156,7 @@ public class Explosion {
int i;
int j;
@@ -18,7 +18,7 @@ index b8d83a0d56ce2285ee17c0b0226bd08d4cc304c0..804e335effeb42c6cc39ffbbefe38626
for (int k = 0; k < 16; ++k) {
for (i = 0; i < 16; ++i) {
for (j = 0; j < 16; ++j) {
@@ -209,6 +210,7 @@ public class Explosion {
@@ -210,6 +211,7 @@ public class Explosion {
}
}
}
@@ -26,7 +26,7 @@ index b8d83a0d56ce2285ee17c0b0226bd08d4cc304c0..804e335effeb42c6cc39ffbbefe38626
this.toBlow.addAll(set);
float f2 = this.radius * 2.0F;
@@ -219,7 +221,7 @@ public class Explosion {
@@ -220,7 +222,7 @@ public class Explosion {
int i1 = Mth.floor(this.y + (double) f2 + 1.0D);
int j1 = Mth.floor(this.z - (double) f2 - 1.0D);
int k1 = Mth.floor(this.z + (double) f2 + 1.0D);
@@ -35,7 +35,7 @@ index b8d83a0d56ce2285ee17c0b0226bd08d4cc304c0..804e335effeb42c6cc39ffbbefe38626
Vec3 vec3d = new Vec3(this.x, this.y, this.z);
for (int l1 = 0; l1 < list.size(); ++l1) {
@@ -279,7 +281,7 @@ public class Explosion {
@@ -300,7 +302,7 @@ public class Explosion {
boolean flag1 = this.blockInteraction != Explosion.BlockInteraction.NONE;
if (particles) {

View File

@@ -7,7 +7,7 @@ Original code by PurpurMC, licensed under MIT
You can find the original code on https://github.com/PurpurMC/Purpur
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d522ba0cbfad653970f238af5011c1acc25f6d07..b4b8d2abe29239968cc623f6438c0156659f14e9 100644
index fbe89224be8cc627b081c1accbbe314a640bd632..f95375ec49ef989f5bca66b05ecccb8c4201d1ba 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -19,10 +19,10 @@ index d522ba0cbfad653970f238af5011c1acc25f6d07..b4b8d2abe29239968cc623f6438c0156
public void absMoveTo(double x, double y, double z) {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fcbbe52452f3e9ad4dcdbcc5d2dc20fa5d098746..e696778b1f2e5f90f39a62259f79d54e704d969a 100644
index 7d7a85508adbbe905a7b95c6b625bfed24ba330d..2da12e588e67c8591028561ccd3e94887fb104eb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2925,7 +2925,7 @@ public abstract class LivingEntity extends Entity {
@@ -2924,7 +2924,7 @@ public abstract class LivingEntity extends Entity {
}
}

View File

@@ -7,10 +7,10 @@ Original code by Cryptite, licensed under MIT
You can find the original code on https://github.com/Cryptite/Slice
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index e696778b1f2e5f90f39a62259f79d54e704d969a..b9cc4aa7cd5694976c43f834bbf60412992c269f 100644
index 2da12e588e67c8591028561ccd3e94887fb104eb..7f8c9538c231a7aca163ecdb3966cd2dc23e2cad 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3042,7 +3042,7 @@ public abstract class LivingEntity extends Entity {
@@ -3041,7 +3041,7 @@ public abstract class LivingEntity extends Entity {
ItemStack itemstack1 = this.getItemBySlot(enumitemslot);

View File

@@ -7,7 +7,7 @@ Original code by PurpurMC, licensed under MIT
You can find the original code on https://github.com/PurpurMC/Purpur
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b9cc4aa7cd5694976c43f834bbf60412992c269f..fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b 100644
index 7f8c9538c231a7aca163ecdb3966cd2dc23e2cad..1f41e0a3d2b4b5bd5f2db217ef24a5711ac8513d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -251,6 +251,7 @@ public abstract class LivingEntity extends Entity {
@@ -29,7 +29,7 @@ index b9cc4aa7cd5694976c43f834bbf60412992c269f..fcf6606d7fde0a9f93a2bd1a8e20f8f6
if (!landedState.isAir()) {
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
@@ -1922,7 +1923,7 @@ public abstract class LivingEntity extends Entity {
@@ -1921,7 +1922,7 @@ public abstract class LivingEntity extends Entity {
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);

View File

@@ -100,7 +100,7 @@ index 40447d00aefb5ffedb8a2ee87155a04088f0649f..31cc0a29e89e79f616b3ee329a552896
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4fac626686ea8bb6c820698f500f20713051c1ef..c62dece6ea8869ce32ec04acc269f98d572d9034 100644
index 8595b31137db798b6ae8969970e607459593d39d..944b4b288fd3f3d3160eeb73ae9060ef9d224b7a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -393,7 +393,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -126,10 +126,10 @@ index 88f10d729aa1e0a01790521821d691a0ecd373a2..df2c8dffd626eab0e03b1b62940a52fa
// Paper end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b..9373e4ce1061d5cb3a2d22272671c668614dd4a8 100644
index 1f41e0a3d2b4b5bd5f2db217ef24a5711ac8513d..fbbd924097c25ccaec00f425ba8c8c84223187a9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1473,7 +1473,7 @@ public abstract class LivingEntity extends Entity {
@@ -1472,7 +1472,7 @@ public abstract class LivingEntity extends Entity {
if (this instanceof ServerPlayer) {
CriteriaTriggers.ENTITY_HURT_PLAYER.trigger((ServerPlayer) this, source, f1, amount, flag);
if (f2 > 0.0F && f2 < 3.4028235E37F) {
@@ -138,7 +138,7 @@ index fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b..9373e4ce1061d5cb3a2d22272671c668
}
}
@@ -1986,9 +1986,9 @@ public abstract class LivingEntity extends Entity {
@@ -1985,9 +1985,9 @@ public abstract class LivingEntity extends Entity {
if (f3 > 0.0F && f3 < 3.4028235E37F) {
if (this instanceof ServerPlayer) {
@@ -150,7 +150,7 @@ index fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b..9373e4ce1061d5cb3a2d22272671c668
}
}
}
@@ -2098,9 +2098,9 @@ public abstract class LivingEntity extends Entity {
@@ -2097,9 +2097,9 @@ public abstract class LivingEntity extends Entity {
float f3 = (float) -event.getDamage(DamageModifier.RESISTANCE);
if (f3 > 0.0F && f3 < 3.4028235E37F) {
if (this instanceof ServerPlayer) {
@@ -162,7 +162,7 @@ index fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b..9373e4ce1061d5cb3a2d22272671c668
}
}
}
@@ -2132,10 +2132,10 @@ public abstract class LivingEntity extends Entity {
@@ -2131,10 +2131,10 @@ public abstract class LivingEntity extends Entity {
float f2 = absorptionModifier;
if (f2 > 0.0F && f2 < 3.4028235E37F && this instanceof net.minecraft.world.entity.player.Player) {
@@ -175,7 +175,7 @@ index fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b..9373e4ce1061d5cb3a2d22272671c668
}
if (f > 0 || !human) {
@@ -2143,7 +2143,7 @@ public abstract class LivingEntity extends Entity {
@@ -2142,7 +2142,7 @@ public abstract class LivingEntity extends Entity {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
((net.minecraft.world.entity.player.Player) this).causeFoodExhaustion(damagesource.getFoodExhaustion(), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.DAMAGED); // CraftBukkit - EntityExhaustionEvent
if (f < 3.4028235E37F) {
@@ -184,7 +184,7 @@ index fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b..9373e4ce1061d5cb3a2d22272671c668
}
}
// CraftBukkit end
@@ -2165,7 +2165,7 @@ public abstract class LivingEntity extends Entity {
@@ -2164,7 +2164,7 @@ public abstract class LivingEntity extends Entity {
CriteriaTriggers.ENTITY_HURT_PLAYER.trigger((ServerPlayer) this, damagesource, f, originalDamage, true);
f2 = (float) -event.getDamage(DamageModifier.BLOCKING);
if (f2 > 0.0F && f2 < 3.4028235E37F) {
@@ -194,10 +194,10 @@ index fcf6606d7fde0a9f93a2bd1a8e20f8f6ddb9374b..9373e4ce1061d5cb3a2d22272671c668
}
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index b871d89d16e0bb08cc8ce87e74ced974734be418..87689c468b8e4d2498584fca90738f82fa46d78a 100644
index aaf3a82c57b92b53d6bd737a4e20c91b8a5685e9..b1101e23ea8e1c5ec6b3b9ebc568a2f26ef40fa8 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1026,7 +1026,7 @@ public abstract class Player extends LivingEntity {
@@ -1025,7 +1025,7 @@ public abstract class Player extends LivingEntity {
float f2 = f1 - f;
if (f2 > 0.0F && f2 < 3.4028235E37F) {
@@ -206,7 +206,7 @@ index b871d89d16e0bb08cc8ce87e74ced974734be418..87689c468b8e4d2498584fca90738f82
}
if (f != 0.0F) {
@@ -1036,7 +1036,7 @@ public abstract class Player extends LivingEntity {
@@ -1035,7 +1035,7 @@ public abstract class Player extends LivingEntity {
this.setHealth(this.getHealth() - f);
this.getCombatTracker().recordDamage(damagesource, f3, f);
if (f < 3.4028235E37F) {
@@ -215,7 +215,7 @@ index b871d89d16e0bb08cc8ce87e74ced974734be418..87689c468b8e4d2498584fca90738f82
}
}
@@ -1362,7 +1362,7 @@ public abstract class Player extends LivingEntity {
@@ -1361,7 +1361,7 @@ public abstract class Player extends LivingEntity {
if (target instanceof LivingEntity) {
float f5 = f3 - ((LivingEntity) target).getHealth();
@@ -224,7 +224,7 @@ index b871d89d16e0bb08cc8ce87e74ced974734be418..87689c468b8e4d2498584fca90738f82
if (j > 0) {
// CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item
EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), target.getBukkitEntity(), j * 4);
@@ -1626,29 +1626,29 @@ public abstract class Player extends LivingEntity {
@@ -1625,29 +1625,29 @@ public abstract class Player extends LivingEntity {
int i;
if (this.isSwimming()) {
@@ -259,7 +259,7 @@ index b871d89d16e0bb08cc8ce87e74ced974734be418..87689c468b8e4d2498584fca90738f82
if (i > 0) {
if (this.isSprinting()) {
this.awardStat(Stats.SPRINT_ONE_CM, i);
@@ -1662,10 +1662,10 @@ public abstract class Player extends LivingEntity {
@@ -1661,10 +1661,10 @@ public abstract class Player extends LivingEntity {
}
}
} else if (this.isFallFlying()) {
@@ -272,7 +272,7 @@ index b871d89d16e0bb08cc8ce87e74ced974734be418..87689c468b8e4d2498584fca90738f82
if (i > 25) {
this.awardStat(Stats.FLY_ONE_CM, i);
}
@@ -1676,7 +1676,7 @@ public abstract class Player extends LivingEntity {
@@ -1675,7 +1675,7 @@ public abstract class Player extends LivingEntity {
public void checkRidingStatistics(double dx, double dy, double dz) {
if (this.isPassenger()) {
@@ -281,7 +281,7 @@ index b871d89d16e0bb08cc8ce87e74ced974734be418..87689c468b8e4d2498584fca90738f82
if (i > 0) {
Entity entity = this.getVehicle();
@@ -1703,7 +1703,7 @@ public abstract class Player extends LivingEntity {
@@ -1702,7 +1702,7 @@ public abstract class Player extends LivingEntity {
return false;
} else {
if (fallDistance >= 2.0F) {

View File

@@ -22,7 +22,7 @@ index 2e141e7b85ef54a084698b5a920b85212271fce8..6b843f9fba6c26b1581be114d6f255a6
}
});
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 4df7088e81ee6ccc7705d2c220ae80c373681c9e..eca710db195a5eda4f4c515e116e26e99b2b4677 100644
index f5539056a3066071c11d0144c2a867d874dc2331..7a9637c2f69d86eb7762b1e6d6ffa4e570d34b46 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2406,6 +2406,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -34,10 +34,10 @@ index 4df7088e81ee6ccc7705d2c220ae80c373681c9e..eca710db195a5eda4f4c515e116e26e9
ServerLevel.this.entityManager.addNavigatorsIfPathingToRegion(entity); // Paper - optimise notify
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 2eb9bc34afdc26bed21bc9d3e97f636cfc97f166..e36721c1fe272dabeacbd7d2362a91e81a478415 100644
index 8d3147b48eff5418f452eb1449639316399942ee..671de58cfbce73238a55abd880d005f673097e08 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -211,7 +211,7 @@ public class ActivationRange
@@ -215,7 +215,7 @@ public class ActivationRange
// Paper end
// Paper start

View File

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9373e4ce1061d5cb3a2d22272671c668614dd4a8..a9cf45362ca7dfe9261098085993a133dd505701 100644
index fbbd924097c25ccaec00f425ba8c8c84223187a9..cc4f2d2a7d220741442797e5475b04e296497735 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3373,6 +3373,8 @@ public abstract class LivingEntity extends Entity {
@@ -3372,6 +3372,8 @@ public abstract class LivingEntity extends Entity {
}
private void updateFallFlying() {

View File

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 08618fb2d4f8dcbe1484cc39f4690f4c380d4346..df33f1021eda772605bb4423eb2b103d51397557 100644
index cc4f2d2a7d220741442797e5475b04e296497735..4103adf5a8b4b211645dc79e3271cffef18a4adf 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2422,6 +2422,8 @@ public abstract class LivingEntity extends Entity {
@@ -2421,6 +2421,8 @@ public abstract class LivingEntity extends Entity {
}
protected void updateSwingTime() {