diff options
Diffstat (limited to 'patches/server/0835-Flying-Fall-Damage.patch')
| -rw-r--r-- | patches/server/0835-Flying-Fall-Damage.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0835-Flying-Fall-Damage.patch b/patches/server/0835-Flying-Fall-Damage.patch index 0637a31240..be35e97f74 100644 --- a/patches/server/0835-Flying-Fall-Damage.patch +++ b/patches/server/0835-Flying-Fall-Damage.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage 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 b3a91d7ad2095485006ef1ee7f07c474269ae455..f32708ed934bbbf2416e32fdddc7bb4329958cf6 100644 +index 262cefa51856cf6a58ae3b80b1ae93a5dd7bfaa7..e92cb12a04827c2afc0662a26320458527aa2bd4 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity { +@@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity { public FishingHook fishing; public float hurtDir; // Paper - protected -> public public boolean affectsSpawning = true; // Paper - Affects Spawning API @@ -16,7 +16,7 @@ index b3a91d7ad2095485006ef1ee7f07c474269ae455..f32708ed934bbbf2416e32fdddc7bb43 // CraftBukkit start public boolean fauxSleeping; -@@ -1672,7 +1673,7 @@ public abstract class Player extends LivingEntity { +@@ -1680,7 +1681,7 @@ public abstract class Player extends LivingEntity { @Override public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) { @@ -26,7 +26,7 @@ index b3a91d7ad2095485006ef1ee7f07c474269ae455..f32708ed934bbbf2416e32fdddc7bb43 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fee318e42bac5f06825352c16f9f03168d8ce271..4f62bd701e2645ef37bcfda851723c6b51f5f3d5 100644 +index 1a0023472b9ba5bbc0ee1d16824219d94944bdf9..69917a56fc05f8c16a1302fe331993e8d49889b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2498,6 +2498,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { |