else if context tracking fix

DenizenScript · Feb 13, 2022 · 3c14045 · 3c14045
1 parent ec96f65
commit 3c14045
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java b/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java
@@ -225,7 +225,7 @@ public final ElementTag argForPrefixAsElement(String prefix, String defaultValue
 
     public ScriptEntryData entryData;
 
-    private ScriptQueue queue = null;
+    public ScriptQueue queue = null;
 
     public ScriptEntryInternal internal;
 

diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/FlagCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/FlagCommand.java
@@ -76,7 +76,7 @@ public FlagCommand() {
     // To do this, you can read raw flag data with the tag <@link tag FlaggableObject.flag_map> and the '__raw' prefix in a flag command. For example:
     // <code>
     // # Gather the original data
-    // - define playerdata <player.flag[flag1|flag2|taco|potato|waffle|etc]>
+    // - define playerdata <player.flag_map[flag1|flag2|taco|potato|waffle|etc]>
     // # Now reapply it elsewhere (eg a different Bungee server)
     // - flag <player> __raw:<[playerdata]>
     // </code>

diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/IfCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/IfCommand.java
@@ -114,6 +114,9 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
                     break;
                 }
                 scriptEntry.getResidingQueue().script_entries.removeFirst();
+                nextEntry.context = scriptEntry.context;
+                nextEntry.entryData = scriptEntry.entryData;
+                nextEntry.queue = scriptEntry.queue;
                 BracedData elseRef = getBracedCommands(nextEntry).get(0);
                 elseRef.entry = nextEntry;
                 elseRef.key = nextEntry.toString();