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

Merge remote-tracking branch 'Kebab11noel/position-cleanup' into position-cleanup

Browse Source
This commit is contained in:
TheMode 2021-05-04 01:21:03 +02:00
commit 44c777395b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -492,7 +492,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
} }
} }
sendPositionUpdate(true); sendPositionUpdate(false);
final boolean isNettyClient = PlayerUtils.isNettyClient(this); final boolean isNettyClient = PlayerUtils.isNettyClient(this);
// Entity tick // 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} * In case of a player's position and/or view change an additional {@link PlayerPositionAndLookPacket}
* is sent to self. * 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 boolean viewChange = !position.hasSimilarView(lastSyncedPosition);
final double distanceX = Math.abs(position.getX()-lastSyncedPosition.getX()); final double distanceX = Math.abs(position.getX()-lastSyncedPosition.getX());
final double distanceY = Math.abs(position.getY()-lastSyncedPosition.getY()); 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.entityId = getEntityId();
entityHeadLookPacket.yaw = position.getYaw(); entityHeadLookPacket.yaw = position.getYaw();
if (notFromListener) { if (clientSide) {
sendPacketToViewersAndSelf(entityHeadLookPacket);
sendPacketToViewersAndSelf(entityRotationPacket);
} else {
sendPacketToViewers(entityHeadLookPacket); sendPacketToViewers(entityHeadLookPacket);
sendPacketToViewers(entityRotationPacket); sendPacketToViewers(entityRotationPacket);
} else {
sendPacketToViewersAndSelf(entityHeadLookPacket);
sendPacketToViewersAndSelf(entityRotationPacket);
} }
} else { } else {
// Nothing changed, return // Nothing changed, return
return; return;
} }
if (PlayerUtils.isNettyClient(this) && notFromListener) { if (PlayerUtils.isNettyClient(this) && !clientSide) {
final PlayerPositionAndLookPacket playerPositionAndLookPacket = new PlayerPositionAndLookPacket(); final PlayerPositionAndLookPacket playerPositionAndLookPacket = new PlayerPositionAndLookPacket();
playerPositionAndLookPacket.flags = 0b111; playerPositionAndLookPacket.flags = 0b111;
playerPositionAndLookPacket.position = position.clone().subtract(lastSyncedPosition.getX(), lastSyncedPosition.getY(), lastSyncedPosition.getZ()); 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)) if (!position.isSimilar(this.position))
refreshPosition(position.getX(), position.getY(), position.getZ()); refreshPosition(position.getX(), position.getY(), position.getZ());
refreshView(position.getYaw(), position.getPitch()); refreshView(position.getYaw(), position.getPitch());
sendPositionUpdate(false); sendPositionUpdate(true);
} }
/** /**