aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0150-Add-PlayerJumpEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/server/0150-Add-PlayerJumpEvent.patch')
-rw-r--r--patches/unapplied/server/0150-Add-PlayerJumpEvent.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/patches/unapplied/server/0150-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0150-Add-PlayerJumpEvent.patch
new file mode 100644
index 0000000000..6e1404774e
--- /dev/null
+++ b/patches/unapplied/server/0150-Add-PlayerJumpEvent.patch
@@ -0,0 +1,46 @@
+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 7be9c0054ae3bf0d9b9327271a4ddf56a81d6448..414077a1fed2955bd64ac7091af1daeda2a92e2c 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1209,7 +1209,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ boolean flag1 = d7 > 0.0D;
+
+ if (this.player.onGround() && !packet.isOnGround() && flag1) {
+- this.player.jumpFromGround();
++ // Paper start - Add PlayerJumpEvent
++ 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(new PositionMoveRotation(org.bukkit.craftbukkit.util.CraftLocation.toVec3D(from), Vec3.ZERO, from.getYaw(), from.getPitch()), Collections.emptySet());
++ return;
++ }
++ // Paper end - Add PlayerJumpEvent
+ }
+
+ boolean flag2 = this.player.verticalCollisionBelow;