Updated to 6.20.4

eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java

@@ -75,7 +75,7 @@ public final class PlaceholderManager {
     public static String getResult(@Nullable final Player player,
                                    @NotNull final String identifier,
                                    @Nullable final EcoPlugin plugin) {
-        EcoPlugin owner = player == null ? Eco.getHandler().getEcoPlugin() : plugin;
+        EcoPlugin owner = plugin == null ? Eco.getHandler().getEcoPlugin() : plugin;
         PlaceholderEntry entry = REGISTERED_PLACEHOLDERS.getOrDefault(owner, new HashMap<>()).get(identifier.toLowerCase());
 
         if (entry == null && plugin != null) {

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/display/PacketWindowItems.kt

@@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketContainer
 import com.comphenix.protocol.events.PacketEvent
 import com.google.common.util.concurrent.ThreadFactoryBuilder
 import com.willfp.eco.core.AbstractPacketAdapter
+import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.fast.FastItemStack
@@ -47,17 +48,10 @@ class PacketWindowItems(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, Packe
         handleRateLimit(player)
 
         if (usingAsync(player)) {
+            val newPacket = packet.deepClone()
+
             executor.execute {
-                runCatching {
+                runCatchingWithLogs { modifyAndSend(newPacket, itemStacks, windowId, player) }
-                    modifyAndSend(packet.shallowClone(), itemStacks, windowId, player)
-                }.onFailure {
-                    if (this.getPlugin().configYml.getBool("async-display.log-errors")) {
-                        this.getPlugin().logger.warning(
-                            "Error happened in async processing! Disable async display (/plugins/eco/config.yml)" +
-                                    "if this is a frequent issue. (Remember to disable ratelimit and emergency too)"
-                        )
-                    }
-                }
             }
         } else {
             modifyPacket(packet, itemStacks, windowId, player)
@@ -82,7 +76,7 @@ class PacketWindowItems(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, Packe
         modifyPacket(packet, itemStacks, windowId, player)
         ignorePacketList.add(player.name)
         this.getPlugin().scheduler.run {
-            ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet)
+            runCatchingWithLogs { ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet) }
         }
     }
 
@@ -169,4 +163,15 @@ class PacketWindowItems(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, Packe
 
         return itemStacks
     }
-}
+}
+
+private inline fun <T> runCatchingWithLogs(toRun: () -> T): Result<T> {
+    return runCatching { toRun() }.onFailure {
+        if (Eco.getHandler().ecoPlugin.configYml.getBool("async-display.log-errors")) {
+            Eco.getHandler().ecoPlugin.logger.warning(
+                "Error happened in async processing! Disable async display (/plugins/eco/config.yml)" +
+                        "if this is a frequent issue. (Remember to disable ratelimit and emergency too)"
+            )
+        }
+    }
+}

eco-core/core-plugin/src/main/resources/config.yml

@@ -69,14 +69,14 @@ async-display:
     # If emergency async should be used.
     enabled: true
     # Below this TPS value, emergency async display will be used.
-    cutoff: 18
+    cutoff: 17
 
   # If players with a large amount of display packets should have their processing
   # done asynchronously. This will help if a player is trying to crash the server
   # by overloading the display system.
   ratelimit:
     # If rate limit async display should be used.
-    enabled: true
+    enabled: false
     # The amount of window items packets per timeframe needed to enable async display
     # for a specified player.
     cutoff: 4

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.20.2
+version = 6.20.4
 plugin-name = eco
 kotlin.code.style = official