修复PlayerDataUtils在NKMOT字符串物品兼容问题

MemoriesOfTime · Dec 30, 2023 · f37ff93 · f37ff93
1 parent 50fc130
commit f37ff93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -274,7 +274,7 @@
         <dependency>
             <groupId>cn.nukkit</groupId>
             <artifactId>Nukkit</artifactId>
-            <version>PM1E_1.20.40.3355</version>
+            <version>MOT-java8-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/cn/lanink/gamecore/utils/PlayerDataUtils.java b/src/main/java/cn/lanink/gamecore/utils/PlayerDataUtils.java
@@ -53,9 +53,14 @@ public static LinkedHashMap<String, List<?>> inventoryToLinkedHashMap(@NotNull M
         for (Map.Entry<Integer, Item> entry : inventoryContents.entrySet()) {
             LinkedList<String> list = new LinkedList<>();
             if (entry.getValue() != null) {
-                list.add(entry.getValue().getId() + ":" + entry.getValue().getDamage()); //0
+                if (NukkitTypeUtils.getNukkitType() == NukkitTypeUtils.NukkitType.MOT) {
+                    list.add(entry.getValue().getNamespaceId()); //0
+                } else {
+                    list.add(entry.getValue().getId() + ":" + entry.getValue().getDamage()); //0
+                }
                 list.add(String.valueOf(entry.getValue().getCount())); //1
                 list.add(bytesToBase64(entry.getValue().getCompoundTag())); //2
+                list.add(String.valueOf(entry.getValue().getDamage())); //3 为了兼容之前的版本放在后面
             }
 
             linkedHashMap.put(entry.getKey() + "", list);
@@ -89,6 +94,9 @@ public static Map<Integer, Item> linkedHashMapToInventory(Map<String, List<?>> i
             if (!"not".equals(String.valueOf(list.get(2)))) {
                 item.setNamedTag(Item.parseCompoundTag(base64ToBytes(list.get(2))));
             }
+            if (list.size() >= 4) {
+                item.setDamage(Integer.parseInt(list.get(3)));
+            }
             map.put(Integer.parseInt(entry.getKey()), item);
         }
         return map;