mirror of
https://github.com/songoda/UltimateTimber.git
synced 2024-09-28 13:47:30 +02:00
Fixed some issues with the Jobs hook.
This commit is contained in:
parent
99af64c422
commit
ae1d967628
@ -12,7 +12,6 @@ import com.songoda.ultimatetimber.misc.OnlyToppleWhile;
|
|||||||
import com.songoda.ultimatetimber.tree.DetectedTree;
|
import com.songoda.ultimatetimber.tree.DetectedTree;
|
||||||
import com.songoda.ultimatetimber.tree.ITreeBlock;
|
import com.songoda.ultimatetimber.tree.ITreeBlock;
|
||||||
import com.songoda.ultimatetimber.tree.TreeBlockSet;
|
import com.songoda.ultimatetimber.tree.TreeBlockSet;
|
||||||
import com.songoda.ultimatetimber.tree.TreeBlockType;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
@ -135,17 +134,20 @@ public class TreeFallManager extends Manager implements Listener {
|
|||||||
detectedTree.getDetectedTreeBlocks().remove(detectedTree.getDetectedTreeBlocks().getInitialLogBlock());
|
detectedTree.getDetectedTreeBlocks().remove(detectedTree.getDetectedTreeBlocks().getInitialLogBlock());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!player.getGameMode().equals(GameMode.CREATIVE))
|
boolean isCreative = player.getGameMode().equals(GameMode.CREATIVE);
|
||||||
|
|
||||||
|
if (!isCreative)
|
||||||
ItemUtils.addDamage(tool, toolDamage);
|
ItemUtils.addDamage(tool, toolDamage);
|
||||||
|
|
||||||
McMMOHook.addWoodcutting(player, detectedTree.getDetectedTreeBlocks().getAllTreeBlocks().stream()
|
McMMOHook.addWoodcutting(player, detectedTree.getDetectedTreeBlocks().getAllTreeBlocks().stream()
|
||||||
.map(ITreeBlock::getBlock).collect(Collectors.toList()));
|
.map(ITreeBlock::getBlock).collect(Collectors.toList()));
|
||||||
|
|
||||||
for (ITreeBlock<Block> treeBlock : detectedTree.getDetectedTreeBlocks().getAllTreeBlocks()) {
|
if (!isCreative && JobsHook.isEnabled())
|
||||||
if (JobsHook.isEnabled() && treeBlock.getTreeBlockType() == TreeBlockType.LOG)
|
for (ITreeBlock<Block> treeBlock : detectedTree.getDetectedTreeBlocks().getLogBlocks())
|
||||||
JobsHook.breakBlock(player, block);
|
JobsHook.breakBlock(player, treeBlock.getBlock());
|
||||||
|
|
||||||
|
for (ITreeBlock<Block> treeBlock : detectedTree.getDetectedTreeBlocks().getAllTreeBlocks())
|
||||||
LogManager.logRemoval(player, treeBlock.getBlock());
|
LogManager.logRemoval(player, treeBlock.getBlock());
|
||||||
}
|
|
||||||
|
|
||||||
treeAnimationManager.runAnimation(detectedTree, player);
|
treeAnimationManager.runAnimation(detectedTree, player);
|
||||||
treeDefinitionManager.dropTreeLoot(detectedTree.getTreeDefinition(), detectedTree.getDetectedTreeBlocks().getInitialLogBlock(), player, false, true);
|
treeDefinitionManager.dropTreeLoot(detectedTree.getTreeDefinition(), detectedTree.getDetectedTreeBlocks().getInitialLogBlock(), player, false, true);
|
||||||
|
Loading…
Reference in New Issue
Block a user