add server save and save_citizens mechanisms

DenizenScript · Mar 14, 2019 · ce6a50e · ce6a50e
1 parent d8a14ed
commit ce6a50e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java
@@ -53,8 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) {
 
     @Override
     public boolean matches(ScriptPath path) {
-        String lower = path.eventLower;
-        String item_test = CoreUtilities.getXthArg(0, lower);
+        String item_test = CoreUtilities.getXthArg(0, path.eventLower);
 
         if (!tryItem(item, item_test)) {
             return false;

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java b/plugin/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java
@@ -37,6 +37,7 @@
 import net.aufdemrand.denizencore.utilities.javaluator.DoubleEvaluator;
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.CitizensAPI;
+import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.*;
 import org.bukkit.block.Biome;
@@ -1621,6 +1622,32 @@ public static void adjustServer(Mechanism mechanism) {
             Bukkit.spigot().restart();
         }
 
+        // <--[mechanism]
+        // @object server
+        // @name save
+        // @input None
+        // @description
+        // Immediately saves the Denizen saves files.
+        // @tags
+        // None
+        // -->
+        if (mechanism.matches("save")) {
+            DenizenAPI.getCurrentInstance().saveSaves();
+        }
+
+        // <--[mechanism]
+        // @object server
+        // @name save_citizens
+        // @input None
+        // @description
+        // Immediately saves the Citizens saves files.
+        // @tags
+        // None
+        // -->
+        if (Depends.citizens != null && mechanism.matches("save_citizens")) {
+            Depends.citizens.storeNPCs(new CommandContext(new String[0]));
+        }
+
         // <--[mechanism]
         // @object server
         // @name shutdown