Bug fixes. dPlayer now allowing null fixed. Comparable comparing stri…

…ngs fixed.
DenizenScript · Jun 24, 2013 · f3c42b5 · f3c42b5
1 parent cd7daf2
commit f3c42b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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) {