Skip to content

Remove spectator players' cameras when teleporting #13478

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
lucyydotp wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −1
Open

Remove spectator players' cameras when teleporting #13478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cd15c0
Remove spectator players' cameras when teleporting
lucyydotp Dec 31, 2025
14a87a5
Remove unneeded boundary comments, check for any non-self camera
lucyydotp Dec 31, 2025
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
14 changes: 13 additions & 1 deletion paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,19 @@ protected boolean teleport0(Location location, org.bukkit.event.player.PlayerTel
return false;
}

return super.teleport0(location, cause, flags);
Entity camera = this.getHandle().getCamera();
this.getHandle().setCamera(null);
if (this.getHandle() != this.getHandle().getCamera()) {
// If the camera is not the player after setting, the stop spectating event was likely cancelled, so stop the teleport
return false;
}

boolean teleported = super.teleport0(location, cause, flags);
if (!teleported) {
// If the teleport doesn't go through, restore the original camera
this.getHandle().setCamera(camera);
}
return teleported;
}

@Override
Expand Down
Loading