From bf8ef398718888088a4b258d3ab680f24f6cd9b8 Mon Sep 17 00:00:00 2001 From: sk89q Date: Thu, 14 Aug 2014 15:17:00 -0700 Subject: [PATCH] Handle null players in shim method of GlobalRegionManager. --- .../com/sk89q/worldguard/protection/GlobalRegionManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java index d55181cf..488edb94 100644 --- a/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java +++ b/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java @@ -214,7 +214,9 @@ public boolean allows(StateFlag flag, Location location) { */ @Deprecated public boolean allows(StateFlag flag, Location location, @Nullable LocalPlayer player) { - if (player instanceof BukkitPlayer) { + if (player == null) { + return createQuery().testState(location, null, flag); + } else if (player instanceof BukkitPlayer) { Player p = ((BukkitPlayer) player).getPlayer(); return createQuery().testState(location, p, flag); } else {