update for latest dev builds, fixes #208

DenizenScript · Jun 25, 2018 · dee6314 · dee6314
1 parent e20784c
commit dee6314
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <craftbukkit.version>1.11-R0.1-SNAPSHOT</craftbukkit.version>
         <citizens.version>2.0.21-SNAPSHOT</citizens.version>
-        <denizen.version>1.0.1-SNAPSHOT</denizen.version>
+        <denizen.version>1.0.2-SNAPSHOT</denizen.version>
     </properties>
 
     <repositories>

diff --git a/bukkit/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java b/bukkit/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java
@@ -8,11 +8,13 @@
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.aH;
 import net.aufdemrand.denizencore.objects.dList;
+import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.BracedCommand;
 import net.aufdemrand.denizencore.utilities.debugging.dB;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -101,8 +103,12 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
             for (ScriptEntry entry : bracedCommands) {
                 scriptEntries.add(new SimpleScriptEntry(entry.getCommandName(), entry.getOriginalArguments()));
             }
-            Map<String, String> definitions = scriptEntry.getResidingQueue().getAllDefinitions();
-            ClientPacketOutScript packet = new ClientPacketOutScript(serverNames, debug, scriptEntries, definitions);
+            Map<String, dObject> definitions = scriptEntry.getResidingQueue().getAllDefinitions();
+            Map<String, String> toSend = new HashMap<String, String>();
+            for (Map.Entry<String, dObject> def : definitions.entrySet()) {
+                toSend.put(def.getKey(), def.getValue().toString());
+            }
+            ClientPacketOutScript packet = new ClientPacketOutScript(serverNames, debug, scriptEntries, toSend);
             BungeeSupport.getSocketClient().trySend(packet);
         }
         else {

diff --git a/...it/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java b/...it/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java
@@ -9,6 +9,7 @@
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.ObjectFetcher;
 import net.aufdemrand.denizencore.objects.aH;
+import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizencore.scripts.commands.Holdable;
@@ -90,9 +91,14 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
             }
             int id = nextId++;
             waitingEntries.put(id, scriptEntry);
+            Map<String, dObject> definitions = scriptEntry.getResidingQueue().getAllDefinitions();
+            Map<String, String> toSend = new HashMap<String, String>();
+            for (Map.Entry<String, dObject> def : definitions.entrySet()) {
+                toSend.put(def.getKey(), def.getValue().toString());
+            }
             BungeeSupport.getSocketClient().trySend(new ClientPacketOutTag(server.getName(), id, tag.asString(),
                     scriptEntry.shouldDebug(), scriptEntry.shouldDebug(),
-                    scriptEntry.getResidingQueue().getAllDefinitions()));
+                   toSend));
         }
         else {
             dB.echoError("Server is not connected to a BungeeCord Socket.");

diff --git a/bukkit/src/main/java/com/denizenscript/depenizen/bukkit/support/SupportManager.java b/bukkit/src/main/java/com/denizenscript/depenizen/bukkit/support/SupportManager.java
@@ -22,13 +22,11 @@
 public class SupportManager {
 
     private final DepenizenPlugin depenizen;
-    private final PropertyParser propertyParser;
     private final Map<String, Support> additionalTags;
     private boolean hasNewObjects = false;
 
     public SupportManager(DepenizenPlugin depenizen) {
         this.depenizen = depenizen;
-        this.propertyParser = DenizenAPI.getCurrentInstance().getPropertyParser();
         this.additionalTags = new HashMap<String, Support>();
         TagManager.registerTagEvents(this);
     }
@@ -47,7 +45,7 @@ public void register(Support support) {
                 if (obj.equals(dNPC.class) && Depends.citizens == null) {
                     continue;
                 }
-                propertyParser.registerProperty(prop.getKey(), obj);
+                PropertyParser.registerProperty(prop.getKey(), obj);
             }
         }
         if (support.hasEvents()) {

diff --git a/...t/src/main/java/com/denizenscript/depenizen/bukkit/support/bungee/BukkitSocketClient.java b/...t/src/main/java/com/denizenscript/depenizen/bukkit/support/bungee/BukkitSocketClient.java
@@ -16,6 +16,8 @@
 import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.exceptions.ScriptEntryCreationException;
+import net.aufdemrand.denizencore.objects.ObjectFetcher;
+import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.scripts.ScriptRegistry;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
@@ -26,10 +28,7 @@
 import org.bukkit.Bukkit;
 
 import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class BukkitSocketClient extends SocketClient {
 
@@ -118,6 +117,14 @@ public void handleUpdateServer(String serverName, boolean registered) {
         }
     }
 
+    public Map<String, dObject> objectify(Map<String, String> defs) {
+        Map<String, dObject> toret = new HashMap<String, dObject>();
+        for (Map.Entry<String, String> def : defs.entrySet()) {
+            toret.put(def.getKey(), ObjectFetcher.pickObjectFor(def.getValue()));
+        }
+        return toret;
+    }
+
     @Override
     protected void handleScript(boolean shouldDebug, List<SimpleScriptEntry> scriptEntries, Map<String, String> definitions) {
         List<ScriptEntry> scriptEntryList = new ArrayList<ScriptEntry>();
@@ -134,7 +141,7 @@ protected void handleScript(boolean shouldDebug, List<SimpleScriptEntry> scriptE
             return;
         }
         ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId("BUNGEE_CMD")).addEntries(scriptEntryList);
-        queue.getAllDefinitions().putAll(definitions);
+        queue.getAllDefinitions().putAll(objectify(definitions));
         queue.start();
     }
 
@@ -152,14 +159,14 @@ protected void handleRunScript(String scriptName, Map<String, String> definition
             scriptEntry.setScript("").fallbackDebug = fullDebug;
         }
         ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId(scriptContainer.getName())).addEntries(scriptEntries);
-        queue.getAllDefinitions().putAll(definitions);
+        queue.getAllDefinitions().putAll(objectify(definitions));
         queue.start();
     }
 
     @Override
     protected String handleTag(String tag, boolean fullDebug, boolean minimalDebug, Map<String, String> definitions) {
         BukkitTagContext tagContext = new BukkitTagContext(null, null, false, null, fullDebug, null);
-        tagContext.definitionProvider.getAllDefinitions().putAll(definitions);
+        tagContext.definitionProvider.getAllDefinitions().putAll(objectify(definitions));
         return TagManager.tag(tag, tagContext);
     }