diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java index 74806605f..ece765631 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java @@ -74,7 +74,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 { diff --git a/src/main/java/noppes/npcs/controllers/data/MultiScriptHandler.java b/src/main/java/noppes/npcs/controllers/data/MultiScriptHandler.java index d4b4c027b..699b0542d 100644 --- a/src/main/java/noppes/npcs/controllers/data/MultiScriptHandler.java +++ b/src/main/java/noppes/npcs/controllers/data/MultiScriptHandler.java @@ -55,7 +55,7 @@ public abstract class MultiScriptHandler extends ScriptHandler implements IScrip * Normalize the language to a valid one if the current language is not available. */ protected void normalizeLanguage() { - if (!ScriptController.Instance.languages.containsKey(this.scriptLanguage)) { + if (this.scriptLanguage == null || this.scriptLanguage.isEmpty()) { if (!ScriptController.Instance.languages.isEmpty()) { this.scriptLanguage = (String) ScriptController.Instance.languages.keySet().toArray()[0]; } else { diff --git a/src/main/java/noppes/npcs/controllers/data/SingleScriptHandler.java b/src/main/java/noppes/npcs/controllers/data/SingleScriptHandler.java index 00c273bca..8b30ee3ae 100644 --- a/src/main/java/noppes/npcs/controllers/data/SingleScriptHandler.java +++ b/src/main/java/noppes/npcs/controllers/data/SingleScriptHandler.java @@ -142,7 +142,7 @@ public abstract class SingleScriptHandler extends ScriptHandler { * Normalize the language to a valid one if the current language is not available. */ protected void normalizeLanguage() { - if (!ScriptController.Instance.languages.containsKey(this.getLanguage())) { + if (this.getLanguage() == null || this.getLanguage().isEmpty()) { if (!ScriptController.Instance.languages.isEmpty()) { this.setLanguage((String) ScriptController.Instance.languages.keySet().toArray()[0]); } else {