Merge branch 'gecolay:main' into main

Author: Dreeam-qwq

.gitignore

@@ -9,4 +9,5 @@
 *.iml
 build
 .gradle
+*.log
 ## build <--

core/build.gradle.kts

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

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

@@ -72,7 +72,7 @@ public void playerInteractAtEntityEvent(PlayerInteractAtEntityEvent event) {
         if(gSitMain.getCrawlService().isPlayerCrawling(player)) return;
 
         double distance = gSitMain.getConfigService().PS_MAX_DISTANCE;
-        if(distance > 0d && target.getLocation().add(0, target.getHeight() / 2, 0).distance(player.getLocation().clone().add(0, player.getHeight() / 2, 0)) > distance) return;
+        if(distance > 0d && target.getLocation().add(0, target.getHeight() / 2, 0).distanceSquared(player.getLocation().clone().add(0, player.getHeight() / 2, 0)) > distance * distance) return;
 
         if(!gSitMain.getEnvironmentUtil().canUseInLocation(target.getLocation(), player, "playersit")) return;
 

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

@@ -59,7 +59,7 @@ public void playerInteractEvent(PlayerInteractEvent event) {
 
         double distance = gSitMain.getConfigService().S_MAX_DISTANCE;
         Location location = clickedBlock.getLocation();
-        if(distance > 0d && location.clone().add(0.5, 0.5, 0.5).distance(player.getLocation()) > distance) return;
+        if(distance > 0d && location.clone().add(0.5, 0.5, 0.5).distanceSquared(player.getLocation()) > distance * distance) return;
 
         if(!gSitMain.getConfigService().ALLOW_UNSAFE && !(clickedBlock.getRelative(BlockFace.UP).isPassable())) return;
 
@@ -90,34 +90,34 @@ public void playerInteractEvent(PlayerInteractEvent event) {
             if(((Slab) clickedBlock.getBlockData()).getType() != Slab.Type.BOTTOM && gSitMain.getConfigService().S_BOTTOM_PART_ONLY) return;
         }
 
-        boolean interactionPointAvailable = gSitMain.getConfigService().CENTER_BLOCK;
+        boolean useCenter = gSitMain.getConfigService().CENTER_BLOCK;
 
-        double xoffset = interactionPointAvailable ? 0 : -0.5d;
-        double zoffset = interactionPointAvailable ? 0 : -0.5d;
+        double xoffset = useCenter ? 0 : -0.5d;
+        double zoffset = xoffset;
 
-        if(!interactionPointAvailable) {
+        if(!useCenter) {
             try {
                 Vector interactionPointVector = event.getClickedPosition();
                 if(interactionPointVector != null) {
-                    interactionPointAvailable = true;
+                    useCenter = true;
                     xoffset += interactionPointVector.getX() - interactionPointVector.getBlockX();
                     zoffset += interactionPointVector.getZ() - interactionPointVector.getBlockZ();
                 }
             } catch(Throwable ignored) { }
         }
 
-        if(!interactionPointAvailable) {
+        if(!useCenter) {
             try {
                 Location interactionPoint = event.getInteractionPoint();
                 if(interactionPoint != null) {
-                    interactionPointAvailable = true;
+                    useCenter = true;
                     xoffset += interactionPoint.getX() - interactionPoint.getBlockX();
                     zoffset += interactionPoint.getZ() - interactionPoint.getBlockZ();
                 }
             } catch(Throwable ignored) { }
         }
 
-        if(gSitMain.getSitService().createSeat(clickedBlock, player, true, interactionPointAvailable ? xoffset : 0d, 0d, interactionPointAvailable ? zoffset : 0, player.getLocation().getYaw(), true) != null) event.setCancelled(true);
+        if(gSitMain.getSitService().createSeat(clickedBlock, player, true, useCenter ? xoffset : 0d, 0d, useCenter ? zoffset : 0, player.getLocation().getYaw(), true) != null) event.setCancelled(true);
     }
 
 }

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

@@ -83,6 +83,7 @@ public boolean stopPlayerSit(Player source, GStopReason stopReason, boolean remo
         }
 
         if(passengers != null) {
+            source.eject();
             bottomToTopStacks.remove(source.getUniqueId());
             topToBottomStacks.remove(passengers.getKey());
             for(UUID passenger : passengers.getValue()) {
@@ -99,6 +100,7 @@ public boolean stopPlayerSit(Player source, GStopReason stopReason, boolean remo
         }
 
         if(vehicles != null) {
+            source.leaveVehicle();
             topToBottomStacks.remove(source.getUniqueId());
             bottomToTopStacks.remove(vehicles.getKey());
             for(UUID vehicle : vehicles.getValue()) {

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

@@ -145,7 +145,7 @@ public boolean removeSeat(GSeat seat, GStopReason stopReason, boolean useSafeDis
         }
         seats.remove(entity.getUniqueId());
         seat.getSeatEntity().remove();
-        entityBlocked.remove(entity.getUniqueId());
+        gSitMain.getTaskService().runDelayed(() -> entityBlocked.remove(entity.getUniqueId()), 1);
         Bukkit.getPluginManager().callEvent(new EntityStopSitEvent(seat, stopReason));
         sitUsageNanoTime += seat.getLifetimeInNanoSeconds();
 

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

@@ -18,6 +18,8 @@ public class VersionService {
         VERSION_MAPPING.put("v1_20_6", "v1_20_5");
         VERSION_MAPPING.put("v1_21_1", "v1_21");
         VERSION_MAPPING.put("v1_21_3", "v1_21_2");
+        VERSION_MAPPING.put("v1_21_7", "v1_21_6");
+        VERSION_MAPPING.put("v1_21_8", "v1_21_6");
     }
     private final GSitMain gSitMain;
     private final String serverVersion;

gradle.properties

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

jitpack.yml

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

mcv/v1_18/src/main/java/dev/geco/gsit/mcv/v1_18/object/GPose.java

@@ -233,7 +233,7 @@ private void removeViewerPlayer(Player player) {
 
     private Set<Player> getNearbyPlayers() {
         Set<Player> currentNearbyPlayers = new HashSet<>();
-        seatPlayer.getWorld().getPlayers().stream().filter(player -> seat.getLocation().distance(player.getLocation()) <= renderRange && player.canSee(seatPlayer)).forEach(currentNearbyPlayers::add);
+        seatPlayer.getWorld().getPlayers().stream().filter(player -> seat.getLocation().distanceSquared(player.getLocation()) <= renderRange * renderRange && player.canSee(seatPlayer)).forEach(currentNearbyPlayers::add);
         return currentNearbyPlayers;
     }