aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0776-Friction-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0776-Friction-API.patch')
-rw-r--r--patches/server/0776-Friction-API.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0776-Friction-API.patch b/patches/server/0776-Friction-API.patch
index 43e40c8c33..dfa1fdc21b 100644
--- a/patches/server/0776-Friction-API.patch
+++ b/patches/server/0776-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 532f954a052eca3279f974450c2133837410282e..c64fb799f2f40831cd25a409713c9b5081c76002 100644
+index ec656b2505c143e453b540e3e0a2cbfa0b370cd3..fd0e44ea6ff2868b06c8f0af14be998d95f9f46b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -285,6 +285,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -25,7 +25,7 @@ index 532f954a052eca3279f974450c2133837410282e..c64fb799f2f40831cd25a409713c9b50
}
public void setDiscardFriction(boolean noDrag) {
-@@ -773,6 +774,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -774,6 +775,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Override
public void addAdditionalSaveData(CompoundTag nbt) {
@@ -37,7 +37,7 @@ index 532f954a052eca3279f974450c2133837410282e..c64fb799f2f40831cd25a409713c9b50
nbt.putFloat("Health", this.getHealth());
nbt.putShort("HurtTime", (short) this.hurtTime);
nbt.putInt("HurtByTimestamp", this.lastHurtByMobTimestamp);
-@@ -816,6 +822,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -817,6 +823,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.internalSetAbsorptionAmount(absorptionAmount);
// Paper end - Check for NaN