Fixed a problem where the 'config.yml' file was reset if players ente…

…red combat in unconfigured worlds.
CallVDois · Sep 14, 2024 · 4512276 · 4512276
1 parent 4cb3f25
commit 4512276
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/org/callv2/daynightpvp/commands/subcommands/AddWorldSubCommand.java b/src/main/java/org/callv2/daynightpvp/commands/subcommands/AddWorldSubCommand.java
@@ -88,7 +88,7 @@ private void addWorldToConfig(String worldName) {
         configFile.setValue("worlds." + worldName + ".vault.lose-money-on-death.only-at-night", true);
         configFile.setValue("worlds." + worldName + ".vault.lose-money-on-death.only-in-configured-worlds", true);
         configFile.setValue("worlds." + worldName + ".vault.lose-money-on-death.killer-reward-money", true);
-        configFile.setValue("worlds." + worldName + ".griefprevention.pvp-in-land", false);
+        configFile.setValue("worlds." + worldName + ".grief-prevention.pvp-in-land", false);
         configFile.saveConfig();
     }
 

diff --git a/src/main/java/org/callv2/daynightpvp/placeholder/PvpStatusPlaceholder.java b/src/main/java/org/callv2/daynightpvp/placeholder/PvpStatusPlaceholder.java
@@ -49,6 +49,8 @@ public boolean persist() {
     @Override
     public String onPlaceholderRequest(Player player, @NotNull String params) {
 
+        if (player == null) return langFile.getFeedbackError();
+
         if (params.equalsIgnoreCase("pvp_status_current_world")) {
             boolean pvpStatus;