mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 01:05:12 +00:00
Merge branch 'dev' into syntax-highlighter-unified
This commit is contained in:
commit
b63d76b6c0
71 files changed
+3781
-400
No files matched your search
@@ -81,7 +81,7 @@ public class DataScript implements IScriptHandlerPacket {
|
||||
public void readFromNBT(NBTTagCompound compound) {
|
||||
scripts = readScript(compound.getTagList("ScriptsContainers", 10));
|
||||
this.scriptLanguage = compound.getString("ScriptLanguage");
|
||||
if (!ScriptController.Instance.languages.containsKey(scriptLanguage)) {
|
||||
if (scriptLanguage == null || scriptLanguage.isEmpty()) {
|
||||
if (!ScriptController.Instance.languages.isEmpty()) {
|
||||
this.scriptLanguage = (String) ScriptController.Instance.languages.keySet().toArray()[0];
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user