Merge pull request #389 from Brokkonaut/fix-npe-BukkitOfflinePlayer

Fix NPE in WorldGuardPlugin.wrapOfflinePlayer()
EngineHub · Oct 8, 2018 · e0b91e9 · e0b91e9
2 parents 7e0ff24 + be426e9
commit e0b91e9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java
@@ -41,7 +41,7 @@ public BukkitPlayer(WorldGuardPlugin plugin, Player player) {
         super((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"), player);
         this.plugin = plugin;
         // getName() takes longer than before in newer versions of Minecraft
-        this.name = player.getName();
+        this.name = player == null ? null : player.getName();
         this.silenced = silenced;
     }