From c1dc103219689a887594669c1ae79229588e4532 Mon Sep 17 00:00:00 2001 From: AverageGithub Date: Thu, 11 Apr 2024 18:17:50 +0200 Subject: [PATCH] Possibly fix SSB2 lag --- build.gradle | 1 - .../axminions/listeners/SuperiorSkyBlock2Listener.kt | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 153a97b..66ea848 100644 --- a/build.gradle +++ b/build.gradle @@ -156,7 +156,6 @@ shadowJar { relocate("net.kyori", "com.artillexstudios.axminions.libs.kyori") relocate("revxrsal.commands", "com.artillexstudios.axminions.libs.lamp") relocate("org.jetbrains.annotations", "com.artillexstudios.axminions.libs.annotations") - relocate("org.slf4j", "com.artillexstudios.axminions.libs.slf4j") relocate("org.intellij.lang.annotations", "com.artillexstudios.axminions.libs.intellij.annotations") } diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/SuperiorSkyBlock2Listener.kt b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/SuperiorSkyBlock2Listener.kt index d5bd713..9eda25a 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/SuperiorSkyBlock2Listener.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/SuperiorSkyBlock2Listener.kt @@ -2,8 +2,10 @@ package com.artillexstudios.axminions.listeners import com.artillexstudios.axminions.minions.Minions import com.bgsoftware.superiorskyblock.api.events.IslandDisbandEvent +import org.bukkit.World.Environment import org.bukkit.event.EventHandler import org.bukkit.event.Listener +import org.bukkit.World class SuperiorSkyBlock2Listener : Listener { @@ -11,10 +13,12 @@ class SuperiorSkyBlock2Listener : Listener { fun onIslandDisbandEvent(event: IslandDisbandEvent) { val minions = Minions.getMinions() - event.island.allChunks.forEach { chunk -> - minions.forEach { minion -> - if (minion.getLocation().chunk == chunk) { - minion.remove() + Environment.entries.forEach { entry -> + event.island.getAllChunksAsync(entry, true) {}.forEach { chunk -> + minions.forEach { minion -> + if (minion.getLocation().chunk == chunk) { + minion.remove() + } } } }