Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 02:10:30 +01:00
Code Issues Projects Releases Wiki Activity

Check for world change in MoveEvent API methods

Browse Source
This commit is contained in:
KennyTV 2021-04-30 15:05:45 +02:00 committed by Mariell Hoversholm
parent 3095c75921
commit b28ad17ac9
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Spigot-API-Patches/0291-PlayerMoveEvent-Improvements.patch
View File

@ -5,24 +5,51 @@ 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 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
index 1a58734d919fae247eeb85dd785fd59990856505..a39d4f0e4cd45b20b12809475d6d29613b489503 100644 index 1a58734d919fae247eeb85dd785fd59990856505..b484abf3b06b1fb3577b43d50d64498dcd7652c9 100644
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -93,6 +93,35 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable { @@ -93,6 +93,53 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
this.to = to; this.to = to;
} }
+ // Paper start - PlayerMoveEvent improvements + // Paper start - PlayerMoveEvent improvements
+ /** + /**
+ * Check if the player has changed position in the event + * Check if the player has changed position (even within the same block) in the event
+ * + *
+ * @return whether the player has changed position or not + * @return whether the player has changed position or not
+ */ + */
+ public boolean hasChangedPosition() { + 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(); + 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 + * Check if the player has changed orientation in the event
+ * + *
+ * @return whether the player has changed orientation or not + * @return whether the player has changed orientation or not
@ -30,15 +57,6 @@ index 1a58734d919fae247eeb85dd785fd59990856505..a39d4f0e4cd45b20b12809475d6d2961
+ public boolean hasChangedOrientation() { + public boolean hasChangedOrientation() {
+ return from.getPitch() != to.getPitch() || from.getYaw() != to.getYaw(); + return from.getPitch() != to.getPitch() || from.getYaw() != to.getYaw();
+ } + }
+
+ /**
+ * Check if the player has changed to a new block in the event
+ *
+ * @return whether the player has changed block or not
+ */
+ public boolean hasChangedBlock() {
+ return from.getBlockX() != to.getBlockX() || from.getBlockY() != to.getBlockY() || from.getBlockZ() != to.getBlockZ();
+ }
+ // Paper end + // Paper end
+ +
private void validateLocation(@NotNull Location loc) { private void validateLocation(@NotNull Location loc) {