geforkt von Mirrors/Paper
71c84c8132
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
65 Zeilen
2.6 KiB
Diff
65 Zeilen
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
|
|
Date: Thu, 29 Apr 2021 10:31:44 +0100
|
|
Subject: [PATCH] PlayerMoveEvent Improvements
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
|
index 1a58734d919fae247eeb85dd785fd59990856505..b484abf3b06b1fb3577b43d50d64498dcd7652c9 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
|
@@ -93,6 +93,53 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
|
|
this.to = to;
|
|
}
|
|
|
|
+ // Paper start - PlayerMoveEvent improvements
|
|
+ /**
|
|
+ * Check if the player has changed position (even within the same block) in the event
|
|
+ *
|
|
+ * @return whether the player has changed position or not
|
|
+ */
|
|
+ public boolean hasChangedPosition() {
|
|
+ return hasExplicitlyChangedPosition() || !from.getWorld().equals(to.getWorld());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the player has changed position (even within the same block) in the event, disregarding a possible world change
|
|
+ *
|
|
+ * @return whether the player has changed position or not
|
|
+ */
|
|
+ public boolean hasExplicitlyChangedPosition() {
|
|
+ return from.getX() != to.getX() || from.getY() != to.getY() || from.getZ() != to.getZ();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the player has moved to a new block in the event
|
|
+ *
|
|
+ * @return whether the player has moved to a new block or not
|
|
+ */
|
|
+ public boolean hasChangedBlock() {
|
|
+ return hasExplicitlyChangedBlock() || !from.getWorld().equals(to.getWorld());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the player has moved to a new block in the event, disregarding a possible world change
|
|
+ *
|
|
+ * @return whether the player has moved to a new block or not
|
|
+ */
|
|
+ public boolean hasExplicitlyChangedBlock() {
|
|
+ return from.getBlockX() != to.getBlockX() || from.getBlockY() != to.getBlockY() || from.getBlockZ() != to.getBlockZ();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Check if the player has changed orientation in the event
|
|
+ *
|
|
+ * @return whether the player has changed orientation or not
|
|
+ */
|
|
+ public boolean hasChangedOrientation() {
|
|
+ return from.getPitch() != to.getPitch() || from.getYaw() != to.getYaw();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
private void validateLocation(@NotNull Location loc) {
|
|
Preconditions.checkArgument(loc != null, "Cannot use null location!");
|
|
Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!");
|