Fix to FOLLOW.

DenizenScript · Apr 2, 2013 · c345b68 · c345b68
1 parent 03e65cc
commit c345b68
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -218,7 +218,7 @@ public void onEnable() {
         ws_helper.serverStartEvent();
 
         // Initialize ScoreboardAPI
-        ScoreboardAPI.api_instance = new ScoreboardAPI();
+        new ScoreboardAPI();
     }
 
     /*

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FollowCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FollowCommand.java
@@ -23,7 +23,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
             if (aH.matchesArg("STOP", arg))
                 scriptEntry.addObject("stop", true);
 
-            if (aH.matchesValueArg("LEAD", arg, aH.ArgumentType.Double))
+            else if (aH.matchesValueArg("LEAD", arg, aH.ArgumentType.Double))
                 scriptEntry.addObject("lead", aH.getDoubleFrom(arg));
 
             else throw new InvalidArgumentsException(dB.Messages.ERROR_UNKNOWN_ARGUMENT, arg);

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java
@@ -70,7 +70,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
                 // Set logic (Optional, default is REGULAR)
                 if (arg.startsWith("!")) {
                     comparables.get(index).logic = Logic.NEGATIVE;
-                    if (arg.equals("!"))
+                    if ( arg.length() == 1)
                         continue;
                     if (arg.equals("!="))
                         arg = "==";

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScoreboardCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ScoreboardCommand.java
@@ -109,6 +109,9 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
                 break;
 
             case SET:
+                dB.echoDebug(id);
+                dB.echoDebug(value);
+                dB.echoDebug(num.toString());
                 ScoreboardAPI.getInstance().getScoreboard(id).setItem(value, num);
                 break;
 

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/scoreboard/ScoreboardAPI.java b/src/main/java/net/aufdemrand/denizen/utilities/scoreboard/ScoreboardAPI.java
@@ -1,5 +1,6 @@
 package net.aufdemrand.denizen.utilities.scoreboard;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -13,7 +14,7 @@ public class ScoreboardAPI {
 
     public static ScoreboardAPI api_instance = null;
 
-    public static List<Scoreboard> scoreboards = new LinkedList<Scoreboard>();
+    public static List<Scoreboard> scoreboards = new ArrayList<Scoreboard>();
 
     public List<Scoreboard> getScoreboards() {
         return scoreboards;
@@ -22,7 +23,7 @@ public List<Scoreboard> getScoreboards() {
 	Format format = new Format(this);
 
     public static ScoreboardAPI getInstance() {
-        return ScoreboardAPI.api_instance;
+        return api_instance;
     }
 
     public Scoreboard createScoreboard(String name, int priority) {
@@ -36,6 +37,10 @@ public Scoreboard createScoreboard(String name, int priority) {
         return s;
     }
 
+    public ScoreboardAPI() {
+        api_instance = this;
+    }
+
     public Scoreboard getScoreboard(String name) {
         for (Scoreboard s : scoreboards) {
             if (s.getName() == name) {