Merge branch 'gecolay:main' into main

Dreeam-qwq · web-flow · commit 9645f9e9f39c · 2025-05-01T15:35:33.000-04:00
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     }
     compileOnly("me.clip:placeholderapi:2.11.6")
     compileOnly("com.github.GriefPrevention:GriefPrevention:16.18.4")
-    compileOnly("com.intellectualsites.plotsquared:plotsquared-core:7.5.1")
+    compileOnly("com.intellectualsites.plotsquared:plotsquared-core:7.5.2")
 }
 
 java {
diff --git a/core/src/main/java/dev/geco/gsit/GSitMain.java b/core/src/main/java/dev/geco/gsit/GSitMain.java
@@ -264,7 +264,7 @@ private void loadFeatures() {
         } catch(ClassNotFoundException e) { supportsPaperFeature = false; }
 
         try {
-            Class.forName("io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler");
+            Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
             supportsTaskFeature = true;
         } catch(ClassNotFoundException e) { supportsTaskFeature = false; }
 
diff --git a/core/src/main/java/dev/geco/gsit/event/PlayerEventHandler.java b/core/src/main/java/dev/geco/gsit/event/PlayerEventHandler.java
@@ -48,7 +48,7 @@ public void playerQuitEvent(PlayerQuitEvent event) {
     public void playerTeleportEvent(PlayerTeleportEvent event) { stopActions(event.getPlayer(), GStopReason.TELEPORT, false); }
 
     @EventHandler(priority = EventPriority.LOWEST)
-    public void playerDeathEvent(PlayerDeathEvent event) { stopActions(event.getPlayer(), GStopReason.DEATH, false); }
+    public void playerDeathEvent(PlayerDeathEvent event) { stopActions(event.getEntity(), GStopReason.DEATH, false); }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void entityDamageEvent(EntityDamageEvent event) {
diff --git a/core/src/main/java/dev/geco/gsit/service/PlayerSitService.java b/core/src/main/java/dev/geco/gsit/service/PlayerSitService.java
@@ -87,10 +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) {
-                    gSitMain.getTaskService().run(() -> {
-                        if(passengerEntity.isValid()) passengerEntity.remove();
-                    }, passengerEntity.getLocation());
+                if(passengerEntity == null) continue;
+                try {
+                    passengerEntity.remove();
+                } catch(Throwable e) {
+                    gSitMain.getTaskService().run(passengerEntity::remove, passengerEntity);
                 }
             }
             String key = source.getUniqueId().toString() + passengers.getKey();
@@ -106,10 +107,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) {
-                    gSitMain.getTaskService().run(() -> {
-                        if(vehicleEntity.isValid()) vehicleEntity.remove();
-                    }, vehicleEntity.getLocation());
+                if(vehicleEntity == null) continue;
+                try {
+                    vehicleEntity.remove();
+                } catch(Throwable e) {
+                    gSitMain.getTaskService().run(vehicleEntity::remove, vehicleEntity);
                 }
             }
             String key = vehicles.getKey().toString() + source.getUniqueId();
diff --git a/core/src/main/java/dev/geco/gsit/service/SitService.java b/core/src/main/java/dev/geco/gsit/service/SitService.java
@@ -117,11 +117,10 @@ public void moveSeat(GSeat seat, BlockFace blockDirection) {
             if(playerMoveEvent.isCancelled()) return;
         }
 
-        Set<GSeat> seats = blockSeats.get(seat.getBlock());
-        if(seats != null) seats.remove(seat);
+        Set<GSeat> blockSeatList = blockSeats.get(seat.getBlock());
+        if(blockSeatList != null) blockSeatList.remove(seat);
         seat.setBlock(seat.getBlock().getRelative(blockDirection));
-        seats = blockSeats.get(seat.getBlock());
-        if(seats != null) seats.add(seat);
+        blockSeats.computeIfAbsent(seat.getBlock(), k -> new HashSet<>()).add(seat);
         seat.setLocation(seat.getLocation().add(blockDirection.getModX(), blockDirection.getModY(), blockDirection.getModZ()));
         gSitMain.getEntityUtil().setEntityLocation(seat.getSeatEntity(), seat.getLocation());
     }
