diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java index d5324b7280..18ac8d73db 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java @@ -84,6 +84,8 @@ public static boolean matches(String arg) { ///////////////// public dPlayer(OfflinePlayer player) { + if (player == null) return; + this.player_name = player.getName(); // Keep in a map to avoid multiple instances of a dPlayer per player. diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/Comparable.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/Comparable.java index d199d0230f..f636c8407c 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/Comparable.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/Comparable.java @@ -230,8 +230,8 @@ private void compare_as_strings() { outcome = false; - String comparable = (String) this.comparable; - String comparedto = (String) this.comparedto; + String comparable = String.valueOf(this.comparable); + String comparedto = String.valueOf(this.comparedto); if (comparable == null || comparedto == null) return; diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java index 51a2598e95..83530ca591 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java +++ b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java @@ -42,7 +42,6 @@ public void registerCoreTags() { new LocationTags(denizen); new SpecialCharacterTags(denizen); new TextTags(denizen); - new ForeignCharacterTags(denizen); } public static String tag(dPlayer player, dNPC npc, String arg) {