Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-19 06:32:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix teleport in the PlayerMoveEvent

Browse Source
This commit is contained in:
themode 2020-09-23 22:14:43 +02:00
parent 8c623072f3
commit cd521d4c19
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minestom/server/listener/PlayerPositionListener.java
View File

@ -56,16 +56,21 @@ public class PlayerPositionListener {
return; return;
} }
final Position currentPosition = player.getPosition().clone();
Position newPosition = new Position(x, y, z, yaw, pitch); Position newPosition = new Position(x, y, z, yaw, pitch);
final Position cachedPosition = newPosition.clone(); final Position cachedPosition = newPosition.clone();
PlayerMoveEvent playerMoveEvent = new PlayerMoveEvent(player, newPosition); PlayerMoveEvent playerMoveEvent = new PlayerMoveEvent(player, newPosition);
player.callEvent(PlayerMoveEvent.class, playerMoveEvent); player.callEvent(PlayerMoveEvent.class, playerMoveEvent);
if (!playerMoveEvent.isCancelled()) {
// True if the event call changed the player position (possibly a teleport)
final boolean positionChanged = !currentPosition.equals(player.getPosition());
if (!playerMoveEvent.isCancelled() && !positionChanged) {
// Move the player // Move the player
newPosition = playerMoveEvent.getNewPosition(); newPosition = playerMoveEvent.getNewPosition();
if (!newPosition.equals(cachedPosition)) { if (!newPosition.equals(cachedPosition)) {
// Position changed, teleport the player // New position from the event changed, teleport the player
player.teleport(newPosition); player.teleport(newPosition);
} }
// Change the internal data // Change the internal data