2020-04-02 23:07:06 +02:00
|
|
|
From c2abf57d9f2f352fdb91ac63edf5966985e3cc6d Mon Sep 17 00:00:00 2001
|
2017-09-28 23:38:17 +02:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
Date: Thu, 28 Sep 2017 17:21:44 -0400
|
|
|
|
Subject: [PATCH] Add PlayerJumpEvent
|
|
|
|
|
|
|
|
|
2017-09-29 00:43:36 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2020-04-02 23:07:06 +02:00
|
|
|
index 046ef418f8..b0651dcfbf 100644
|
2017-09-29 00:43:36 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2019-05-06 04:58:04 +02:00
|
|
|
@@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
|
2018-07-18 02:08:13 +02:00
|
|
|
import org.bukkit.inventory.EquipmentSlot;
|
2017-09-29 00:54:38 +02:00
|
|
|
import org.bukkit.inventory.InventoryView;
|
|
|
|
import org.bukkit.util.NumberConversions;
|
2018-07-18 02:08:13 +02:00
|
|
|
+import com.destroystokyo.paper.event.player.IllegalPacketEvent; // Paper
|
2017-09-29 00:54:38 +02:00
|
|
|
+import com.destroystokyo.paper.event.player.PlayerJumpEvent; // Paper
|
|
|
|
import co.aikar.timings.MinecraftTimings; // Paper
|
|
|
|
// CraftBukkit end
|
|
|
|
|
2019-12-12 00:43:22 +01:00
|
|
|
@@ -925,7 +927,34 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
|
|
}
|
|
|
|
|
2018-07-18 02:08:13 +02:00
|
|
|
if (this.player.onGround && !packetplayinflying.b() && d8 > 0.0D) {
|
2019-04-28 01:23:53 +02:00
|
|
|
- this.player.jump();
|
2017-09-28 23:38:17 +02:00
|
|
|
+ // 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()) {
|
2017-09-29 20:58:24 +02:00
|
|
|
+ this.player.jump();
|
2017-09-28 23:38:17 +02:00
|
|
|
+ } else {
|
|
|
|
+ from = event.getFrom();
|
|
|
|
+ this.internalTeleport(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch(), Collections.emptySet());
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
2019-04-28 01:23:53 +02:00
|
|
|
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
|
2017-09-28 23:38:17 +02:00
|
|
|
--
|
2020-04-02 23:07:06 +02:00
|
|
|
2.25.1
|
2017-09-28 23:38:17 +02:00
|
|
|
|