Integrations and Fixes

Prince527GitHub · Prince527GitHub · commit b37c906e8431 · 2026-05-05T14:17:00.000-03:00
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/blockylog/BlockyLogResolver_v2_x.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/blockylog/BlockyLogResolver_v2_x.java
@@ -53,7 +53,14 @@ public List<Location> resolve(final Location start, final int radius, final List
 
     @Override
     public boolean isPlayerPlaced(final Location location) {
-        return api.isPlayerPlaced(location);
+        // Check BlockyLog if enabled in config, otherwise fall back to PDC tracking
+        // PDC auto-removes on block break, so it's safe as a fallback
+        if (com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig.USE_BLOCKYLOG_TRACKING) {
+            if (api.isPlayerPlaced(location)) {
+                return true;
+            }
+        }
+        return com.syntaxphoenix.spigot.smoothtimber.utilities.locate.PlacedBlockTracker.isPlayerPlaced(location);
     }
 
 }
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/coreprotect/CoreCompat_v1_13_x.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/coreprotect/CoreCompat_v1_13_x.java
@@ -34,7 +34,15 @@ public boolean isPlayerPlaced(BlockState state) {
         if (parseResult.getPlayer().isEmpty() || parseResult.getPlayer().startsWith("#") || parseResult.isRolledBack()) {
             return false;
         }
-        return parseResult.getActionId() != 0;
+        
+        // Check if it's a placement action (actionId != 0)
+        if (parseResult.getActionId() == 0) {
+            return false;
+        }
+        
+        // Verify the placed block type matches the current block type
+        // This prevents false positives when saplings grow into trees
+        return parseResult.getType().equals(state.getType());
     }
 
 }
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/coreprotect/CoreCompat_v1_8_x.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/coreprotect/CoreCompat_v1_8_x.java
@@ -38,7 +38,15 @@ public boolean isPlayerPlaced(BlockState state) {
         if (parseResult.getPlayer().isEmpty() || parseResult.getPlayer().startsWith("#") || parseResult.isRolledBack()) {
             return false;
         }
-        return parseResult.getActionId() != 0;
+        
+        // Check if it's a placement action (actionId != 0)
+        if (parseResult.getActionId() == 0) {
+            return false;
+        }
+        
+        // Verify the placed block type matches the current block type
+        // This prevents false positives when saplings grow into trees
+        return parseResult.getType().equals(state.getType());
     }
 
 }
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/coreprotect/CoreProtectResolver.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/coreprotect/CoreProtectResolver.java
@@ -92,7 +92,14 @@ public boolean isPlayerPlaced(final Location location) {
         if (block == null) {
             return false;
         }
-        return compat.isPlayerPlaced(block);
+        // Check CoreProtect if enabled in config, otherwise fall back to PDC tracking
+        // PDC auto-removes on block break, so it's safe as a fallback
+        if (com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig.USE_COREPROTECT_TRACKING) {
+            if (compat.isPlayerPlaced(block)) {
+                return true;
+            }
+        }
+        return com.syntaxphoenix.spigot.smoothtimber.utilities.locate.PlacedBlockTracker.isPlayerPlaced(location);
     }
 
 }
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/logblock/LogBlockResolver.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/compatibility/logblock/LogBlockResolver.java
@@ -94,7 +94,14 @@ public boolean isPlayerPlaced(final BlockState block) {
 
     @Override
     public boolean isPlayerPlaced(final Location location) {
-        return databaseAccessor.isPlayerPlaced(Locator.getBlockState(location));
+        // Check LogBlock if enabled in config, otherwise fall back to PDC tracking
+        // PDC auto-removes on block break, so it's safe as a fallback
+        if (com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig.USE_LOGBLOCK_TRACKING) {
+            if (databaseAccessor.isPlayerPlaced(Locator.getBlockState(location))) {
+                return true;
+            }
+        }
+        return com.syntaxphoenix.spigot.smoothtimber.utilities.locate.PlacedBlockTracker.isPlayerPlaced(location);
     }
 
 }
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/config/config/CutterConfig.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/config/config/CutterConfig.java
@@ -62,6 +62,10 @@ public final class CutterConfig extends STConfig {
     public static boolean ENABLE_ANIMATION = true;
     public static boolean INSTANT_COLLECT = false;
 
+    public static boolean USE_COREPROTECT_TRACKING = false;
+    public static boolean USE_LOGBLOCK_TRACKING = false;
+    public static boolean USE_BLOCKYLOG_TRACKING = false;
+
     /*
      * 
      */
@@ -110,6 +114,10 @@ protected void onLoad() {
         ENABLE_ANIMATION = check("options.animation", ENABLE_ANIMATION);
         INSTANT_COLLECT = check("options.collect-instantly", INSTANT_COLLECT);
 
+        USE_COREPROTECT_TRACKING = check("options.tracking.coreprotect", USE_COREPROTECT_TRACKING);
+        USE_LOGBLOCK_TRACKING = check("options.tracking.logblock", USE_LOGBLOCK_TRACKING);
+        USE_BLOCKYLOG_TRACKING = check("options.tracking.blockylog", USE_BLOCKYLOG_TRACKING);
+
         ENABLE_WOOD_PERMISSIONS = check("options.permission.wood-type", ENABLE_WOOD_PERMISSIONS);
         ENABLE_CUTTER_PERMISSIONS = check("options.permission.cutter-type", ENABLE_CUTTER_PERMISSIONS);
 
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/listener/BlockPlaceListener.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/listener/BlockPlaceListener.java
@@ -5,6 +5,11 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+import com.syntaxphoenix.spigot.smoothtimber.compatibility.CompatibilityHandler;
+import com.syntaxphoenix.spigot.smoothtimber.compatibility.blockylog.BlockyLog;
+import com.syntaxphoenix.spigot.smoothtimber.compatibility.coreprotect.CoreProtectAddon;
+import com.syntaxphoenix.spigot.smoothtimber.compatibility.logblock.LogBlock;
+import com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig;
 import com.syntaxphoenix.spigot.smoothtimber.utilities.PluginUtils;
 import com.syntaxphoenix.spigot.smoothtimber.utilities.locate.PlacedBlockTracker;
 import com.syntaxphoenix.spigot.smoothtimber.version.manager.VersionChanger;
@@ -15,6 +20,15 @@ public class BlockPlaceListener implements Listener {
     public void onBlockPlace(BlockPlaceEvent event) {
         VersionChanger changer = PluginUtils.CHANGER;
         if (changer.isWoodBlock(event.getBlock().getState())) {
+            // Skip marking if any enabled logging plugin is active
+            boolean useExternalTracking = 
+                (CutterConfig.USE_COREPROTECT_TRACKING && CompatibilityHandler.getAddon(CoreProtectAddon.class).isPresent()) ||
+                (CutterConfig.USE_LOGBLOCK_TRACKING && CompatibilityHandler.getAddon(LogBlock.class).isPresent()) ||
+                (CutterConfig.USE_BLOCKYLOG_TRACKING && CompatibilityHandler.getAddon(BlockyLog.class).isPresent());
+            
+            if (useExternalTracking) {
+                return;
+            }
             PlacedBlockTracker.markAsPlaced(event.getBlock());
         }
     }
diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/utilities/locate/DefaultResolver.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/utilities/locate/DefaultResolver.java
@@ -36,6 +36,10 @@ public List<Location> resolve(final Location start, final int radius, final List
                     if (current.contains(location)) {
                         continue;
                     }
+                    // Skip player-placed blocks
+                    if (isPlayerPlaced(location)) {
+                        continue;
+                    }
                     current.add(location);
                     counter.increment();
                     resolved.add(location);
@@ -47,7 +51,11 @@ public List<Location> resolve(final Location start, final int radius, final List
 
     @Override
     public boolean isPlayerPlaced(final Location location) {
-        return PlacedBlockTracker.isPlayerPlaced(location);
+        // Check CoreProtect first if available
+        return com.syntaxphoenix.spigot.smoothtimber.compatibility.CompatibilityHandler.getAddon(
+            com.syntaxphoenix.spigot.smoothtimber.compatibility.coreprotect.CoreProtectAddon.class)
+            .map(addon -> addon.getLocationResolver().isPlayerPlaced(location))
+            .orElseGet(() -> PlacedBlockTracker.isPlayerPlaced(location));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,14 @@ public List<Location> resolve(final Location start, final int radius, final List`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`public boolean isPlayerPlaced(final Location location) {`
`56`		`- return api.isPlayerPlaced(location);`
	`56`	`+ // Check BlockyLog if enabled in config, otherwise fall back to PDC tracking`
	`57`	`+ // PDC auto-removes on block break, so it's safe as a fallback`
	`58`	`+ if (com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig.USE_BLOCKYLOG_TRACKING) {`
	`59`	`+ if (api.isPlayerPlaced(location)) {`
	`60`	`+ return true;`
	`61`	`+ }`
	`62`	`+ }`
	`63`	`+ return com.syntaxphoenix.spigot.smoothtimber.utilities.locate.PlacedBlockTracker.isPlayerPlaced(location);`
`57`	`64`	`}`
`58`	`65`
`59`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,15 @@ public boolean isPlayerPlaced(BlockState state) {`
`34`	`34`	`if (parseResult.getPlayer().isEmpty() \|\| parseResult.getPlayer().startsWith("#") \|\| parseResult.isRolledBack()) {`
`35`	`35`	`return false;`
`36`	`36`	`}`
`37`		`- return parseResult.getActionId() != 0;`
	`37`	`+`
	`38`	`+ // Check if it's a placement action (actionId != 0)`
	`39`	`+ if (parseResult.getActionId() == 0) {`
	`40`	`+ return false;`
	`41`	`+ }`
	`42`	`+`
	`43`	`+ // Verify the placed block type matches the current block type`
	`44`	`+ // This prevents false positives when saplings grow into trees`
	`45`	`+ return parseResult.getType().equals(state.getType());`
`38`	`46`	`}`
`39`	`47`
`40`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,15 @@ public boolean isPlayerPlaced(BlockState state) {`
`38`	`38`	`if (parseResult.getPlayer().isEmpty() \|\| parseResult.getPlayer().startsWith("#") \|\| parseResult.isRolledBack()) {`
`39`	`39`	`return false;`
`40`	`40`	`}`
`41`		`- return parseResult.getActionId() != 0;`
	`41`	`+`
	`42`	`+ // Check if it's a placement action (actionId != 0)`
	`43`	`+ if (parseResult.getActionId() == 0) {`
	`44`	`+ return false;`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ // Verify the placed block type matches the current block type`
	`48`	`+ // This prevents false positives when saplings grow into trees`
	`49`	`+ return parseResult.getType().equals(state.getType());`
`42`	`50`	`}`
`43`	`51`
`44`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,14 @@ public boolean isPlayerPlaced(final Location location) {`
`92`	`92`	`if (block == null) {`
`93`	`93`	`return false;`
`94`	`94`	`}`
`95`		`- return compat.isPlayerPlaced(block);`
	`95`	`+ // Check CoreProtect if enabled in config, otherwise fall back to PDC tracking`
	`96`	`+ // PDC auto-removes on block break, so it's safe as a fallback`
	`97`	`+ if (com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig.USE_COREPROTECT_TRACKING) {`
	`98`	`+ if (compat.isPlayerPlaced(block)) {`
	`99`	`+ return true;`
	`100`	`+ }`
	`101`	`+ }`
	`102`	`+ return com.syntaxphoenix.spigot.smoothtimber.utilities.locate.PlacedBlockTracker.isPlayerPlaced(location);`
`96`	`103`	`}`
`97`	`104`
`98`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,14 @@ public boolean isPlayerPlaced(final BlockState block) {`
`94`	`94`
`95`	`95`	`@Override`
`96`	`96`	`public boolean isPlayerPlaced(final Location location) {`
`97`		`- return databaseAccessor.isPlayerPlaced(Locator.getBlockState(location));`
	`97`	`+ // Check LogBlock if enabled in config, otherwise fall back to PDC tracking`
	`98`	`+ // PDC auto-removes on block break, so it's safe as a fallback`
	`99`	`+ if (com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig.USE_LOGBLOCK_TRACKING) {`
	`100`	`+ if (databaseAccessor.isPlayerPlaced(Locator.getBlockState(location))) {`
	`101`	`+ return true;`
	`102`	`+ }`
	`103`	`+ }`
	`104`	`+ return com.syntaxphoenix.spigot.smoothtimber.utilities.locate.PlacedBlockTracker.isPlayerPlaced(location);`
`98`	`105`	`}`
`99`	`106`
`100`	`107`	`}`