diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 1f971d2..872d816 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -4,7 +4,7 @@ com.syntaxphoenix.spigot smoothtimber-legacy SmoothTimber - 1.27.0 + 1.27.1 @@ -59,6 +59,14 @@ net.coreprotect.v2 net.coreprotect + + lands.v1 + me.angeschossen.lands + + + lands.v2 + me.angeschossen.lands + mcmmo.v1.com com @@ -156,12 +164,6 @@ 2.10.9 provided - - com.github.angeschossen - LandsAPI - 4.10.18 - provided - com.github.TechFortress GriefPrevention @@ -242,6 +244,20 @@ 2.28.0.Final compile + + lands + lands1 + 1 + system + ${project.basedir}/libraries/LandsAPI.repackaged.jar + + + lands + lands2 + 1 + system + ${project.basedir}/libraries/lands-api-7.0.2.repackaged.jar + net.coreprotect CoreProtect6 diff --git a/pom.xml b/pom.xml index c2f4fc7..808e3e3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.syntaxphoenix.spigot smoothtimber-legacy - 1.27.1 + 1.27.2 SmoothTimber jar diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/listener/BlockBreakListener.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/listener/BlockBreakListener.java index b4b4575..46b7eb5 100644 --- a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/listener/BlockBreakListener.java +++ b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/listener/BlockBreakListener.java @@ -40,7 +40,7 @@ public void onBlockBreak(final BlockBreakEvent event) { return; } final VersionChanger change = PluginUtils.CHANGER; - if (!change.isWoodBlock(Locator.getBlockState(event.getBlock()))) { + if (!change.isWoodBlock(event.getBlock().getState())) { return; } diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/utilities/locate/Locator.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/utilities/locate/Locator.java index 7ea1c9b..bb29ef4 100644 --- a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/utilities/locate/Locator.java +++ b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/utilities/locate/Locator.java @@ -7,7 +7,6 @@ import java.util.function.Function; import org.bukkit.Location; -import org.bukkit.block.Block; import org.bukkit.block.BlockState; import com.syntaxphoenix.spigot.smoothtimber.config.config.CutterConfig; @@ -60,16 +59,6 @@ public static BlockState getBlockState(final Location location) { return BLOCK_DETECTOR.apply(location); } - public static BlockState getBlockState(final Block block) { - Platform platform = Platform.getPlatform(); - if (platform.isRegional()) { - ObjectTask task = new ObjectTask<>(() -> block.getState()); - Platform.getPlatform().regionalTask(block.getLocation(), task); - return task.get(); - } - return block.getState(); - } - public static void locateWood(final Location breakPoint, final List output, final int limit) { int roots = CutterConfig.ROOT_DEPTH; final int radius = CutterConfig.CHECK_RADIUS; diff --git a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/version/changer/v1_20xChanger.java b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/version/changer/v1_20xChanger.java index f1c0e05..9781a46 100644 --- a/src/main/java/com/syntaxphoenix/spigot/smoothtimber/version/changer/v1_20xChanger.java +++ b/src/main/java/com/syntaxphoenix/spigot/smoothtimber/version/changer/v1_20xChanger.java @@ -31,6 +31,7 @@ "1.21.0", "1.21.1", "1.21.2", + "1.21.3", }) public final class v1_20xChanger implements VersionChanger {