46 lines
2.5 KiB
Diff
46 lines
2.5 KiB
Diff
|
From 00743ab18f54c5f7fdf15706859f2803dbba1a6b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||
|
|
Date: Thu, 28 Sep 2017 17:21:44 -0400
|
||
|
|
Subject: [PATCH] Add PlayerJumpEvent
|
||
|
|
|
||
|
|
|
||
|
|
@@ -584,7 +585,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||
|
|
d8 = d5 - this.p;
|
||
|
|
d9 = d6 - this.q;
|
||
|
|
if (this.player.onGround && !packetplayinflying.a() && d8 > 0.0D) {
|
||
|
|
- this.player.cu();
|
||
|
|
+ // Paper start - Add player jump event
|
||
|
|
+ Player player = this.getPlayer();
|
||
|
|
+ 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 (packetplayinflying.hasPos) {
|
||
|
|
+ to.setX(packetplayinflying.x);
|
||
|
|
+ to.setY(packetplayinflying.y);
|
||
|
|
+ to.setZ(packetplayinflying.z);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // If the packet contains look information then we update the To location with the correct Yaw & Pitch.
|
||
|
|
+ if (packetplayinflying.hasLook) {
|
||
|
|
+ to.setYaw(packetplayinflying.yaw);
|
||
|
|
+ to.setPitch(packetplayinflying.pitch);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ PlayerJumpEvent event = new PlayerJumpEvent(player, from, to);
|
||
|
|
+
|
||
|
|
+ if (event.callEvent()) {
|
||
|
|
+ this.player.cu();
|
||
|
|
+ } else {
|
||
|
|
+ from = event.getFrom();
|
||
|
|
+ this.internalTeleport(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch(), Collections.emptySet());
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
|
||
|
|
--
|
||
|
|
2.14.1.windows.1
|
||
|
|
|