Don't try to teleport to a null world. Fixes BUKKIT-5145

This commit is contained in:
Travis Watkins 2013-12-14 17:23:34 -06:00
parent a565486ee1
commit 24ff27b408

View File

@ -1765,7 +1765,7 @@ public abstract class Entity {
EntityPortalEvent event = new EntityPortalEvent(this.getBukkitEntity(), enter, exit, agent);
event.useTravelAgent(useTravelAgent);
event.getEntity().getServer().getPluginManager().callEvent(event);
if (event.isCancelled() || event.getTo() == null || !this.isAlive()) {
if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null || !this.isAlive()) {
return;
}
exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo();