Prevent "Plugin is getting a faraway chunk" spam when players are at … (#238)

xKumorio · web-flow · commit 1f7ebc5b6366 · 2024-10-02T10:42:42.000+02:00
* Prevent "Plugin is getting a faraway chunk" spam when players are at world border. * Prevent "Plugin is getting a faraway chunk" spam when players are at world border. * Deleted the weird symbol, why is it here? * ignoreCancelled by default false * Revert "ignoreCancelled by default false" This reverts commit 3d3090a.
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/bedrock/FillNetherCeilingOnChunkload.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/bedrock/FillNetherCeilingOnChunkload.java
@@ -50,6 +50,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (!alsoCheckNewChunks && event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
         World world = event.getWorld();
         if (world.getEnvironment() != World.Environment.NETHER) return;
         if (exemptedWorlds.contains(world.getName())) return;
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/bedrock/FillNetherFloorOnChunkload.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/bedrock/FillNetherFloorOnChunkload.java
@@ -50,6 +50,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (!alsoCheckNewChunks && event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
         World world = event.getWorld();
         if (world.getEnvironment() != World.Environment.NETHER) return;
         if (exemptedWorlds.contains(world.getName())) return;
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/bedrock/FillOverworldFloorOnChunkload.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/bedrock/FillOverworldFloorOnChunkload.java
@@ -50,6 +50,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (!alsoCheckNewChunks && event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
         World world = event.getWorld();
         if (world.getEnvironment() != World.Environment.NETHER) return;
         if (exemptedWorlds.contains(world.getName())) return;
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/chunklimits/DroppedItemLimit.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/chunklimits/DroppedItemLimit.java
@@ -125,6 +125,7 @@ private void onItemDrop(ItemSpawnEvent event) {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (!onChunkLoad || event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         int droppedItemCount = 0;
 
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/elytra/ElytraHelper.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/elytra/ElytraHelper.java
@@ -164,5 +164,5 @@ public void calcSpeedAvg(boolean using3D, long tickPeriod) {
             speedAvg = Math.abs(using3D ? LocationUtil.getRelDistance3D(previous, latest) : LocationUtil.getRelDistance2D(previous, latest)) / tickPeriod;
             previous = latest.clone();
         }
-    };
+    }
 }
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java
@@ -122,6 +122,7 @@ private void onItemGoesThroughHopper(InventoryMoveItemEvent event) {
                 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
                 private void onChunkLoad(ChunkLoadEvent event) {
                     if (event.isNewChunk()) return;
+                    if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
                     Chunk chunk = event.getChunk();
                     final int minY = event.getWorld().getMinHeight();
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveIllegalBlocksOnChunkload.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveIllegalBlocksOnChunkload.java
@@ -71,6 +71,7 @@ public void disable() {
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
         if (checkShouldPauseOnLowTPS && AnarchyExploitFixes.getTickReporter().getTPS() <= pauseTPS) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         Chunk chunk = event.getChunk();
         World world = chunk.getWorld();
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveUnnaturalSpawners.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveUnnaturalSpawners.java
@@ -87,6 +87,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk() || checkShouldPauseOnLowTPS && AnarchyExploitFixes.getTickReporter().getTPS() <= pauseTPS) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         Chunk chunk = event.getChunk();
         World world = chunk.getWorld();
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/lagpreventions/KeepStashLoaded.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/lagpreventions/KeepStashLoaded.java
@@ -143,6 +143,7 @@ private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
         final String world = event.getWorld().getName();
         if (!worldsAndTheirRadiuses.containsKey(world)) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         Chunk chunk = event.getChunk();
 
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/lagpreventions/agelimits/CustomAgeLimits.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/lagpreventions/agelimits/CustomAgeLimits.java
@@ -114,6 +114,7 @@ public void accept(ScheduledTask task) {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         for (Entity entity : event.getChunk().getEntities()) {
             if (entityLimits.containsKey(entity.getType()) && entity.getTicksLived() >= entityLimits.get(entity.getType())) {
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/MapCursorLag.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/MapCursorLag.java
@@ -58,6 +58,7 @@ public void onPacketSend(PacketSendEvent event) {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         for (Entity entity : event.getChunk().getEntities()) {
             if (EntityUtil.ITEM_FRAMES.contains(entity.getType())) {
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/preventions/withers/RemoveSkullsOnChunkload.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/preventions/withers/RemoveSkullsOnChunkload.java
@@ -36,6 +36,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         for (Entity entity : event.getChunk().getEntities()) {
             if (entity.getType() == XEntityType.WITHER_SKULL.get()) {
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/bedrock/FillNetherCeilingOnChunkload.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/bedrock/FillNetherCeilingOnChunkload.java
@@ -54,6 +54,7 @@ private void onChunkLoad(ChunkLoadEvent event) {
         final World world = event.getWorld();
         if (world.getEnvironment() != World.Environment.NETHER) return;
         if (exemptedWorlds.contains(world.getName())) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         if (!pauseOnLowTPS || AnarchyExploitFixes.getTickReporter().getTPS() >= pauseTPS) {
             ChunkUtil.createBedrockLayer(event.getChunk(), config.nether_ceiling_max_y);
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/bedrock/FillNetherFloorOnChunkload.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/bedrock/FillNetherFloorOnChunkload.java
@@ -54,6 +54,7 @@ private void onChunkLoad(ChunkLoadEvent event) {
         if (world.getEnvironment() != World.Environment.NETHER) return;
         if (exemptedWorlds.contains(world.getName())) return;
         if (!alsoCheckNewChunks && event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         if (!pauseOnLowTPS || AnarchyExploitFixes.getTickReporter().getTPS() >= pauseTPS) {
             ChunkUtil.createBedrockLayer(event.getChunk(), WorldUtil.getMinWorldHeight(world));
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/bedrock/FillOverworldFloorOnChunkload.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/bedrock/FillOverworldFloorOnChunkload.java
@@ -54,6 +54,7 @@ private void onChunkLoad(ChunkLoadEvent event) {
         final World world = event.getWorld();
         if (world.getEnvironment() != World.Environment.NORMAL) return;
         if (exemptedWorlds.contains(world.getName())) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         if (!pauseOnLowTPS || AnarchyExploitFixes.getTickReporter().getTPS() >= pauseTPS) {
             ChunkUtil.createBedrockLayer(event.getChunk(), WorldUtil.getMinWorldHeight(world));
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/chunklimits/DroppedItemLimit.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/chunklimits/DroppedItemLimit.java
@@ -121,6 +121,7 @@ private void onItemDrop(ItemSpawnEvent event) {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (!onChunkLoad || event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         int droppedItemCount = 0;
 
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/elytra/ElytraHelper.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/elytra/ElytraHelper.java
@@ -180,6 +180,8 @@ public NewChunksListener() {
 
         @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
         private void onChunkLoad(ChunkLoadEvent event) {
+            if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
+
             for (Player player : event.getWorld().getPlayers()) {
                 if (ChunkUtil.getChunkDistanceSquared(event.getChunk(), player.getLocation()) < NumberConversions.square(player.getViewDistance())) {
                     if (event.isNewChunk()) {
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java
@@ -122,6 +122,7 @@ private void onItemGoesThroughHopper(InventoryMoveItemEvent event) {
                 @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
                 private void onChunkLoad(ChunkLoadEvent event) {
                     if (event.isNewChunk()) return;
+                    if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
                     Chunk chunk = event.getChunk();
                     final int minY = WorldUtil.getMinWorldHeight(event.getWorld());
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveIllegalBlocksOnChunkload.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveIllegalBlocksOnChunkload.java
@@ -82,6 +82,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk() || (checkShouldPauseOnLowTPS && AnarchyExploitFixes.getTickReporter().getTPS() <= pauseTPS)) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         Chunk chunk = event.getChunk();
         World world = chunk.getWorld();
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveUnnaturalSpawners.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/placedblocks/RemoveUnnaturalSpawners.java
@@ -88,6 +88,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk() || checkShouldPauseOnLowTPS && AnarchyExploitFixes.getTickReporter().getTPS() <= pauseTPS) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         Chunk chunk = event.getChunk();
         World world = chunk.getWorld();
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/lagpreventions/KeepStashLoaded.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/lagpreventions/KeepStashLoaded.java
@@ -139,6 +139,8 @@ public void run() {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
+
         final String world = event.getWorld().getName();
         if (!worldsAndTheirRadiuses.containsKey(world)) return;
 
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/lagpreventions/agelimits/CustomAgeLimits.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/lagpreventions/agelimits/CustomAgeLimits.java
@@ -96,6 +96,7 @@ public void run() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         for (Entity entity : event.getChunk().getEntities()) {
             if (entityLimits.containsKey(entity.getType()) && entity.getTicksLived() >= entityLimits.get(entity.getType())) {
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/MapCursorLag.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/MapCursorLag.java
@@ -58,6 +58,7 @@ public void onPacketSend(PacketSendEvent event) {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         for (Entity entity : event.getChunk().getEntities()) {
             if (EntityUtil.ITEM_FRAMES.contains(entity.getType())) {
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/preventions/withers/RemoveSkullsOnChunkload.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/preventions/withers/RemoveSkullsOnChunkload.java
@@ -36,6 +36,7 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     private void onChunkLoad(ChunkLoadEvent event) {
         if (event.isNewChunk()) return;
+        if (event.getChunk().getX() > 1875000 || event.getChunk().getZ() > 1875000 || event.getChunk().getX() < -1875000 || event.getChunk().getZ() < -1875000) return;
 
         for (Entity entity : event.getChunk().getEntities()) {
             if (entity.getType() == XEntityType.WITHER_SKULL.get()) {

Original file line number	Diff line number	Diff line change
`@@ -164,5 +164,5 @@ public void calcSpeedAvg(boolean using3D, long tickPeriod) {`
`164`	`164`	`speedAvg = Math.abs(using3D ? LocationUtil.getRelDistance3D(previous, latest) : LocationUtil.getRelDistance2D(previous, latest)) / tickPeriod;`
`165`	`165`	`previous = latest.clone();`
`166`	`166`	`}`
`167`		`- };`
	`167`	`+ }`
`168`	`168`	`}`