Merge branch 'gecolay:main' into main

Author: Dreeam-qwq

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     `java-library`
     `maven-publish`
-    id("com.gradleup.shadow") version "9.0.0-beta11"
+    id("com.gradleup.shadow") version "9.0.0-beta12"
     id("io.papermc.paperweight.userdev") version "2.0.0-beta.16" apply false
 }
 
@@ -43,6 +43,7 @@ dependencies {
     api(project(":v1_21", configuration = "reobf"))
     api(project(":v1_21_2", configuration = "reobf"))
     api(project(":v1_21_4", configuration = "reobf"))
+    api(project(":v1_21_5", configuration = "reobf"))
 }
 
 tasks {

core/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.13") {
         exclude("com.google.guava", "guava")
         exclude("com.google.code.gson", "gson")

core/src/main/java/dev/geco/gsit/cmd/GBellyFlopCommand.java

@@ -45,7 +45,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             return true;
         }
 
-        if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping()) {
+        if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping() || gSitMain.getSitService().isEntityBlocked(player)) {
             gSitMain.getMessageService().sendMessage(sender, "Messages.action-pose-now-error");
             return true;
         }

core/src/main/java/dev/geco/gsit/cmd/GLayCommand.java

@@ -45,7 +45,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             return true;
         }
 
-        if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping()) {
+        if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping() || gSitMain.getSitService().isEntityBlocked(player)) {
             gSitMain.getMessageService().sendMessage(sender, "Messages.action-pose-now-error");
             return true;
         }

core/src/main/java/dev/geco/gsit/cmd/GSitCommand.java

@@ -42,7 +42,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 return true;
             }
 
-            if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping()) {
+            if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping() || gSitMain.getSitService().isEntityBlocked(player)) {
                 gSitMain.getMessageService().sendMessage(sender, "Messages.action-sit-now-error");
                 return true;
             }

core/src/main/java/dev/geco/gsit/cmd/GSpinCommand.java

@@ -45,7 +45,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             return true;
         }
 
-        if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping()) {
+        if(!player.isValid() || player.isSneaking() || !player.isOnGround() || player.getVehicle() != null || player.isSleeping() || gSitMain.getSitService().isEntityBlocked(player)) {
             gSitMain.getMessageService().sendMessage(sender, "Messages.action-pose-now-error");
             return true;
         }

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

@@ -50,7 +50,11 @@ public void handleEntityDismountEvent(Cancellable event, Entity entity, Entity d
         }, 2);
 
         Entity bottom = gSitMain.getPassengerUtil().getBottomEntityVehicle(dismounted);
-        if(gSitMain.getConfigService().PS_BOTTOM_RETURN && player.isValid()) gSitMain.getEntityUtil().setEntityLocation(player, bottom.getLocation());
+        if(gSitMain.getConfigService().PS_BOTTOM_RETURN) {
+            gSitMain.getTaskService().runDelayed(() -> {
+                if(player.isValid()) gSitMain.getEntityUtil().setEntityLocation(player, bottom.getLocation());
+            }, player, 1);
+        }
 
         gSitMain.getPlayerSitService().stopPlayerSit(player, GStopReason.GET_UP, false, true, false);
     }

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

