Fix errors in 'horse jumps' event

Lists are acting up, use a secondary list to prevent errors.
DenizenScript · Dec 14, 2013 · 8c64b4e · 8c64b4e
1 parent b392174
commit 8c64b4e
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 29 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/EventManager.java b/src/main/java/net/aufdemrand/denizen/events/EventManager.java
@@ -147,7 +147,9 @@ private static CommandMap getCommandMap() {
     }
 
 
-    public static List<String> trimEvents(List<String> event) {
+    public static List<String> trimEvents(List<String> original) {
+        List<String> event = new ArrayList<String>();
+        event.addAll(original);
         List<String> parsed = new ArrayList<String>();
 
         if (dB.showEventsTrimming) dB.echoApproval("Trimming world events '" + event.toString() + '\'');

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -1334,22 +1334,21 @@ public void adjust(Mechanism mechanism) {
         if (mechanism.matches("player_list_name")) {
             getPlayerEntity().setPlayerListName(value.asString());
         }
-        
+
         // <--[mechanism]
         // @object dPlayer
         // @name display_name
         // @input Element
         // @description
-        // Sets the name displayed for the player when chatting. Can be overridden 
-        // by plugins like Essentials if they are not configured correctly
+        // Sets the name displayed for the player when chatting.
         // @tags
         // <player.name.display>
         // -->
         if (mechanism.matches("display_name")) {
             getPlayerEntity().setDisplayName(value.asString());
             return;
         }
-        
+
         // <--[mechanism]
         // @object dPlayer
         // @name time

diff --git a/...denizen/objects/properties/EntityAge.java → .../objects/properties/Entity/EntityAge.java b/...denizen/objects/properties/EntityAge.java → .../objects/properties/Entity/EntityAge.java
@@ -1,9 +1,10 @@
-package net.aufdemrand.denizen.objects.properties;
+package net.aufdemrand.denizen.objects.properties.Entity;
 
 
 import net.aufdemrand.denizen.objects.Element;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dObject;
+import net.aufdemrand.denizen.objects.properties.Property;
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.citizensnpcs.api.npc.NPC;
@@ -102,9 +103,9 @@ public boolean getLock() {
     @Override
     public String getPropertyString() {
         if (getAge() != 1)
-            return getPropertyId() + '=' + (getAge() == 0
-                    ? "baby" : getAge() + ';');
-        else return PropertyParser.NONE;
+            return String.valueOf(getAge());
+        else
+            return null;
     }
 
     @Override

diff --git a/...izen/objects/properties/EntityFramed.java → ...jects/properties/Entity/EntityFramed.java b/...izen/objects/properties/EntityFramed.java → ...jects/properties/Entity/EntityFramed.java
@@ -1,10 +1,11 @@
-package net.aufdemrand.denizen.objects.properties;
+package net.aufdemrand.denizen.objects.properties.Entity;
 
 
 import net.aufdemrand.denizen.objects.Element;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.objects.dObject;
+import net.aufdemrand.denizen.objects.properties.Property;
 import net.aufdemrand.denizen.tags.Attribute;
 import org.bukkit.Rotation;
 import org.bukkit.entity.*;
@@ -55,9 +56,12 @@ public dItem getItem() {
 
     @Override
     public String getPropertyString() {
-        return getPropertyId() + '=' + getItem().getMaterial().identify()
-                + (getItemFrameEntity().getRotation() == Rotation.NONE ? ';'
-                : '|' + getItemFrameEntity().getRotation().name().toLowerCase() + ';');
+        if (hasItem())
+            return getItem().getMaterial().identify()
+                + (getItemFrameEntity().getRotation() == Rotation.NONE ? ""
+                : '|' + getItemFrameEntity().getRotation().name().toLowerCase());
+        else
+            return null;
     }
 
     @Override

diff --git a/...en/objects/properties/EntityInfected.java → ...cts/properties/Entity/EntityInfected.java b/...en/objects/properties/EntityInfected.java → ...cts/properties/Entity/EntityInfected.java
@@ -1,9 +1,10 @@
-package net.aufdemrand.denizen.objects.properties;
+package net.aufdemrand.denizen.objects.properties.Entity;
 
 
 import net.aufdemrand.denizen.objects.Element;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dObject;
+import net.aufdemrand.denizen.objects.properties.Property;
 import net.aufdemrand.denizen.tags.Attribute;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.trait.ZombieModifier;
@@ -88,9 +89,8 @@ else if (infected.getBukkitEntity() instanceof Zombie) {
     @Override
     public String getPropertyString() {
         if (isInfected())
-            return getPropertyId();
-        // Don't describe if not infected.. this is unnecessary.
-        else return PropertyParser.NONE;
+            return "true";
+        else return null;
     }
 
     @Override

diff --git a/.../objects/properties/EntityProfession.java → ...s/properties/Entity/EntityProfession.java b/.../objects/properties/EntityProfession.java → ...s/properties/Entity/EntityProfession.java
@@ -1,9 +1,10 @@
-package net.aufdemrand.denizen.objects.properties;
+package net.aufdemrand.denizen.objects.properties.Entity;
 
 
 import net.aufdemrand.denizen.objects.Element;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dObject;
+import net.aufdemrand.denizen.objects.properties.Property;
 import net.aufdemrand.denizen.tags.Attribute;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Villager;
@@ -52,7 +53,7 @@ public void setProfession(Villager.Profession profession) {
 
     @Override
     public String getPropertyString() {
-        return getPropertyId() + '=' + getProfession().name().toLowerCase() + ';';
+        return getProfession().name().toLowerCase();
     }
 
     @Override

diff --git a/...denizen/objects/properties/ItemColor.java → ...en/objects/properties/Item/ItemColor.java b/...denizen/objects/properties/ItemColor.java → ...en/objects/properties/Item/ItemColor.java
@@ -1,18 +1,19 @@
-package net.aufdemrand.denizen.objects.properties;
+package net.aufdemrand.denizen.objects.properties.Item;
 
 
 import net.aufdemrand.denizen.objects.dColor;
 import net.aufdemrand.denizen.objects.dItem;
 import net.aufdemrand.denizen.objects.dObject;
+import net.aufdemrand.denizen.objects.properties.Property;
 import net.aufdemrand.denizen.tags.Attribute;
-import org.bukkit.Color;
+import org.bukkit.DyeColor;
 import org.bukkit.material.Colorable;
 
 public class ItemColor implements Property {
 
     public static boolean describes(dObject item) {
-        if (!(item instanceof dItem)) return false;
-        return ((dItem) item).getItemStack() instanceof Colorable;
+        return item instanceof dItem
+                && ((dItem) item).getItemStack() instanceof Colorable;
     }
 
     public static ItemColor getFrom(dItem item) {
@@ -21,16 +22,19 @@ public static ItemColor getFrom(dItem item) {
     }
 
 
-    private ItemColor(dItem item) {
-        colorable = item;
+    private ItemColor(dItem _item) {
+        item = _item;
+        color = getColor();
     }
 
-    dItem colorable;
+    dItem item;
     dColor color;
 
     public dColor getColor() {
-        return new dColor(Color.RED);
-
+        if (((Colorable)item).getColor() != DyeColor.WHITE)
+            return new dColor(((Colorable) item).getColor());
+        else
+            return null;
     }
 
     @Override
@@ -44,7 +48,7 @@ public String getAttribute(Attribute attribute) {
 
     @Override
     public String getPropertyString() {
-        return getPropertyId() + '=' + color.identify() + ';';
+        return color.identify();
     }
 
     @Override