diff --git a/UltimateTimber/Core/pom.xml b/UltimateTimber/Core/pom.xml
index b8017b2..efc6bd1 100644
--- a/UltimateTimber/Core/pom.xml
+++ b/UltimateTimber/Core/pom.xml
@@ -3,7 +3,7 @@
com.songoda
UltimateTimber
- 2.2
+ 2.2.1
../../
diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml
index 03469a4..b62ca07 100644
--- a/UltimateTimber/Plugin/pom.xml
+++ b/UltimateTimber/Plugin/pom.xml
@@ -3,7 +3,7 @@
com.songoda
UltimateTimber
- 2.2
+ 2.2.1
../../
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ChoppingManager.java b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ChoppingManager.java
index ec6467e..685f131 100644
--- a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ChoppingManager.java
+++ b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ChoppingManager.java
@@ -12,8 +12,8 @@ import java.util.UUID;
public class ChoppingManager extends Manager {
- private Set disabledPlayers;
- private Map cooldownedPlayers;
+ private final Set disabledPlayers;
+ private final Map cooldownedPlayers;
private boolean useCooldown;
private int cooldownAmount;
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
index f7f48c4..121323d 100644
--- a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
+++ b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
@@ -385,7 +385,8 @@ public class TreeDefinitionManager extends Manager {
toTry.addAll(this.globalEntireTreeLoot);
} else {
if (ConfigurationManager.Setting.APPLY_SILK_TOUCH.getBoolean() && hasSilkTouch) {
- if (McMMOHook.hasWoodcuttingDoubleDrops(player))
+ if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
+ && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
} else {
@@ -394,7 +395,8 @@ public class TreeDefinitionManager extends Manager {
toTry.addAll(treeDefinition.getLogLoot());
toTry.addAll(this.globalLogLoot);
if (treeDefinition.shouldDropOriginalLog()) {
- if (McMMOHook.hasWoodcuttingDoubleDrops(player))
+ if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
+ && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
}
@@ -403,7 +405,8 @@ public class TreeDefinitionManager extends Manager {
toTry.addAll(treeDefinition.getLeafLoot());
toTry.addAll(this.globalLeafLoot);
if (treeDefinition.shouldDropOriginalLeaf()) {
- if (McMMOHook.hasWoodcuttingDoubleDrops(player))
+ if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
+ && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
lootedItems.addAll(BlockUtils.getBlockDrops(treeBlock));
}
@@ -421,13 +424,15 @@ public class TreeDefinitionManager extends Manager {
continue;
if (treeLoot.hasItem()) {
- if (McMMOHook.hasWoodcuttingDoubleDrops(player))
+ if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
+ && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedItems.add(treeLoot.getItem());
lootedItems.add(treeLoot.getItem());
}
if (treeLoot.hasCommand()) {
- if (McMMOHook.hasWoodcuttingDoubleDrops(player))
+ if (ConfigurationManager.Setting.HOOKS_APPLY_EXTRA_DROPS.getBoolean()
+ && McMMOHook.hasWoodcuttingDoubleDrops(player))
lootedCommands.add(treeLoot.getCommand());
lootedCommands.add(treeLoot.getCommand());
}
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
index 64cea6c..cf31900 100644
--- a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
+++ b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
@@ -139,12 +139,14 @@ public class TreeFallManager extends Manager implements Listener {
if (!isCreative)
ItemUtils.addDamage(tool, toolDamage);
- McMMOHook.addWoodcutting(player, detectedTree.getDetectedTreeBlocks().getAllTreeBlocks().stream()
- .map(ITreeBlock::getBlock).collect(Collectors.toList()));
+ if (ConfigurationManager.Setting.HOOKS_APPLY_EXPERIENCE.getBoolean()) {
+ McMMOHook.addWoodcutting(player, detectedTree.getDetectedTreeBlocks().getAllTreeBlocks().stream()
+ .map(ITreeBlock::getBlock).collect(Collectors.toList()));
- if (!isCreative && JobsHook.isEnabled())
- for (ITreeBlock treeBlock : detectedTree.getDetectedTreeBlocks().getLogBlocks())
- JobsHook.breakBlock(player, treeBlock.getBlock());
+ if (!isCreative && JobsHook.isEnabled())
+ for (ITreeBlock treeBlock : detectedTree.getDetectedTreeBlocks().getLogBlocks())
+ JobsHook.breakBlock(player, treeBlock.getBlock());
+ }
for (ITreeBlock treeBlock : detectedTree.getDetectedTreeBlocks().getAllTreeBlocks())
LogManager.logRemoval(player, treeBlock.getBlock());
diff --git a/pom.xml b/pom.xml
index 0216f47..f294028 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
com.songoda
UltimateTimber
- 2.2
+ 2.2.1
4.0.0
pom