Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-20 05:20:07 +01:00
No teleporting people back into the server. Fixes BUKKIT-2298
Stale player references will add a player back into the world when teleporting them, causing a cascade of issues relating to ghost entities and servers failing to stop.
Dieser Commit ist enthalten in:
Ursprung
d23c97429f
Commit
d039986be7
@ -345,7 +345,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cause) {
|
public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cause) {
|
||||||
if (getHandle().netServerHandler == null) return false;
|
EntityPlayer entity = getHandle();
|
||||||
|
if (entity.netServerHandler == null || entity.netServerHandler.disconnected) return false;
|
||||||
|
|
||||||
// From = Players current Location
|
// From = Players current Location
|
||||||
Location from = this.getLocation();
|
Location from = this.getLocation();
|
||||||
@ -365,8 +366,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|||||||
// Grab the To and From World Handles.
|
// Grab the To and From World Handles.
|
||||||
WorldServer fromWorld = ((CraftWorld) from.getWorld()).getHandle();
|
WorldServer fromWorld = ((CraftWorld) from.getWorld()).getHandle();
|
||||||
WorldServer toWorld = ((CraftWorld) to.getWorld()).getHandle();
|
WorldServer toWorld = ((CraftWorld) to.getWorld()).getHandle();
|
||||||
// Grab the EntityPlayer
|
|
||||||
EntityPlayer entity = getHandle();
|
|
||||||
|
|
||||||
// Check if the fromWorld and toWorld are the same.
|
// Check if the fromWorld and toWorld are the same.
|
||||||
if (fromWorld == toWorld) {
|
if (fromWorld == toWorld) {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren