fix: annotate ExpireManager with @Inject

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java

@@ -104,12 +104,6 @@ public class BlockEventListener117 implements Listener {
             if (entity instanceof Item item) {
                 UUID itemThrower = item.getThrower();
                 if (plot != null) {
-                    if (itemThrower == null && (itemThrower = item.getOwner()) == null) {
-                        plot.debug(
-                                "A thrown item couldn't trigger sculk sensors because misc-interact = false and the item's owner could not be resolved.");
-                        event.setCancelled(true);
-                        return;
-                    }
                     if (!plot.isAdded(itemThrower)) {
                         if (!plot.isAdded(itemThrower)) {
                             plot.debug("A thrown item couldn't trigger sculk sensors because misc-interact = false");

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -289,7 +289,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
      * Get the {@link ExpireManager} implementation for the platform
      *
      * @return Expire manager
-     * @since 6.10.2
+     * @since TODO
      */
     default @NonNull ExpireManager expireManager() {
         return injector().getInstance(ExpireManager.class);

Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java

@@ -298,10 +298,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int roadSchemHeight;
 
         if (schematic1 != null) {
-            roadSchemHeight = Math.max(
+            roadSchemHeight = schematic1.getClipboard().getDimensions().getY();
-                    schematic1.getClipboard().getDimensions().getY(),
-                    schematic2.getClipboard().getDimensions().getY()
-            );
             maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
             if (maxSchematicHeight == worldGenHeight) {
                 SCHEM_Y = getMinGenHeight();
@@ -489,7 +486,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     /**
      * @deprecated This method should not be available for public API usage and will be made private.
      */
-    @Deprecated(forRemoval = true, since = "6.10.2")
+    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
         if (z < 0) {
             z += this.SIZE;
@@ -524,7 +521,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     /**
      * @deprecated This method should not be available for public API usage and will be made private.
      */
-    @Deprecated(forRemoval = true, since = "6.10.2")
+    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBiome(short x, short z, BiomeType id) {
         if (z < 0) {
             z += this.SIZE;

Core/src/main/java/com/plotsquared/core/plot/PlotId.java

@@ -112,7 +112,7 @@ public final class PlotId {
      * @return Plot ID copy
      * @deprecated PlotId is immutable, copy is not required.
      */
-    @Deprecated(forRemoval = true, since = "6.10.2")
+    @Deprecated(forRemoval = true, since = "TODO")
     public @NonNull PlotId copy() {
         return this;
     }

Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java

@@ -65,7 +65,7 @@ public class ExpireManager {
     /**
      * @deprecated Use {@link PlotPlatform#expireManager()} instead
      */
-    @Deprecated(forRemoval = true, since = "6.10.2")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static ExpireManager IMP;
     private final ConcurrentHashMap<UUID, Long> dates_cache;
     private final ConcurrentHashMap<UUID, Long> account_age_cache;

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "com.plotsquared"
-version = "6.10.4-SNAPSHOT"
+version = "6.10.2-SNAPSHOT"
 
 subprojects {
     group = rootProject.group
@@ -65,7 +65,7 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.18"))
+        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.16"))
     }
 
     dependencies {