13
0
geforkt von Mirrors/Paper

Fixed PlayerChangedWorld event.

Moved the call of PlayerChangedWorldEvent to more appropriate location
Dieser Commit ist enthalten in:
sunkid 2011-10-02 11:30:05 -07:00 committet von EvilSeph
Ursprung 3b2347093f
Commit 3a224266c4

Datei anzeigen

@ -283,10 +283,6 @@ public class ServerConfigurationManager {
entityplayer1.spawnIn(worldserver); entityplayer1.spawnIn(worldserver);
entityplayer1.dead = false; entityplayer1.dead = false;
entityplayer1.netServerHandler.teleport(new Location(worldserver.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch)); entityplayer1.netServerHandler.teleport(new Location(worldserver.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch));
org.bukkit.event.player.PlayerChangedWorldEvent event = new org.bukkit.event.player.PlayerChangedWorldEvent((Player) entityplayer1.getBukkitEntity(), fromWorld);
Bukkit.getServer().getPluginManager().callEvent(event);
// CraftBukkit end // CraftBukkit end
this.a(entityplayer1, worldserver); this.a(entityplayer1, worldserver);
this.getPlayerManager(entityplayer1.dimension).addPlayer(entityplayer1); this.getPlayerManager(entityplayer1.dimension).addPlayer(entityplayer1);
@ -294,6 +290,12 @@ public class ServerConfigurationManager {
this.players.add(entityplayer1); this.players.add(entityplayer1);
this.updateClient(entityplayer1); // CraftBukkit this.updateClient(entityplayer1); // CraftBukkit
entityplayer1.w(); entityplayer1.w();
// CraftBukkit start - don't fire on respawn
if (fromWorld != location.getWorld()) {
org.bukkit.event.player.PlayerChangedWorldEvent event = new org.bukkit.event.player.PlayerChangedWorldEvent((Player) entityplayer1.getBukkitEntity(), fromWorld);
Bukkit.getServer().getPluginManager().callEvent(event);
}
// CraftBukkit end
return entityplayer1; return entityplayer1;
} }