@@ -136,7 +135,11 @@ public boolean removeSeat(GSeat seat, GStopReason stopReason, boolean useSafeDis
         Entity entity = seat.getEntity();
         if(useSafeDismount) handleSafeSeatDismount(seat);
 
-        blockSeats.remove(seat.getBlock());
+        Set<GSeat> blockSeatList = blockSeats.remove(seat.getBlock());
+        if(blockSeatList != null) {
+            blockSeatList.remove(seat);
+            if(blockSeatList.isEmpty()) blockSeats.remove(seat.getBlock());
+        }
         seats.remove(entity.getUniqueId());
         seat.getSeatEntity().remove();
         Bukkit.getPluginManager().callEvent(new EntityStopSitEvent(seat, stopReason));
@@ -155,12 +158,15 @@ public void handleSafeSeatDismount(GSeat seat) {
 
         if(entity.isValid()) entityBlocked.add(entity.getUniqueId());
 
-        gSitMain.getTaskService().runDelayed(() -> {
-            Location entityLocation = entity.getLocation();
+        Location entityLocation = entity.getLocation();
 
-            returnLocation.setYaw(entityLocation.getYaw());
-            returnLocation.setPitch(entityLocation.getPitch());
+        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(entity.isValid()) gSitMain.getEntityUtil().setEntityLocation(entity, returnLocation);
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.3.0
+version=2.3.2
 group=dev.geco.gsit
 description=Relax with other players on nice seats!
 
diff --git a/mcv/v1_19_3/src/main/java/dev/geco/gsit/mcv/v1_19_3/util/EntityUtil.java b/mcv/v1_19_3/src/main/java/dev/geco/gsit/mcv/v1_19_3/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.get(0);
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_19_4/src/main/java/dev/geco/gsit/mcv/v1_19_4/util/EntityUtil.java b/mcv/v1_19_4/src/main/java/dev/geco/gsit/mcv/v1_19_4/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.get(0);
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_20/src/main/java/dev/geco/gsit/mcv/v1_20/util/EntityUtil.java b/mcv/v1_20/src/main/java/dev/geco/gsit/mcv/v1_20/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.get(0);
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_20_2/src/main/java/dev/geco/gsit/mcv/v1_20_2/util/EntityUtil.java b/mcv/v1_20_2/src/main/java/dev/geco/gsit/mcv/v1_20_2/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.get(0);
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_20_3/src/main/java/dev/geco/gsit/mcv/v1_20_3/util/EntityUtil.java b/mcv/v1_20_3/src/main/java/dev/geco/gsit/mcv/v1_20_3/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.get(0);
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_20_5/src/main/java/dev/geco/gsit/mcv/v1_20_5/util/EntityUtil.java b/mcv/v1_20_5/src/main/java/dev/geco/gsit/mcv/v1_20_5/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.getFirst();
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_21/src/main/java/dev/geco/gsit/mcv/v1_21/util/EntityUtil.java b/mcv/v1_21/src/main/java/dev/geco/gsit/mcv/v1_21/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.getFirst();
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_21_2/src/main/java/dev/geco/gsit/mcv/v1_21_2/util/EntityUtil.java b/mcv/v1_21_2/src/main/java/dev/geco/gsit/mcv/v1_21_2/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.getFirst();
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_21_4/src/main/java/dev/geco/gsit/mcv/v1_21_4/util/EntityUtil.java b/mcv/v1_21_4/src/main/java/dev/geco/gsit/mcv/v1_21_4/util/EntityUtil.java
@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {
         if(gSitMain.supportsPaperFeature()) return;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.getFirst();
         entityManager.setAccessible(true);
     }
diff --git a/mcv/v1_21_5/build.gradle.kts b/mcv/v1_21_5/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     compileOnly(project(":core"))
-    paperweight.paperDevBundle("1.21.5-no-moonrise-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT")
 }
 
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
diff --git a/mcv/v1_21_5/src/main/java/dev/geco/gsit/mcv/v1_21_5/util/EntityUtil.java b/mcv/v1_21_5/src/main/java/dev/geco/gsit/mcv/v1_21_5/util/EntityUtil.java
@@ -10,6 +10,7 @@
 import dev.geco.gsit.object.IGPose;
 import dev.geco.gsit.util.IEntityUtil;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.entity.LevelEntityGetter;
 import net.minecraft.world.level.entity.PersistentEntitySectionManager;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.entity.CraftEntity;
@@ -35,6 +36,7 @@ public EntityUtil(GSitMain gSitMain) {
         this.gSitMain = gSitMain;
         List<Field> entityManagerFieldList = new ArrayList<>();
         for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);
+        if(entityManagerFieldList.isEmpty()) return;
         entityManager = entityManagerFieldList.getFirst();
         if(entityManager != null) entityManager.setAccessible(true);
     }
@@ -108,7 +110,7 @@ private boolean spawnEntity(net.minecraft.world.entity.Entity entity) {
             return false;
         }
         try {
-            net.minecraft.world.level.entity.LevelEntityGetter<net.minecraft.world.entity.Entity> levelEntityGetter = entity.level().getEntities();
+            LevelEntityGetter<net.minecraft.world.entity.Entity> levelEntityGetter = entity.level().getEntities();
             return (boolean) levelEntityGetter.getClass().getMethod("addNewEntity", net.minecraft.world.entity.Entity.class).invoke(levelEntityGetter, entity);
         } catch(Throwable e) { gSitMain.getLogger().log(Level.SEVERE, "Could not spawn entity", e); }
         return false;
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,37 +1,18 @@
 rootProject.name = "GSit"
 
 include(":core")
-include(":v1_17_1")
-project(":v1_17_1").projectDir = file("mcv/v1_17_1")
-include(":v1_18")
-project(":v1_18").projectDir = file("mcv/v1_18")
-include(":v1_18_2")
-project(":v1_18_2").projectDir = file("mcv/v1_18_2")
-include(":v1_19")
-project(":v1_19").projectDir = file("mcv/v1_19")
-include(":v1_19_1")
-project(":v1_19_1").projectDir = file("mcv/v1_19_1")
-include(":v1_19_3")
-project(":v1_19_3").projectDir = file("mcv/v1_19_3")
-include(":v1_19_4")
-project(":v1_19_4").projectDir = file("mcv/v1_19_4")
-include(":v1_20")
-project(":v1_20").projectDir = file("mcv/v1_20")
-include(":v1_20_2")
-project(":v1_20_2").projectDir = file("mcv/v1_20_2")
-include(":v1_20_3")
-project(":v1_20_3").projectDir = file("mcv/v1_20_3")
-include(":v1_20_5")
-project(":v1_20_5").projectDir = file("mcv/v1_20_5")
-include(":v1_21")
-project(":v1_21").projectDir = file("mcv/v1_21")
-include(":v1_21_2")
-project(":v1_21_2").projectDir = file("mcv/v1_21_2")
-include(":v1_21_4")
-project(":v1_21_4").projectDir = file("mcv/v1_21_4")
-include(":v1_21_5")
-project(":v1_21_5").projectDir = file("mcv/v1_21_5")
+
+listOf(
+    "v1_17_1",
+    "v1_18", "v1_18_2",
+    "v1_19", "v1_19_1", "v1_19_3", "v1_19_4",
+    "v1_20", "v1_20_2", "v1_20_3", "v1_20_5",
+    "v1_21", "v1_21_2", "v1_21_4", "v1_21_5"
+).forEach {
+    include(":$it")
+    project(":$it").projectDir = file("mcv/$it")
+}
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ dependencies {`
`11`	`11`	`}`
`12`	`12`	`compileOnly("me.clip:placeholderapi:2.11.6")`
`13`	`13`	`compileOnly("com.github.GriefPrevention:GriefPrevention:16.18.4")`
`14`		`- compileOnly("com.intellectualsites.plotsquared:plotsquared-core:7.5.1")`
	`14`	`+ compileOnly("com.intellectualsites.plotsquared:plotsquared-core:7.5.2")`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version=2.3.0`
	`1`	`+version=2.3.2`
`2`	`2`	`group=dev.geco.gsit`
`3`	`3`	`description=Relax with other players on nice seats!`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public EntityUtil(GSitMain gSitMain) {`
`37`	`37`	`if(gSitMain.supportsPaperFeature()) return;`
`38`	`38`	`List<Field> entityManagerFieldList = new ArrayList<>();`
`39`	`39`	`for(Field field : ServerLevel.class.getDeclaredFields()) if(field.getType().equals(PersistentEntitySectionManager.class)) entityManagerFieldList.add(field);`
	`40`	`+ if(entityManagerFieldList.isEmpty()) return;`
`40`	`41`	`entityManager = entityManagerFieldList.get(0);`
`41`	`42`	`entityManager.setAccessible(true);`
`42`	`43`	`}`