Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 14:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Oops position

Browse Source
This commit is contained in:
TheMode 2021-08-28 11:51:39 +02:00
parent 9739403ff4
commit bf847fac79
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,9 @@ public class PlayerPositionListener {
player.refreshReceivedTeleportId(packet.teleportId); player.refreshReceivedTeleportId(packet.teleportId);
} }
private static void processMovement(@NotNull Player player, @NotNull Pos newPosition, boolean onGround) { private static void processMovement(@NotNull Player player, @NotNull Pos packetPosition, boolean onGround) {
final var currentPosition = player.getPosition(); final var currentPosition = player.getPosition();
if (currentPosition.equals(newPosition)) { if (currentPosition.equals(packetPosition)) {
// For some reason, the position is the same // For some reason, the position is the same
return; return;
} }
@ -49,12 +49,12 @@ public class PlayerPositionListener {
return; return;
} }
// Try to move in an unloaded chunk, prevent it // Try to move in an unloaded chunk, prevent it
if (!currentPosition.sameChunk(newPosition) && !ChunkUtils.isLoaded(instance, newPosition)) { if (!currentPosition.sameChunk(packetPosition) && !ChunkUtils.isLoaded(instance, packetPosition)) {
player.teleport(currentPosition); player.teleport(currentPosition);
return; return;
} }
PlayerMoveEvent playerMoveEvent = new PlayerMoveEvent(player, newPosition); PlayerMoveEvent playerMoveEvent = new PlayerMoveEvent(player, packetPosition);
GlobalHandles.PLAYER_MOVE.call(playerMoveEvent); GlobalHandles.PLAYER_MOVE.call(playerMoveEvent);
if (!currentPosition.equals(player.getPosition())) { if (!currentPosition.equals(player.getPosition())) {
// Player has been teleported in the event // Player has been teleported in the event
@ -67,13 +67,15 @@ public class PlayerPositionListener {
return; return;
} }
final Pos eventPosition = playerMoveEvent.getNewPosition(); final Pos eventPosition = playerMoveEvent.getNewPosition();
if (newPosition.equals(eventPosition)) { if (packetPosition.equals(eventPosition)) {
// Event didn't change the position // Event didn't change the position
player.refreshPosition(playerMoveEvent.getNewPosition()); player.refreshPosition(eventPosition);
player.refreshOnGround(onGround); player.refreshOnGround(onGround);
} else { } else {
// Position modified by the event // Position modified by the event
if (newPosition.samePoint(eventPosition)) { if (packetPosition.samePoint(eventPosition)) {
player.refreshPosition(eventPosition, true);
player.refreshOnGround(onGround);
player.setView(eventPosition.yaw(), eventPosition.pitch()); player.setView(eventPosition.yaw(), eventPosition.pitch());
} else { } else {
player.teleport(eventPosition); player.teleport(eventPosition);