Skip to content

Commit 8ffc81a

Browse files
committed
Fix NPE for teleport events without target location
Fixes #2111
1 parent 16ea462 commit 8ffc81a

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ public void onItemHeldChange(PlayerItemHeldEvent event) {
350350

351351
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
352352
public void onPlayerTeleport(PlayerTeleportEvent event) {
353+
if (event.getTo() == null) {
354+
// The target location for PlayerTeleportEvents can be null.
355+
// Those events will be ignored by the server, so we can ignore them too.
356+
return;
357+
}
353358
Player player = event.getPlayer();
354359
if (com.sk89q.worldguard.bukkit.util.Entities.isNPC(player)) return;
355360
LocalPlayer localPlayer = getPlugin().wrapPlayer(player);

0 commit comments

Comments
 (0)