More polish and bugfixes.

Wertik · Jul 9, 2020 · c9d65c2 · c9d65c2
1 parent 75b1939
commit c9d65c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/nl/aurorion/blockregen/BlockRegen.java b/src/main/java/nl/aurorion/blockregen/BlockRegen.java
@@ -142,6 +142,8 @@ public void onEnable() {
     }
 
     public void reload(CommandSender sender) {
+
+        consoleOutput.addListener(sender);
         checkDependencies();
 
         files.getSettings().load();
@@ -163,6 +165,7 @@ public void reload(CommandSender sender) {
         if (getConfig().getBoolean("Auto-Save.Enabled", false))
             regenerationManager.reloadAutoSave();
 
+        consoleOutput.removeListener(sender);
         sender.sendMessage(Message.RELOAD.get());
     }
 

diff --git a/src/main/java/nl/aurorion/blockregen/Message.java b/src/main/java/nl/aurorion/blockregen/Message.java
@@ -71,7 +71,7 @@ public enum Message {
      * Messages on block break errs.
      */
     TOOL_REQUIRED_ERROR("Tool-Required-Error", "&cYou can only break this block with the following tool(s): &b%tool%&c."),
-    ENCHANT_REQUIRED_ERROR("Enchant-Required-Error", "&cYour tool has to have one of the following enchantment(s): &b%enchant%&c."),
+    ENCHANT_REQUIRED_ERROR("Enchant-Required-Error", "&cYour tool has to have at least one of the following enchantment(s): &b%enchant%&c."),
     JOBS_REQUIRED_ERROR("Jobs-Error", "&cYou need to reach following job levels in order to break this block: &b%job%"),
     PERMISSION_BLOCK_ERROR("Permission-Error", "&cYou don't have the permission to break this block.");
 

diff --git a/src/main/java/nl/aurorion/blockregen/listeners/BlockBreak.java b/src/main/java/nl/aurorion/blockregen/listeners/BlockBreak.java
@@ -19,7 +19,6 @@
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.ExperienceOrb;
@@ -281,6 +280,8 @@ private void process(RegenerationProcess process, BlockBreakEvent event) {
 
                 if (doubleExp) expAmount *= 2;
 
+                plugin.getConsoleOutput().debug("Exp: " + expAmount);
+
                 if (experienceDrop.isDropNaturally())
                     world.spawn(location, ExperienceOrb.class).setExperience(expAmount);
                 else player.giveExp(expAmount);

diff --git a/src/main/java/nl/aurorion/blockregen/system/PresetManager.java b/src/main/java/nl/aurorion/blockregen/system/PresetManager.java
@@ -158,7 +158,12 @@ public void load(String name) {
 
                     ExperienceDrop experienceDrop = new ExperienceDrop();
 
-                    experienceDrop.setAmount(Amount.loadAmount(plugin.getFiles().getBlockList().getFileConfiguration(), "Blocks." + name + ".drop-item.exp-drop.amount", 0));
+                    experienceDrop.setAmount(Amount.loadAmount(plugin.getFiles().getBlockList().getFileConfiguration(), "Blocks." + name + ".drop-item.exp.amount", 0));
+
+                    experienceDrop.setDropNaturally(plugin.getFiles().getBlockList().getFileConfiguration().getBoolean("Blocks." + name + ".drop-item.exp.drop-naturally", false));
+
+                    drop.setExperienceDrop(experienceDrop);
+                    plugin.getConsoleOutput().debug("Exp drop: " + experienceDrop.toString());
 
                     drops.add(drop);
                 }