From 14753fab8661276ecb3fd1521b5fc47d88dbc373 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 17 Dec 2018 15:53:20 +0200 Subject: [PATCH] Bug fixes --- .../ultimatetimber/treefall/TreeChecker.java | 16 ++++++++-------- .../treefall/TreeFallAnimation.java | 3 ++- .../ultimatetimber/treefall/TreeFallEvent.java | 3 ++- .../ultimatetimber/treefall/TreeLoot.java | 1 + .../ultimatetimber/treefall/TreeReplant.java | 1 + 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeChecker.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeChecker.java index 4adeb9d..f195319 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeChecker.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeChecker.java @@ -108,11 +108,11 @@ public class TreeChecker { int radMin, radMax; if (i > 5) { - radMin = -3; //-2 - radMax = 4; //3 + radMin = -2; + radMax = 3; } else { - radMin = -2; //-1 - radMax = 3; //2 + radMin = -1; + radMax = 2; } for (int x = radMin; x < radMax; x++) @@ -141,11 +141,11 @@ public class TreeChecker { int radMin, radMax; if (i > 5) { - radMin = -4; - radMax = 5; + radMin = -5; + radMax = 7; } else { - radMin = -3; - radMax = 4; + radMin = -4; + radMax = 6; } diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java index d070c1e..2957ef6 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallAnimation.java @@ -131,6 +131,7 @@ public class TreeFallAnimation implements Listener { FallingBlock fallingBlock = block.getWorld().spawnFallingBlock(block.getLocation().clone().add(0.5,0,0.5), block.getBlockData()); fallingBlock.setDropItem(false); + registerFallingBlock(fallingBlock); /* @@ -138,7 +139,7 @@ public class TreeFallAnimation implements Listener { */ if (block.getType().equals(Material.AIR)) continue; - /* + /* Remove original block */ TreeReplant.replaceOriginalBlock(block); diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java index 164a078..787d8ee 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeFallEvent.java @@ -27,8 +27,9 @@ public class TreeFallEvent implements Listener { if (event.getBlock() != null && event.getBlock().getType().name().contains("SAPLING") && fileConfiguration.getBoolean(DefaultConfig.TIMEOUT_BREAK) && TreeReplant.isTimeout(event.getBlock())) event.setCancelled(true); - if (!EventFilter.eventIsValid(event)) return; + if(fileConfiguration.getBoolean(DefaultConfig.SNEAK_ONLY) && !event.getPlayer().isSneaking()) return; + TreeChecker treeChecker = new TreeChecker(); HashSet blocks = treeChecker.validTreeHandler(event.getBlock()); diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeLoot.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeLoot.java index a6746f5..88ead78 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeLoot.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeLoot.java @@ -4,6 +4,7 @@ import com.songoda.ultimatetimber.utils.LeafToSaplingConverter; import org.bukkit.Material; import org.bukkit.entity.FallingBlock; import org.bukkit.inventory.ItemStack; +import org.bukkit.material.MaterialData; import java.util.concurrent.ThreadLocalRandom; diff --git a/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java b/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java index 127d3d1..d22a11e 100644 --- a/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java +++ b/src/main/java/com/songoda/ultimatetimber/treefall/TreeReplant.java @@ -20,6 +20,7 @@ public class TreeReplant { public static void replaceOriginalBlock(Block block) { + boolean isTimeout = UltimateTimber.getInstance().getConfig().getBoolean(DefaultConfig.TIMEOUT_BREAK); if (!UltimateTimber.getInstance().getConfig().getBoolean(DefaultConfig.REPLANT_SAPLING)) {