Merge branch 'dev/patch' into fix-variables-data-bug

src/main/java/ch/njol/skript/structures/StructAliases.java

@@ -20,6 +20,7 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.Aliases;
+import ch.njol.skript.aliases.ScriptAliases;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -30,6 +31,7 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.entry.EntryContainer;
+import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
 
 @Name("Aliases")
@@ -54,7 +56,11 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
 		node.convertToEntries(0, "=");
 
 		// Initialize and load script aliases
-		Aliases.createScriptAliases(getParser().getCurrentScript()).parser.load(node);
+		Script script = getParser().getCurrentScript();
+		ScriptAliases scriptAliases = Aliases.getScriptAliases(script);
+		if (scriptAliases == null)
+			scriptAliases = Aliases.createScriptAliases(script);
+		scriptAliases.parser.load(node);
 
 		return true;
 	}

src/test/skript/tests/syntaxes/structures/StructAliases.sk

@@ -0,0 +1,9 @@
+aliases:
+	cool_dirt = dirt
+
+aliases:
+	cool_stone = stone
+
+test "script aliases":
+	assert cool_dirt is dirt with "custom dirt alias failed"
+	assert cool_stone is stone with "custom stone alias failed"