Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-15 20:02:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix EntityTeleportPacket (#2442)

Browse Source
This commit is contained in:
GreatWyrm 2024-10-19 21:11:39 -07:00 committed by Matt Worzala
parent ac9615dbd5
commit 0605a87b5d
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1245,7 +1245,7 @@ public class Entity implements Viewable, Tickable, Schedulable, Snapshotable, Ev
final Chunk chunk = getChunk();
assert chunk != null;
if (distanceX > 8 || distanceY > 8 || distanceZ > 8) {
PacketViewableUtils.prepareViewablePacket(chunk, new EntityTeleportPacket(getEntityId(), position, isOnGround()), this);
PacketViewableUtils.prepareViewablePacket(chunk, new EntityTeleportPacket(getEntityId(), position, Vec.ZERO, 0, isOnGround()), this);
nextSynchronizationTick = synchronizationTicks + 1;
} else if (positionChange && viewChange) {
PacketViewableUtils.prepareViewablePacket(chunk, EntityPositionAndRotationPacket.getPacket(getEntityId(), position,
@ -1535,7 +1535,7 @@ public class Entity implements Viewable, Tickable, Schedulable, Snapshotable, Ev
@ApiStatus.Internal
protected void synchronizePosition() {
final Pos posCache = this.position;
PacketViewableUtils.prepareViewablePacket(currentChunk, new EntityTeleportPacket(getEntityId(), posCache, isOnGround()), this);
PacketViewableUtils.prepareViewablePacket(currentChunk, new EntityTeleportPacket(getEntityId(), posCache, Vec.ZERO, 0, isOnGround()), this);
if (posCache.yaw() != lastSyncedPosition.yaw()) {
PacketViewableUtils.prepareViewablePacket(currentChunk, new EntityHeadLookPacket(getEntityId(), position.yaw()), this);
}

37
src/main/java/net/minestom/server/network/packet/server/play/EntityTeleportPacket.java
View File

@ -1,30 +1,49 @@
package net.minestom.server.network.packet.server.play;
import net.minestom.server.coordinate.Point;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.coordinate.Vec;
import net.minestom.server.network.NetworkBuffer;
import net.minestom.server.network.packet.server.ServerPacket;
import org.jetbrains.annotations.NotNull;
import static net.minestom.server.network.NetworkBuffer.*;
public record EntityTeleportPacket(int entityId, Pos position, boolean onGround) implements ServerPacket.Play {
public record EntityTeleportPacket(int entityId, Pos position, Point delta, int flags, boolean onGround) implements ServerPacket.Play {
public static final int FLAG_X = 1;
public static final int FLAG_Y = 1 << 1;
public static final int FLAG_Z = 1 << 2;
public static final int FLAG_Y_ROT = 1 << 3;
public static final int FLAG_X_ROT = 1 << 4;
public static final int FLAG_DELTA_X = 1 << 5;
public static final int FLAG_DELTA_Y = 1 << 6;
public static final int FLAG_DELTA_Z = 1 << 7;
public static final int FLAG_ROTATE_DELTA = 1 << 8;
public static final int FLAG_DELTA = FLAG_DELTA_X | FLAG_DELTA_Y | FLAG_DELTA_Z | FLAG_ROTATE_DELTA;
public static final int FLAG_ROTATION = FLAG_X_ROT | FLAG_Y_ROT;
public static final int FLAG_ALL = FLAG_X | FLAG_Y | FLAG_Z | FLAG_ROTATION | FLAG_DELTA;
public static final NetworkBuffer.Type<EntityTeleportPacket> SERIALIZER = new NetworkBuffer.Type<>() {
@Override
public void write(@NotNull NetworkBuffer buffer, @NotNull EntityTeleportPacket value) {
buffer.write(VAR_INT, value.entityId);
buffer.write(DOUBLE, value.position.x());
buffer.write(DOUBLE, value.position.y());
buffer.write(DOUBLE, value.position.z());
buffer.write(BYTE, (byte) (value.position.yaw() * 256f / 360f));
buffer.write(BYTE, (byte) (value.position.pitch() * 256f / 360f));
buffer.write(VECTOR3D, value.position.asVec());
buffer.write(VECTOR3D, value.delta);
buffer.write(FLOAT, value.position.yaw());
buffer.write(FLOAT, value.position.pitch());
buffer.write(INT, value.flags);
buffer.write(BOOLEAN, value.onGround);
}
@Override
public @NotNull EntityTeleportPacket read(@NotNull NetworkBuffer buffer) {
return new EntityTeleportPacket(buffer.read(VAR_INT), new Pos(buffer.read(DOUBLE), buffer.read(DOUBLE), buffer.read(DOUBLE),
buffer.read(BYTE) * 360f / 256f, buffer.read(BYTE) * 360f / 256f),
buffer.read(BOOLEAN));
int entityId = buffer.read(VAR_INT);
// Order is x,y,z for position, then x,y,z for delta move, then yaw and pitch
Point absPosition = buffer.read(VECTOR3D);
Point deltaMovement = buffer.read(VECTOR3D);
return new EntityTeleportPacket(entityId, new Pos(absPosition, buffer.read(FLOAT), buffer.read(FLOAT)),
deltaMovement, buffer.read(INT), buffer.read(BOOLEAN));
}
};
}