Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-31 21:48:08 +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-01 04:38:51 +02:00
commit 3f7e36ab8c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,8 +138,6 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
*/
private final Object entityTypeLock = new Object();
protected boolean isNettyClient;
public Entity(@NotNull EntityType entityType, @NotNull UUID uuid) {
this.id = generateId();
this.entityType = entityType;
@ -496,6 +494,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
}
sendPositionUpdate(true);
final boolean isNettyClient = PlayerUtils.isNettyClient(this);
// Entity tick
{
@ -691,9 +690,10 @@ 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 true} if the client triggered this action
* @param notFromListener {@code false} if the client triggered this action
*/
protected void sendPositionUpdate(final boolean notFromListener) {
@ApiStatus.Internal
public void sendPositionUpdate(final boolean notFromListener) {
final boolean viewChange = !position.hasSimilarView(lastSyncedPosition);
final double distanceX = Math.abs(position.getX()-lastSyncedPosition.getX());
final double distanceY = Math.abs(position.getY()-lastSyncedPosition.getY());
@ -741,7 +741,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
return;
}
if (isNettyClient && notFromListener) {
if (PlayerUtils.isNettyClient(this) && notFromListener) {
final PlayerPositionAndLookPacket playerPositionAndLookPacket = new PlayerPositionAndLookPacket();
playerPositionAndLookPacket.flags = 0b111;
playerPositionAndLookPacket.position = position.clone().subtract(lastSyncedPosition.getX(), lastSyncedPosition.getY(), lastSyncedPosition.getZ());
@ -1357,8 +1357,6 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
position.setY(y);
position.setZ(z);
sendPositionUpdate(false);
if (hasPassenger()) {
for (Entity passenger : getPassengers()) {
passenger.refreshPosition(x, y, z);
@ -1416,8 +1414,6 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
this.lastPosition.setPitch(position.getPitch());
position.setYaw(yaw);
position.setPitch(pitch);
sendPositionUpdate(false);
}
/**

1
src/main/java/net/minestom/server/entity/Player.java
View File

@ -181,7 +181,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
super(EntityType.PLAYER, uuid);
this.username = username;
this.playerConnection = playerConnection;
this.isNettyClient = PlayerUtils.isNettyClient(this);
setBoundingBox(0.6f, 1.8f, 0.6f);

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

@ -90,6 +90,7 @@ public class PlayerPositionListener {
player.refreshPosition(newPosition.getX(), newPosition.getY(), newPosition.getZ());
player.refreshView(newPosition.getYaw(), newPosition.getPitch());
player.refreshOnGround(onGround);
player.sendPositionUpdate(false);
} else {
player.teleport(player.getPosition());
}