Upstream/CoreProtect
1
0
Fork 0
mirror of https://github.com/PlayPro/CoreProtect.git synced 2024-12-30 18:08:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tree growth still being logged when disabled via config

Browse Source
This commit is contained in:
Intelli 2023-08-23 16:21:37 -06:00
parent af35a98b1d
commit 45d4642086
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/coreprotect/listener/block/BlockFertilizeListener.java
View File

@ -4,11 +4,13 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Tag; import org.bukkit.Tag;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockFertilizeEvent; import org.bukkit.event.block.BlockFertilizeEvent;
@ -18,7 +20,7 @@ import net.coreprotect.thread.CacheHandler;
public final class BlockFertilizeListener extends Queue implements Listener { public final class BlockFertilizeListener extends Queue implements Listener {
@EventHandler @EventHandler(priority = EventPriority.MONITOR)
protected void onBlockFertilize(BlockFertilizeEvent event) { protected void onBlockFertilize(BlockFertilizeEvent event) {
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
@ -31,12 +33,16 @@ public final class BlockFertilizeListener extends Queue implements Listener {
Location location = block.getLocation(); Location location = block.getLocation();
List<BlockState> blocks = event.getBlocks(); List<BlockState> blocks = event.getBlocks();
if (Tag.SAPLINGS.isTagged(block.getType()) && (!Config.getConfig(location.getWorld()).TREE_GROWTH || (blocks.size() == 1 && blocks.get(0).getLocation().equals(location)))) { if (Tag.SAPLINGS.isTagged(block.getType()) && (!Config.getConfig(location.getWorld()).TREE_GROWTH || (blocks.size() == 1 && blocks.get(0).getLocation().equals(location)))) {
return; return;
} }
if (block.getType().name().toLowerCase(Locale.ROOT).contains("mushroom") && (!Config.getConfig(location.getWorld()).MUSHROOM_GROWTH || (blocks.size() == 1 && blocks.get(0).getLocation().equals(location)))) { if (block.getType().name().toLowerCase(Locale.ROOT).contains("mushroom") && (!Config.getConfig(location.getWorld()).MUSHROOM_GROWTH || (blocks.size() == 1 && blocks.get(0).getLocation().equals(location)))) {
return; return;
} }
if (block.getType() == Material.AIR && blocks.size() > 1 && Tag.LOGS.isTagged(blocks.get(1).getType()) && !Config.getConfig(location.getWorld()).TREE_GROWTH) {
return;
}
String user = "#bonemeal"; String user = "#bonemeal";
Player player = event.getPlayer(); Player player = event.getPlayer();