Skip to content

fix(movement): release prediction wait after server teleport #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexProgrammerDE wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −8
Open

fix(movement): release prediction wait after server teleport #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/main/java/net/raphimc/viabedrock/api/model/entity/ClientPlayerEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class ClientPlayerEntity extends PlayerEntity {

// Position syncing
private int pendingTeleportId;
private int authoritativeTeleportId;
private boolean waitingForPositionSync;
private boolean serverSideTeleportConfirmed;

Expand Down Expand Up @@ -117,9 +118,13 @@ public void sendPlayerPositionPacketToClient(final Set<Relative> relatives) {
}

public void writePlayerPositionPacketToClient(final PacketWrapper wrapper, final Set<Relative> relatives, final boolean fakeTeleport) {
this.pendingTeleportId = this.teleportId.getAndIncrement();
this.serverSideTeleportConfirmed = false;
this.pendingTeleportId = this.teleportId.getAndIncrement() * (fakeTeleport ? -1 : 1);
if (!fakeTeleport) {
this.authoritativeTeleportId = this.pendingTeleportId;
}

wrapper.write(Types.VAR_INT, this.pendingTeleportId * (fakeTeleport ? -1 : 1)); // teleport id
wrapper.write(Types.VAR_INT, this.pendingTeleportId); // teleport id
wrapper.write(Types.DOUBLE, relatives.contains(Relative.X) ? 0D : (double) this.position.x()); // x
wrapper.write(Types.DOUBLE, relatives.contains(Relative.Y) ? 0D : (double) (this.position.y() - this.eyeOffset())); // y
wrapper.write(Types.DOUBLE, relatives.contains(Relative.Z) ? 0D : (double) this.position.z()); // z
Expand Down Expand Up @@ -212,13 +217,18 @@ public void updatePlayerPosition(final float yaw, final float pitch, final short
}

public void confirmTeleport(final int teleportId) {
if (teleportId < 0) { // Fake teleport
if (this.pendingTeleportId == -teleportId) {
this.pendingTeleportId = 0;
this.waitingForPositionSync = false;
if (teleportId == 0) {
return;
}
if (this.pendingTeleportId == teleportId) {
this.pendingTeleportId = 0;
this.waitingForPositionSync = false;
if (teleportId > 0) {
this.serverSideTeleportConfirmed = true;
}
} else {
this.serverSideTeleportConfirmed = true;
}
if (teleportId > 0 && this.authoritativeTeleportId == teleportId) {
this.authoritativeTeleportId = 0;
if (!this.initiallySpawned) {
ViaBedrock.getPlatform().getLogger().log(Level.WARNING, "Received teleport confirm for teleport id " + teleportId + " but player is not spawned yet");
}
Expand Down