fix potential memory leak

AzisabaNetwork · Nov 9, 2024 · 5fa7456 · 5fa7456
1 parent 6e3e052
commit 5fa7456
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "net.azisaba"
-version = "6.18.2+1.15.2"
+version = "6.18.3+1.15.2"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(8))

diff --git a/src/main/java/com/github/mori01231/lifecore/LifeCore.kt b/src/main/java/com/github/mori01231/lifecore/LifeCore.kt
@@ -332,6 +332,7 @@ class LifeCore : JavaPlugin() {
         pm.registerEvents(PicksawItemListener(dataLoader), this)
         pm.registerEvents(BlockListener, this)
         pm.registerEvents(MapListScreen.EventListener, this)
+        pm.registerEvents(PlayerQuitListener, this)
 
         // Items
         pm.registerEvents(OreOnlyItemListener(), this)

diff --git a/src/main/java/com/github/mori01231/lifecore/listener/PlayerQuitListener.kt b/src/main/java/com/github/mori01231/lifecore/listener/PlayerQuitListener.kt
@@ -0,0 +1,18 @@
+package com.github.mori01231.lifecore.listener
+
+import com.github.mori01231.lifecore.LifeCore
+import com.github.mori01231.lifecore.util.MapUtil
+import org.bukkit.Bukkit
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerQuitEvent
+import org.bukkit.plugin.java.JavaPlugin
+
+object PlayerQuitListener : Listener {
+    @EventHandler
+    fun onPlayerQuit(e: PlayerQuitEvent) {
+        Bukkit.getScheduler().runTaskAsynchronously(JavaPlugin.getPlugin(LifeCore::class.java), Runnable {
+            MapUtil.renderedMapViews.removeIf { it.first == e.player.uniqueId }
+        })
+    }
+}
diff --git a/src/main/java/com/github/mori01231/lifecore/util/MapUtil.kt b/src/main/java/com/github/mori01231/lifecore/util/MapUtil.kt
@@ -22,6 +22,7 @@ import org.bukkit.map.MapRenderer
 import org.bukkit.map.MapView
 import org.bukkit.plugin.java.JavaPlugin
 import java.util.Collections
+import java.util.UUID
 
 object MapUtil {
     private fun convertCanvasToSerializable(canvas: MapCanvas) =
@@ -46,7 +47,7 @@ object MapUtil {
     fun MapView.getCanvases() =
         CraftMapView::class.java.getDeclaredField("canvases").apply { isAccessible = true }[this] as Map<MapRenderer, Map<CraftPlayer, CraftMapCanvas>>
 
-    private val renderedMapViews = Collections.synchronizedList(mutableListOf<Pair<Player, CraftMapView>>())
+    val renderedMapViews = Collections.synchronizedList(mutableListOf<Pair<UUID, Int>>())
 
     fun initializeMapRenderer(player: Player, item: ItemStack) {
         if (item.type != Material.FILLED_MAP) return
@@ -55,8 +56,8 @@ object MapUtil {
         val hasRenderer = mapView.renderers.isNotEmpty()
         if (hasRenderer && mapView.renderers[0] !is CraftMapRenderer) {
             if (mapView is CraftMapView) {
-                if (renderedMapViews.contains(player to mapView)) return
-                renderedMapViews.add(player to mapView)
+                if (renderedMapViews.contains(player.uniqueId to mapView.id)) return
+                renderedMapViews.add(player.uniqueId to mapView.id)
                 Bukkit.getScheduler().runTask(JavaPlugin.getPlugin(LifeCore::class.java), Runnable {
                     mapView.render(player as CraftPlayer)
                 })