@@ -53,6 +53,8 @@ public void playerInteractEvent(PlayerInteractEvent event) {
 
         if(!player.isValid() || player.isSneaking()) return;
 
+        if(gSitMain.getSitService().isEntityBlocked(player)) return;
+
         if(gSitMain.getSitService().isEntitySitting(player) || gSitMain.getPoseService().isPlayerPosing(player) || gSitMain.getCrawlService().isPlayerCrawling(player)) return;
 
         double distance = gSitMain.getConfigService().S_MAX_DISTANCE;

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

@@ -87,7 +87,11 @@ public boolean stopPlayerSit(Player source, GStopReason stopReason, boolean remo
             topToBottomStacks.remove(passengers.getKey());
             for(UUID passenger : passengers.getValue()) {
                 Entity passengerEntity = Bukkit.getEntity(passenger);
-                if(passengerEntity != null) passengerEntity.remove();
+                if(passengerEntity != null) {
+                    gSitMain.getTaskService().run(() -> {
+                        if(passengerEntity.isValid()) passengerEntity.remove();
+                    }, passengerEntity.getLocation());
+                }
             }
             String key = source.getUniqueId().toString() + passengers.getKey();
             Long spawnTime = spawnTimes.get(key);
@@ -102,7 +106,11 @@ public boolean stopPlayerSit(Player source, GStopReason stopReason, boolean remo
             bottomToTopStacks.remove(vehicles.getKey());
             for(UUID vehicle : vehicles.getValue()) {
                 Entity vehicleEntity = Bukkit.getEntity(vehicle);
-                if(vehicleEntity != null) vehicleEntity.remove();
+                if(vehicleEntity != null) {
+                    gSitMain.getTaskService().run(() -> {
+                        if(vehicleEntity.isValid()) vehicleEntity.remove();
+                    }, vehicleEntity.getLocation());
+                }
             }
             String key = vehicles.getKey().toString() + source.getUniqueId();
             Long spawnTime = spawnTimes.get(key);

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

@@ -36,6 +36,7 @@ public class SitService {
     private final double baseOffset;
     private final HashMap<UUID, GSeat> seats = new HashMap<>();
     private final HashMap<Block, Set<GSeat>> blockSeats = new HashMap<>();
+    private final HashSet<UUID> entityBlocked = new HashSet<>();
     private int sitUsageCount = 0;
     private long sitUsageNanoTime = 0;
 
@@ -56,18 +57,22 @@ public SitService(GSitMain gSitMain) {
 
     public boolean isBlockWithSeat(Block block) { return blockSeats.containsKey(block); }
 
+    public boolean isEntityBlocked(Entity entity) { return entityBlocked.contains(entity.getUniqueId()); }
+
     public Set<GSeat> getSeatsByBlock(Block block) { return blockSeats.getOrDefault(block, Collections.emptySet()); }
 
     public boolean kickSeatEntitiesFromBlock(Block block, LivingEntity entity) {
         if(!isBlockWithSeat(block)) return true;
-        if(!gSitMain.getPermissionService().hasPermission(entity, "Kick.Sit")) return false;
+        if(!gSitMain.getPermissionService().hasPermission(entity, "Kick.Sit", "Kick.*")) return false;
         for(GSeat seat : getSeatsByBlock(block)) if(!removeSeat(seat, GStopReason.KICKED)) return false;
         return true;
     }
 
     public GSeat createSeat(Block block, LivingEntity entity) { return createSeat(block, entity, true, 0d, 0d, 0d, entity.getLocation().getYaw(), gSitMain.getConfigService().CENTER_BLOCK); }
 
     public GSeat createSeat(Block block, LivingEntity entity, boolean canRotate, double xOffset, double yOffset, double zOffset, float seatRotation, boolean sitInBlockCenter) {
+        if(entityBlocked.contains(entity.getUniqueId())) return null;
+
         Location returnLocation = entity.getLocation();
         Location seatLocation = getSeatLocation(block, returnLocation, xOffset, yOffset, zOffset, sitInBlockCenter);
         if(!gSitMain.getEntityUtil().isSitLocationValid(seatLocation)) return null;
@@ -148,6 +153,8 @@ public void handleSafeSeatDismount(GSeat seat) {
 
         Location returnLocation = gSitMain.getConfigService().GET_UP_RETURN ? seat.getReturnLocation() : upLocation;
 
+        if(entity.isValid()) entityBlocked.add(entity.getUniqueId());
+
         gSitMain.getTaskService().runDelayed(() -> {
             Location entityLocation = entity.getLocation();
 
@@ -156,7 +163,9 @@ public void handleSafeSeatDismount(GSeat seat) {
 
             if(seat.getSeatEntity().isValid()) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
             if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
-        }, 0);
+
+            entityBlocked.remove(entity.getUniqueId());
+        }, returnLocation, 1);
     }
 
     public GSeat createStairSeatForEntity(Block block, LivingEntity entity) {