diff options
| author | Jake Potrebic <[email protected]> | 2024-05-30 13:17:16 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-30 13:17:16 -0700 |
| commit | a47e11d464d84aca537687748aafe32c08567801 (patch) | |
| tree | 3d8db87b4fed8463d840c55ef46c8f7c4aff1444 /patches/server/0322-Entity-Jump-API.patch | |
| parent | 06e69c8991b8c5022a319e4415ebd7822b5d1fb8 (diff) | |
| download | Paper-a47e11d464d84aca537687748aafe32c08567801.tar.gz Paper-a47e11d464d84aca537687748aafe32c08567801.zip | |
fix knockback events (#10831)
* fix knockback events
* squash
* handle cancelled event for explosions
Diffstat (limited to 'patches/server/0322-Entity-Jump-API.patch')
| -rw-r--r-- | patches/server/0322-Entity-Jump-API.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0322-Entity-Jump-API.patch b/patches/server/0322-Entity-Jump-API.patch index 2b4b803a54..a0abb6fad2 100644 --- a/patches/server/0322-Entity-Jump-API.patch +++ b/patches/server/0322-Entity-Jump-API.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Entity Jump API public net.minecraft.world.entity.LivingEntity jumping diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ebdc95a04400ab71a261a1a4fd6e4477ee9d3122..fa9da0e3b9fc579f16c3b05c8c45310940e68d62 100644 +index 58dacb52494972698b2d3740ed1cbe53e5264771..575f6b542a7c5c9a3f96a0e4e78f75f7dc060cd7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3401,8 +3401,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3391,8 +3391,10 @@ public abstract class LivingEntity extends Entity implements Attackable { } else if (this.isInLava() && (!this.onGround() || d3 > d4)) { this.jumpInLiquid(FluidTags.LAVA); } else if ((this.onGround() || flag && d3 <= d4) && this.noJumpDelay == 0) { |