From ebd7b5d83737324c46629b8d1e0569d2923c5b63 Mon Sep 17 00:00:00 2001
From: acrylic-style <me@acrylicstyle.xyz>
Date: Sat, 9 Nov 2024 16:37:59 +0900
Subject: [PATCH] fix merge error

---
 .../com/github/mori01231/lifecore/util/MapDatabaseUtil.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/mori01231/lifecore/util/MapDatabaseUtil.kt b/src/main/java/com/github/mori01231/lifecore/util/MapDatabaseUtil.kt
index 7bc4b24..1919866 100644
--- a/src/main/java/com/github/mori01231/lifecore/util/MapDatabaseUtil.kt
+++ b/src/main/java/com/github/mori01231/lifecore/util/MapDatabaseUtil.kt
@@ -2,7 +2,7 @@ package com.github.mori01231.lifecore.util
 
 import com.github.mori01231.lifecore.DBConnector
 import com.github.mori01231.lifecore.LifeCore
-import net.minecraft.server.v1_15_R1.NBTTagByteArray
+import net.minecraft.nbt.ByteArrayTag
 import org.bukkit.Bukkit
 import org.bukkit.ChatColor
 import org.bukkit.Material
@@ -141,7 +141,7 @@ object MapDatabaseUtil {
     ) {
         fun toItemStack() =
             ItemStack(Material.FILLED_MAP, amount.toInt())
-                .let { ItemUtil.setTag(it, "SerializedMapData", NBTTagByteArray(data)) }
+                .let { ItemUtil.setTag(it, "SerializedMapData", ByteArrayTag(data)) }
                 .apply {
                     itemMeta = (itemMeta as MapMeta).apply {
                         mapView = Bukkit.createMap(Bukkit.getWorlds()[0])