diff options
author | Nassim Jahnke <[email protected]> | 2022-12-07 17:46:46 +0100 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2022-12-07 17:46:46 +0100 |
commit | fd58a696cb6d6654a4595ee1f6e303c8efc741b4 (patch) | |
tree | a351b4e49dde8cb99bb72874ca6a088a6f31b8c2 /patches/server/0158-Add-PlayerJumpEvent.patch | |
parent | 476ef25d053c523aea416487a38f72011d72a9cf (diff) | |
download | Paper-fd58a696cb6d6654a4595ee1f6e303c8efc741b4.tar.gz Paper-fd58a696cb6d6654a4595ee1f6e303c8efc741b4.zip |
API patches
Diffstat (limited to 'patches/server/0158-Add-PlayerJumpEvent.patch')
-rw-r--r-- | patches/server/0158-Add-PlayerJumpEvent.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/patches/server/0158-Add-PlayerJumpEvent.patch b/patches/server/0158-Add-PlayerJumpEvent.patch deleted file mode 100644 index c861a5386c..0000000000 --- a/patches/server/0158-Add-PlayerJumpEvent.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown <[email protected]> -Date: Thu, 28 Sep 2017 17:21:44 -0400 -Subject: [PATCH] Add PlayerJumpEvent - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f8955429ec4cfe778de77a7db5fef624c20e4318..32c4383cfb4cab6329d7046c48daf3050fa027c6 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1293,7 +1293,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - boolean flag = d8 > 0.0D; - - if (this.player.isOnGround() && !packet.isOnGround() && flag) { -- this.player.jumpFromGround(); -+ // Paper start - Add player jump event -+ Player player = this.getCraftPlayer(); -+ Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location. -+ Location to = player.getLocation().clone(); // Start off the To location as the Players current location. -+ -+ // If the packet contains movement information then we update the To location with the correct XYZ. -+ if (packet.hasPos) { -+ to.setX(packet.x); -+ to.setY(packet.y); -+ to.setZ(packet.z); -+ } -+ -+ // If the packet contains look information then we update the To location with the correct Yaw & Pitch. -+ if (packet.hasRot) { -+ to.setYaw(packet.yRot); -+ to.setPitch(packet.xRot); -+ } -+ -+ com.destroystokyo.paper.event.player.PlayerJumpEvent event = new com.destroystokyo.paper.event.player.PlayerJumpEvent(player, from, to); -+ -+ if (event.callEvent()) { -+ this.player.jumpFromGround(); -+ } else { -+ from = event.getFrom(); -+ this.internalTeleport(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch(), Collections.emptySet(), false); -+ return; -+ } -+ // Paper end - } - - boolean flag1 = this.player.verticalCollisionBelow; |