Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-28 14:37:31 +02:00
Code Issues Projects Releases Wiki Activity

Simplify movement processing

Browse Source
This commit is contained in:
TheMode 2021-07-20 07:05:08 +02:00
parent bca3324b56
commit 1dc80d6b87
2 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,42 +16,27 @@ public class PlayerPositionListener {
}
public static void playerLookListener(ClientPlayerRotationPacket packet, Player player) {
final var playerPosition = player.getPosition();
final double x = playerPosition.x();
final double y = playerPosition.y();
final double z = playerPosition.z();
final float yaw = packet.yaw;
final float pitch = packet.pitch;
final boolean onGround = packet.onGround;
processMovement(player, x, y, z, yaw, pitch, onGround);
processMovement(player, player.getPosition().withView(packet.yaw, packet.pitch), packet.onGround);
}
public static void playerPositionListener(ClientPlayerPositionPacket packet, Player player) {
final var playerPosition = player.getPosition();
final float yaw = playerPosition.yaw();
final float pitch = playerPosition.pitch();
final boolean onGround = packet.onGround;
processMovement(player,
packet.x, packet.y, packet.z,
yaw, pitch, onGround);
processMovement(player, player.getPosition().withCoord(packet.x, packet.y, packet.z), packet.onGround);
}
public static void playerPositionAndLookListener(ClientPlayerPositionAndRotationPacket packet, Player player) {
final float yaw = packet.yaw;
final float pitch = packet.pitch;
final boolean onGround = packet.onGround;
processMovement(player,
packet.x, packet.y, packet.z,
yaw, pitch, onGround);
processMovement(player, new Pos(packet.x, packet.y, packet.z, packet.yaw, packet.pitch), packet.onGround);
}
public static void teleportConfirmListener(ClientTeleportConfirmPacket packet, Player player) {
final int packetTeleportId = packet.teleportId;
player.refreshReceivedTeleportId(packetTeleportId);
player.refreshReceivedTeleportId(packet.teleportId);
}
private static void processMovement(@NotNull Player player, double x, double y, double z,
float yaw, float pitch, boolean onGround) {
private static void processMovement(@NotNull Player player, @NotNull Pos newPosition, boolean onGround) {
final var currentPosition = player.getPosition();
if (currentPosition.equals(newPosition)) {
// For some reason, the position is the same
return;
}
final Instance instance = player.getInstance();
// Prevent moving before the player spawned, probably a modified client (or high latency?)
if (instance == null) {
@ -61,17 +46,9 @@ public class PlayerPositionListener {
if (player.getLastSentTeleportId() != player.getLastReceivedTeleportId()) {
return;
}
final var currentPosition = player.getPosition();
final var newPosition = new Pos(x, y, z, yaw, pitch);
if (currentPosition.equals(newPosition)) {
// For some reason, the position is the same
return;
}
// Try to move in an unloaded chunk, prevent it
if (!currentPosition.sameChunk(newPosition) && !ChunkUtils.isLoaded(instance, x, z)) {
player.teleport(player.getPosition());
if (!currentPosition.sameChunk(newPosition) && !ChunkUtils.isLoaded(instance, newPosition)) {
player.teleport(currentPosition);
return;
}

4
src/main/java/net/minestom/server/utils/chunk/ChunkUtils.java
View File

@ -81,6 +81,10 @@ public final class ChunkUtils {
return isLoaded(chunk);
}
public static boolean isLoaded(@NotNull Instance instance, @NotNull Point point) {
return isLoaded(instance, point.x(), point.z());
}
public static Chunk retrieve(Instance instance, Chunk originChunk, double x, double z) {
final int chunkX = getChunkCoordinate(x);
final int chunkZ = getChunkCoordinate(z);