Merge branch 'master' into ver/1.21.1

# Conflicts: # build.gradle.kts # src/main/java/com/github/mori01231/lifecore/LifeCore.kt # src/main/java/com/github/mori01231/lifecore/util/MapUtil.kt
AzisabaNetwork · Nov 9, 2024 · 6e961a4 · 6e961a4
2 parents 974e566 + 6e3e052
commit 6e961a4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "net.azisaba"
-version = "6.18.0a+1.21.1"
+version = "6.18.2+1.21.1"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))

diff --git a/src/main/java/com/github/mori01231/lifecore/LifeCore.kt b/src/main/java/com/github/mori01231/lifecore/LifeCore.kt
@@ -199,10 +199,13 @@ class LifeCore : JavaPlugin() {
             if (Bukkit.getOnlinePlayers().isEmpty()) return@Runnable
             Bukkit.getWorlds().forEach world@ { world ->
                 world.getEntitiesByClass(ItemFrame::class.java).forEach { itemFrame ->
-                    Bukkit.getOnlinePlayers().forEach { player ->
-                        MapUtil.checkMapView(itemFrame.item)?.let { itemFrame.setItem(it, false) }
-                        MapUtil.initializeMapRenderer(player, itemFrame.item)
-                    }
+                    Bukkit.getScheduler().runTaskAsynchronously(this, Runnable {
+                        val item = itemFrame.item
+                        Bukkit.getOnlinePlayers().forEach { player ->
+                            MapUtil.checkMapView(itemFrame.item)?.let { itemFrame.setItem(it, false) }
+                        MapUtil.initializeMapRenderer(player, item)
+                        }
+                    })
                 }
             }
         }, 200, 200)

diff --git a/src/main/java/com/github/mori01231/lifecore/util/MapUtil.kt b/src/main/java/com/github/mori01231/lifecore/util/MapUtil.kt
@@ -1,5 +1,6 @@
 package com.github.mori01231.lifecore.util
 
+import com.github.mori01231.lifecore.LifeCore
 import com.github.mori01231.lifecore.map.SerializedMapCanvas
 import com.github.mori01231.lifecore.map.SerializedMapDataRenderer
 import kotlinx.serialization.encodeToString
@@ -19,6 +20,8 @@ import org.bukkit.inventory.meta.MapMeta
 import org.bukkit.map.MapCanvas
 import org.bukkit.map.MapRenderer
 import org.bukkit.map.MapView
+import org.bukkit.plugin.java.JavaPlugin
+import java.util.Collections
 
 object MapUtil {
     private fun convertCanvasToSerializable(canvas: MapCanvas) =
@@ -54,13 +57,21 @@ object MapUtil {
         return null
     }
 
+    private val renderedMapViews = Collections.synchronizedList(mutableListOf<Pair<Player, CraftMapView>>())
+
     fun initializeMapRenderer(player: Player, item: ItemStack) {
         if (item.type != Material.FILLED_MAP) return
         val meta = item.itemMeta as? MapMeta? ?: return
         val mapView = meta.mapView ?: return
         val hasRenderer = mapView.renderers.isNotEmpty()
         if (hasRenderer && mapView.renderers[0] !is CraftMapRenderer) {
-            if (mapView is CraftMapView) mapView.render(player as CraftPlayer)
+            if (mapView is CraftMapView) {
+                if (renderedMapViews.contains(player to mapView)) return
+                renderedMapViews.add(player to mapView)
+                Bukkit.getScheduler().runTask(JavaPlugin.getPlugin(LifeCore::class.java), Runnable {
+                    mapView.render(player as CraftPlayer)
+                })
+            }
             return
         }
         val serializedMapData =
@@ -72,10 +83,12 @@ object MapUtil {
             } catch (_: Exception) {
                 return
             }
-        if (hasRenderer) {
-            mapView.removeRenderer(mapView.renderers[0])
-        }
-        mapView.addRenderer(SerializedMapDataRenderer(serializedMapData))
-        if (mapView is CraftMapView) mapView.render(player as CraftPlayer)
+        Bukkit.getScheduler().runTask(JavaPlugin.getPlugin(LifeCore::class.java), Runnable {
+            if (hasRenderer) {
+                mapView.removeRenderer(mapView.renderers[0])
+            }
+            mapView.addRenderer(SerializedMapDataRenderer(serializedMapData))
+            if (mapView is CraftMapView) mapView.render(player as CraftPlayer)
+        })
     }
 }