From 1b059c59816ac0415ef6914a07abc6ca22674ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9meth=20Noel?= Date: Tue, 4 May 2021 01:19:33 +0200 Subject: [PATCH] Inverted and renamed method parameter --- .../net/minestom/server/entity/Entity.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index 5ae8fb9d1..440240ceb 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -492,7 +492,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer, } } - sendPositionUpdate(true); + sendPositionUpdate(false); final boolean isNettyClient = PlayerUtils.isNettyClient(this); // Entity tick @@ -689,9 +689,9 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer, * In case of a player's position and/or view change an additional {@link PlayerPositionAndLookPacket} * is sent to self. * - * @param notFromListener {@code false} if the client triggered this action + * @param clientSide {@code true} if the client triggered this action */ - protected void sendPositionUpdate(final boolean notFromListener) { + protected void sendPositionUpdate(final boolean clientSide) { final boolean viewChange = !position.hasSimilarView(lastSyncedPosition); final double distanceX = Math.abs(position.getX()-lastSyncedPosition.getX()); final double distanceY = Math.abs(position.getY()-lastSyncedPosition.getY()); @@ -727,19 +727,19 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer, entityHeadLookPacket.entityId = getEntityId(); entityHeadLookPacket.yaw = position.getYaw(); - if (notFromListener) { - sendPacketToViewersAndSelf(entityHeadLookPacket); - sendPacketToViewersAndSelf(entityRotationPacket); - } else { + if (clientSide) { sendPacketToViewers(entityHeadLookPacket); sendPacketToViewers(entityRotationPacket); + } else { + sendPacketToViewersAndSelf(entityHeadLookPacket); + sendPacketToViewersAndSelf(entityRotationPacket); } } else { // Nothing changed, return return; } - if (PlayerUtils.isNettyClient(this) && notFromListener) { + if (PlayerUtils.isNettyClient(this) && !clientSide) { final PlayerPositionAndLookPacket playerPositionAndLookPacket = new PlayerPositionAndLookPacket(); playerPositionAndLookPacket.flags = 0b111; playerPositionAndLookPacket.position = position.clone().subtract(lastSyncedPosition.getX(), lastSyncedPosition.getY(), lastSyncedPosition.getZ()); @@ -1405,7 +1405,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer, if (!position.isSimilar(this.position)) refreshPosition(position.getX(), position.getY(), position.getZ()); refreshView(position.getYaw(), position.getPitch()); - sendPositionUpdate(false); + sendPositionUpdate(true); } /**