From 2e92cd9a12cc8aacc66f1456420cf90cb09dcf03 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 11 May 2014 11:24:20 +0100 Subject: [PATCH] Don't fire PlayerPortalEvent when we don't have a target diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index a4a59ee..a033f07 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -609,6 +609,12 @@ public abstract class PlayerList { } TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getTravelAgent() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins + // Spigot start + if ( exit == null ) + { + return; + } + // Spigot end PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause); event.useTravelAgent(useTravelAgent); Bukkit.getServer().getPluginManager().callEvent(event); -- 1.9.1