Merge remote-tracking branch 'upstream/main'

Author: Dreeam-qwq

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     `java-library`
     `maven-publish`
-    id("com.gradleup.shadow") version "9.0.0-beta16"
+    id("com.gradleup.shadow") version "9.0.0-beta17"
     id("io.papermc.paperweight.userdev") version "2.0.0-beta.17" apply false
 }
 
@@ -44,7 +44,7 @@ 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", "default"))
+    api(project(":v1_21_6", io.papermc.paperweight.util.constants.REOBF_CONFIG))
 }
 
 tasks {

core/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.7-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/GSitMain.java

@@ -284,7 +284,7 @@ private void loadFeatures() {
 
     private void loadPluginDependencies() {
         Plugin plugin = Bukkit.getPluginManager().getPlugin("GriefPrevention");
-        if(plugin != null && plugin.isEnabled()) griefPreventionLink = new GriefPreventionLink(this);
+        if(plugin != null && plugin.isEnabled() && configService.TRUSTED_REGION_ONLY) griefPreventionLink = new GriefPreventionLink(this);
         else griefPreventionLink = null;
 
         plugin = Bukkit.getPluginManager().getPlugin("PlaceholderAPI");
@@ -294,7 +294,7 @@ private void loadPluginDependencies() {
         } else placeholderAPILink = null;
 
         plugin = Bukkit.getPluginManager().getPlugin("PlotSquared");
-        if(plugin != null && plugin.isEnabled()) {
+        if(plugin != null && plugin.isEnabled() && configService.TRUSTED_REGION_ONLY) {
             plotSquaredLink = new PlotSquaredLink(this);
             if(!plotSquaredLink.isPlotSquaredVersionSupported()) plotSquaredLink = null;
         } else plotSquaredLink = null;

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

@@ -76,7 +76,7 @@ public void playerInteractAtEntityEvent(PlayerInteractAtEntityEvent event) {
 
         if(!gSitMain.getEnvironmentUtil().canUseInLocation(target.getLocation(), player, "playersit")) return;
 
-        if(gSitMain.getPassengerUtil().isEntityInEntityPassengerList(target, player) || gSitMain.getPassengerUtil().isEntityInEntityPassengerList(player, target)) return;
+        if(gSitMain.getPassengerUtil().isEntityInPassengerList(target, player) || gSitMain.getPassengerUtil().isEntityInPassengerList(player, target)) return;
 
         long amount = gSitMain.getPassengerUtil().getEntityPassengerCount(target) + 1 + gSitMain.getPassengerUtil().getEntityVehicleCount(target) + gSitMain.getPassengerUtil().getEntityPassengerCount(player);
         if(gSitMain.getConfigService().PS_MAX_STACK > 0 && gSitMain.getConfigService().PS_MAX_STACK <= amount) return;

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

@@ -19,7 +19,7 @@ public GriefPreventionLink(GSitMain gSitMain) {
     public boolean canUseInLocation(Location location, Player player) {
         try {
             Claim claim = GriefPrevention.instance.dataStore.getClaimAt(location, false, null);
-            return claim == null || (!gSitMain.getConfigService().TRUSTED_REGION_ONLY || claim.canSiege(player));
+            return claim == null || claim.canSiege(player);
         } catch(Throwable e) { gSitMain.getLogger().log(Level.SEVERE, "Could not check GriefPrevention location!", e); }
         return true;
     }

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

@@ -32,7 +32,7 @@ public PlaceholderAPILink(GSitMain gSitMain) {
     public @NotNull String getVersion() { return gSitMain.getDescription().getVersion(); }
 
     @Override
-    public @NotNull List<String> getPlaceholders() { return Arrays.asList("crawling", "emoting", "playertoggle", "posing", "sitting", "toggle"); }
+    public @NotNull List<String> getPlaceholders() { return Arrays.asList("crawling", "playertoggle", "posing", "sitting", "toggle"); }
 
     @Override
     public boolean persist() { return true; }

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

@@ -27,17 +27,17 @@ public boolean canUseInLocation(Location Location, Player Player) {
             PlotAPI plotAPI = new PlotAPI();
 
             PlotPlayer<?> plotPlayer = plotAPI.wrapPlayer(Player.getUniqueId());
-            if(plotPlayer == null) return !gSitMain.getConfigService().TRUSTED_REGION_ONLY;
+            if(plotPlayer == null) return true;
 
             com.plotsquared.core.location.Location location = com.plotsquared.core.location.Location.at(plotPlayer.getLocation().getWorld(), Location.getBlockX(), Location.getBlockY(), Location.getBlockZ());
 
             PlotArea plotArea = plotAPI.getPlotSquared().getPlotAreaManager().getApplicablePlotArea(location);
-            if(plotArea == null) return !gSitMain.getConfigService().TRUSTED_REGION_ONLY;
+            if(plotArea == null) return true;
 
             Plot plot = plotArea.getOwnedPlot(location);
-            if(plot == null) return !gSitMain.getConfigService().TRUSTED_REGION_ONLY;
+            if(plot == null) return true;
 
-            return !plot.isDenied(Player.getUniqueId()) && (!gSitMain.getConfigService().TRUSTED_REGION_ONLY || plot.isAdded(Player.getUniqueId()));
+            return !plot.isDenied(Player.getUniqueId()) && plot.isAdded(Player.getUniqueId());
         } catch(Throwable e) { gSitMain.getLogger().log(Level.SEVERE, "Could not check PlotSquared location!", e); }
         return true;
     }

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

@@ -4,7 +4,6 @@
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-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;
@@ -53,11 +52,9 @@ public boolean canUseInLocation(Location location, Player player, String flag) {
             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
-            if(!flag.equalsIgnoreCase("crawl") && !regionQuery.testBuild(regionLocation, localPlayer, Flags.RIDE, Flags.INTERACT)) return false;
             FlagRegistry flagRegistry = WorldGuard.getInstance().getFlagRegistry();
             if(!(flagRegistry.get(flag) instanceof StateFlag stateFlag)) return true;
+            LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
             return regionQuery.testState(regionLocation, localPlayer, stateFlag);
         } catch(Throwable e) { GSitMain.getInstance().getLogger().log(Level.SEVERE, "Could not check WorldGuard location!", e); }
         return true;

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

@@ -31,6 +31,7 @@ public class SitService {
 
     public static final double STAIR_XZ_OFFSET = 0.123d;
     public static final double STAIR_Y_OFFSET = 0.5d;
+    public static final String SIT_TAG = GSitMain.NAME + "_sit";
 
     private final GSitMain gSitMain;
     private final double baseOffset;
@@ -133,6 +134,7 @@ public boolean removeSeat(GSeat seat, GStopReason stopReason, boolean useSafeDis
         if(preEntityStopSitEvent.isCancelled() && stopReason.isCancellable()) return false;
 
         Entity entity = seat.getEntity();
+        entityBlocked.add(entity.getUniqueId());
         if(useSafeDismount) handleSafeSeatDismount(seat);
 
         Set<GSeat> blockSeatList = blockSeats.remove(seat.getBlock());
@@ -142,6 +144,7 @@ public boolean removeSeat(GSeat seat, GStopReason stopReason, boolean useSafeDis
         }
         seats.remove(entity.getUniqueId());
         seat.getSeatEntity().remove();
+        entityBlocked.remove(entity.getUniqueId());
         Bukkit.getPluginManager().callEvent(new EntityStopSitEvent(seat, stopReason));
         sitUsageNanoTime += seat.getLifetimeInNanoSeconds();
 
@@ -156,25 +159,13 @@ public void handleSafeSeatDismount(GSeat seat) {
 
         Location returnLocation = gSitMain.getConfigService().GET_UP_RETURN ? seat.getReturnLocation() : upLocation;
 
-        if(entity.isValid()) entityBlocked.add(entity.getUniqueId());
-
         Location entityLocation = entity.getLocation();
 
         returnLocation.setYaw(entityLocation.getYaw());
         returnLocation.setPitch(entityLocation.getPitch());
 
-        if(seat.getSeatEntity().isValid()) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
-        if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
-
-        gSitMain.getTaskService().runDelayed(() -> {
-            if(seat.getSeatEntity().isValid()) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
-            if(gSitMain.supportsFoliaFeature()) gSitMain.getTaskService().runDelayed(() -> {
-                if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
-            }, true, Bukkit.isOwnedByCurrentRegion(entity) ? entity : null, 0);
-            else if(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
-
-            entityBlocked.remove(entity.getUniqueId());
-        }, returnLocation, 1);
+        gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
+        if(!gSitMain.getVersionManager().isNewerOrVersion(17, 0)) gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), returnLocation);
     }
 
     public GSeat createStairSeatForEntity(Block block, LivingEntity entity) {

core/src/main/java/dev/geco/gsit/util/PassengerUtil.java

@@ -24,10 +24,10 @@ public long getEntityPassengerCount(Entity entity) {
         return passengerCount;
     }
 
-    public boolean isEntityInEntityPassengerList(Entity entity, Entity passenger) {
+    public boolean isEntityInPassengerList(Entity entity, Entity passenger) {
         List<Entity> currentPassengers = entity.getPassengers();
         if(currentPassengers.contains(passenger)) return true;
-        for(Entity currentPassenger : currentPassengers) if(isEntityInEntityPassengerList(currentPassenger, passenger)) return true;
+        for(Entity currentPassenger : currentPassengers) if(isEntityInPassengerList(currentPassenger, passenger)) return true;
         return false;
     }