mirror/Javascript-Expansion
1
0
Fork 1
mirror of https://github.com/PlaceholderAPI/Javascript-Expansion.git synced 2025-05-23 18:42:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I guess This works

Browse Source
This commit is contained in:
extendedclip 2018-03-10 13:20:42 -05:00
parent 34a5893b8a
commit 385dcc9af3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptPlaceholder.java
View File

@ -69,10 +69,9 @@ public class JavascriptPlaceholder {
} catch (SecurityException e) { } catch (SecurityException e) {
e.printStackTrace(); e.printStackTrace();
} }
data = new ScriptData();
dataFile = new File(FILEDIR, identifier + "_data.yml"); dataFile = new File(FILEDIR, identifier + "_data.yml");
engine.put("Data", data);
engine.put("Data", getData());
engine.put("BukkitServer", Bukkit.getServer()); engine.put("BukkitServer", Bukkit.getServer());
engine.put("Expansion", JavascriptExpansion.getInstance()); engine.put("Expansion", JavascriptExpansion.getInstance());
engine.put("Placeholder", this); engine.put("Placeholder", this);
@ -118,13 +117,13 @@ public class JavascriptPlaceholder {
return result != null ? PlaceholderAPI.setBracketPlaceholders(p, result.toString()) : ""; return result != null ? PlaceholderAPI.setBracketPlaceholders(p, result.toString()) : "";
} catch (ScriptException ex) { } catch (ScriptException ex) {
PlaceholderAPIPlugin.getInstance().getLogger().severe("Error in javascript for placeholder - " + this.identifier);
ex.printStackTrace(); ex.printStackTrace();
} }
return "Script error"; return "Script error";
} }
public ScriptData getData() { public ScriptData getData() {
// this should never be null but just in case setData(null) is called
if (data == null) { if (data == null) {
data = new ScriptData(); data = new ScriptData();
} }
@ -136,6 +135,7 @@ public class JavascriptPlaceholder {
} }
public boolean loadData() { public boolean loadData() {
cfg = new YamlConfiguration(); cfg = new YamlConfiguration();
if (!dataFile.exists()) { if (!dataFile.exists()) {
@ -157,7 +157,11 @@ public class JavascriptPlaceholder {
return false; return false;
} }
ScriptData data = new ScriptData(); if (data == null) {
data = new ScriptData();
} else {
data.clear();
}
keys.stream().forEach(k -> { keys.stream().forEach(k -> {
data.set(k, cfg.get(k)); data.set(k, cfg.get(k));