Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-02 11:22:01 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the PLAYER_TELEPORT event so event.getTo().getWorld() is correct. (#451)

Browse Source 
By: Byron Shelden <byron.shelden@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2011-03-22 23:50:14 -07:00
parent d5ca2267db
commit 54d451934e
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -107,13 +107,23 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return ((WorldServer)entity.world).getWorld(); return ((WorldServer)entity.world).getWorld();
} }
public void teleportTo(Location location) { public boolean teleport(Location location) {
entity.world = ((CraftWorld)location.getWorld()).getHandle(); entity.world = ((CraftWorld)location.getWorld()).getHandle();
entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
// entity.b() throws no event, and so cannot be cancelled
return true;
}
public boolean teleport(org.bukkit.entity.Entity destination) {
return teleport(destination.getLocation());
}
public void teleportTo(Location location) {
teleport(location);
} }
public void teleportTo(org.bukkit.entity.Entity destination) { public void teleportTo(org.bukkit.entity.Entity destination) {
teleportTo(destination.getLocation()); teleport(destination);
} }
public int getEntityId() { public int getEntityId() {

36
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -137,18 +137,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
@Override @Override
public void teleportTo(Location location) { public boolean teleport(Location location) {
WorldServer oldWorld = ((CraftWorld)getWorld()).getHandle(); WorldServer oldWorld = ((CraftWorld)getWorld()).getHandle();
WorldServer newWorld = ((CraftWorld)location.getWorld()).getHandle(); WorldServer newWorld = ((CraftWorld)location.getWorld()).getHandle();
ServerConfigurationManager manager = server.getHandle(); ServerConfigurationManager manager = server.getHandle();
EntityPlayer entity = getHandle(); EntityPlayer entity = getHandle();
boolean teleportSuccess;
if (oldWorld != newWorld) { if (oldWorld != newWorld) {
manager.c.k.a(entity);
manager.c.k.b(entity);
oldWorld.manager.b(entity);
manager.b.remove(entity);
oldWorld.e(entity);
EntityPlayer newEntity = new EntityPlayer(manager.c, newWorld, entity.name, new ItemInWorldManager(newWorld)); EntityPlayer newEntity = new EntityPlayer(manager.c, newWorld, entity.name, new ItemInWorldManager(newWorld));
@ -160,17 +156,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
newEntity.inventory.e = newEntity; newEntity.inventory.e = newEntity;
newEntity.activeContainer = entity.activeContainer; newEntity.activeContainer = entity.activeContainer;
newEntity.defaultContainer = entity.defaultContainer; newEntity.defaultContainer = entity.defaultContainer;
newEntity.locX = location.getX();
newEntity.locY = location.getY();
newEntity.locZ = location.getZ();
newWorld.u.d((int) location.getBlockX() >> 4, (int) location.getBlockZ() >> 4); newWorld.u.d((int) location.getBlockX() >> 4, (int) location.getBlockZ() >> 4);
newEntity.a.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); teleportSuccess = newEntity.a.teleport(location);
newWorld.manager.a(newEntity);
newWorld.a(newEntity);
manager.b.add(newEntity);
entity.a.e = newEntity; if (teleportSuccess) {
this.entity = newEntity; manager.c.k.a(entity);
manager.c.k.b(entity);
oldWorld.manager.b(entity);
manager.b.remove(entity);
oldWorld.e(entity);
newWorld.manager.a(newEntity);
newWorld.a(newEntity);
manager.b.add(newEntity);
entity.a.e = newEntity;
this.entity = newEntity;
}
return teleportSuccess;
} else { } else {
entity.a.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); return entity.a.teleport(location);
} }
} }