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

Properly update the client position when switching vehicle

Browse Source
This commit is contained in:
TheMode 2021-08-28 11:37:42 +02:00
parent 34ba838ab5
commit 9739403ff4
1 changed files with 8 additions and 6 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

@ -882,16 +882,15 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
public void addPassenger(@NotNull Entity entity) { public void addPassenger(@NotNull Entity entity) {
Check.stateCondition(instance == null, "You need to set an instance using Entity#setInstance"); Check.stateCondition(instance == null, "You need to set an instance using Entity#setInstance");
Check.stateCondition(entity == getVehicle(), "Cannot add the entity vehicle as a passenger"); Check.stateCondition(entity == getVehicle(), "Cannot add the entity vehicle as a passenger");
final Entity vehicle = entity.getVehicle(); final Entity vehicle = entity.getVehicle();
if (vehicle != null) { if (vehicle != null) {
vehicle.removePassenger(entity); vehicle.removePassenger(entity);
} }
this.passengers.add(entity); this.passengers.add(entity);
entity.vehicle = this; entity.vehicle = this;
sendPacketToViewersAndSelf(getPassengersPacket()); sendPacketToViewersAndSelf(getPassengersPacket());
entity.refreshPosition(position);
entity.synchronizePosition(true);
} }
/** /**
@ -903,11 +902,14 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
*/ */
public void removePassenger(@NotNull Entity entity) { public void removePassenger(@NotNull Entity entity) {
Check.stateCondition(instance == null, "You need to set an instance using Entity#setInstance"); Check.stateCondition(instance == null, "You need to set an instance using Entity#setInstance");
if (!passengers.remove(entity)) return;
if (!passengers.remove(entity))
return;
entity.vehicle = null; entity.vehicle = null;
sendPacketToViewersAndSelf(getPassengersPacket()); sendPacketToViewersAndSelf(getPassengersPacket());
if (entity instanceof Player) {
Player player = (Player) entity;
player.getPlayerConnection().sendPacket(new PlayerPositionAndLookPacket(player.getPosition(),
(byte) 0x00, player.getNextTeleportId(), true));
}
} }
/** /**