Merge remote-tracking branch 'upstream/main'

Author: Dreeam-qwq

build.gradle.kts

@@ -44,16 +44,15 @@ dependencies {
     api(project(":v1_21_2", io.papermc.paperweight.util.constants.REOBF_CONFIG))
     api(project(":v1_21_4", io.papermc.paperweight.util.constants.REOBF_CONFIG))
     api(project(":v1_21_5", io.papermc.paperweight.util.constants.REOBF_CONFIG))
-    //api(project(":v1_21_6", io.papermc.paperweight.util.constants.REOBF_CONFIG))
-    api(project(":v1_21_6"))
+    api(project(":v1_21_6", "default"))
 }
 
 tasks {
     shadowJar {
         archiveClassifier = ""
         minimize()
         manifest {
-            attributes["paperweight-mappings-namespace"] = io.papermc.paperweight.util.constants.DEOBF_NAMESPACE
+            attributes["paperweight-mappings-namespace"] = io.papermc.paperweight.util.constants.SPIGOT_NAMESPACE
         }
     }
 

core/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
 
 java {
     disableAutoTargetJvm()
-    toolchain.languageVersion = JavaLanguageVersion.of(21)
+    toolchain.languageVersion = JavaLanguageVersion.of(24)
 }
 
 tasks.compileJava {

core/src/main/java/dev/geco/gsit/event/BlockEventHandler.java

@@ -41,15 +41,14 @@ public BlockEventHandler(GSitMain gSitMain) {
 
     private void handleBlockPistonEvent(BlockPistonEvent event, List<Block> blocks) {
         Set<GSeat> moveList = new HashSet<>();
+        Set<IGPose> breakList = new HashSet<>();
         for(Block block : blocks) {
-            for(GSeat seat : gSitMain.getSitService().getSeatsByBlock(block)) {
-                if(moveList.contains(seat)) continue;
-                gSitMain.getSitService().moveSeat(seat, event.getDirection());
-                moveList.add(seat);
-            }
+            moveList.addAll(gSitMain.getSitService().getSeatsByBlock(block));
             if(!gSitMain.getConfigService().GET_UP_BREAK) continue;
-            for(IGPose poseSeat : gSitMain.getPoseService().getPosesByBlock(block)) gSitMain.getPoseService().removePose(poseSeat, GStopReason.BLOCK_BREAK);
+            breakList.addAll(gSitMain.getPoseService().getPosesByBlock(block));
         }
+        for(GSeat seat : moveList) gSitMain.getSitService().moveSeat(seat, event.getDirection());
+        for(IGPose poseSeat : breakList) gSitMain.getPoseService().removePose(poseSeat, GStopReason.BLOCK_BREAK);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

core/src/main/java/dev/geco/gsit/link/WorldGuardLink.java

@@ -7,6 +7,7 @@
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
+import com.sk89q.worldguard.protection.regions.RegionContainer;
 import com.sk89q.worldguard.protection.regions.RegionQuery;
 import dev.geco.gsit.GSitMain;
 import dev.geco.gsit.link.worldguard.RegionFlagHandler;
@@ -48,7 +49,9 @@ public void unregisterFlagHandlers() {
 
     public boolean canUseInLocation(Location location, Player player, String flag) {
         try {
-            RegionQuery regionQuery = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery();
+            RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
+            if(container.get(BukkitAdapter.adapt(location.getWorld())) == null) return true;
+            RegionQuery regionQuery = container.createQuery();
             com.sk89q.worldedit.util.Location regionLocation = BukkitAdapter.adapt(location);
             LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
             // If the player can't ride an entity in the region, we can't use sit anyway

core/src/main/java/dev/geco/gsit/service/DataService.java

@@ -46,7 +46,7 @@ public boolean connect() {
 
     public boolean isConnected() {
         try {
-            if(connection != null && !connection.isClosed()) return true;
+            if(connection != null && !connection.isClosed() && connection.isValid(5)) return true;
         } catch(SQLException ignored) { }
         return false;
     }
@@ -95,6 +95,7 @@ public ResultSet executeAndGet(String query, Object... parameters) throws SQLExc
 
     private void ensureConnection() throws SQLException {
         if(isConnected()) return;
+        if(reconnect()) return;
         if(!reconnect()) throw new SQLException("Failed to reconnect to the " + type + " database.");
     }
 

core/src/main/java/dev/geco/gsit/service/SitService.java

@@ -170,7 +170,7 @@ public void handleSafeSeatDismount(GSeat seat) {
             if(seat.getSeatEntity().isValid()) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
             if(gSitMain.supportsFoliaFeature()) gSitMain.getTaskService().runDelayed(() -> {
                 if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
-            }, entity, 0);
+            }, true, Bukkit.isOwnedByCurrentRegion(entity) ? entity : null, 0);
             else if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
 
             entityBlocked.remove(entity.getUniqueId());

gradle.properties

@@ -1,4 +1,4 @@
-version=2.3.3
+version=2.4.0
 group=dev.geco.gsit
 description=Relax with other players on nice seats!
 

jitpack.yml

@@ -1,2 +1,2 @@
 jdk:
-  - openjdk21
+  - openjdk24

mcv/v1_17_1/build.gradle.kts

@@ -10,7 +10,11 @@ dependencies {
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(16)
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+}
+
+tasks.compileJava {
+    options.release = 16
 }
 
 tasks.assemble {

mcv/v1_18/build.gradle.kts

@@ -10,7 +10,11 @@ dependencies {
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(17)
+    toolchain.languageVersion = JavaLanguageVersion.of(18)
+}
+
+tasks.compileJava {
+    options.release = 17
 }
 
 tasks.assemble {