diff options
| author | Nassim Jahnke <[email protected]> | 2024-10-27 18:11:15 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-10-27 18:39:30 +0100 |
| commit | 02bca1e6558bf4ac0cbf928d48e90f497b10b0a3 (patch) | |
| tree | 1144072e447f4c0b7e80b278fd769106227f016a /patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch | |
| parent | 12ed02105177f54906a7d4422b235929426bc264 (diff) | |
| download | Paper-02bca1e6558bf4ac0cbf928d48e90f497b10b0a3.tar.gz Paper-02bca1e6558bf4ac0cbf928d48e90f497b10b0a3.zip | |
Remove timings impl
Diffstat (limited to 'patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch')
| -rw-r--r-- | patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch index b46ff88f53..d019f5b8cb 100644 --- a/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -5,10 +5,10 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4fa5e7127549e090338b11e6493413a3fab254a0..14d9e62c86309676ddd7eed19cce2f4b30a59b94 100644 +index 031b7f51959d1b8ca30e4a9fda0a2832516c9c0c..e5d1877f570b302f0b193e77ff5fdd7e89532513 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -833,7 +833,13 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -831,7 +831,13 @@ public abstract class LivingEntity extends Entity implements Attackable { @Override public void readAdditionalSaveData(CompoundTag nbt) { @@ -23,7 +23,7 @@ index 4fa5e7127549e090338b11e6493413a3fab254a0..14d9e62c86309676ddd7eed19cce2f4b if (nbt.contains("attributes", 9) && this.level() != null && !this.level().isClientSide) { this.getAttributes().load(nbt.getList("attributes", 10)); } -@@ -1373,6 +1379,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1371,6 +1377,10 @@ public abstract class LivingEntity extends Entity implements Attackable { } public void setHealth(float health) { @@ -34,7 +34,7 @@ index 4fa5e7127549e090338b11e6493413a3fab254a0..14d9e62c86309676ddd7eed19cce2f4b // CraftBukkit start - Handle scaled health if (this instanceof ServerPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((ServerPlayer) this).getBukkitEntity(); -@@ -3841,7 +3851,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3839,7 +3849,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } public final void setAbsorptionAmount(float absorptionAmount) { |