Merge branch 'PlayPro:master' into patch-1

PlayPro · Dec 10, 2024 · 6395438 · 6395438
2 parents 966cbaf + b3db65d
commit 6395438
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/net/coreprotect/database/rollback/RollbackUtil.java b/src/main/java/net/coreprotect/database/rollback/RollbackUtil.java
@@ -346,10 +346,17 @@ else if (mapData.get("modifiers") != null) {
                     List<Object> modifiers = (List<Object>) mapData.get("modifiers");
 
                     for (Object item : modifiers) {
-                        Map<Attribute, Map<String, Object>> modifiersMap = (Map<Attribute, Map<String, Object>>) item;
-                        for (Map.Entry<Attribute, Map<String, Object>> entry : modifiersMap.entrySet()) {
+                        Map<Object, Map<String, Object>> modifiersMap = (Map<Object, Map<String, Object>>) item;
+                        for (Map.Entry<Object, Map<String, Object>> entry : modifiersMap.entrySet()) {
                             try {
-                                Attribute attribute = entry.getKey();
+                                Attribute attribute = null;
+                                if (entry.getKey() instanceof Attribute) {
+                                    attribute = (Attribute) entry.getKey();
+                                }
+                                else {
+                                    attribute = (Attribute) BukkitAdapter.ADAPTER.getRegistryValue((String) entry.getKey(), Attribute.class);
+                                }
+
                                 AttributeModifier modifier = AttributeModifier.deserialize(entry.getValue());
                                 itemMeta.addAttributeModifier(attribute, modifier);
                             }

diff --git a/src/main/java/net/coreprotect/paper/Paper_v1_20.java b/src/main/java/net/coreprotect/paper/Paper_v1_20.java
@@ -34,7 +34,7 @@ public String getSkullOwner(Skull skull) {
         if (skull.getPlayerProfile().getId() != null) {
             owner = skull.getPlayerProfile().getId().toString();
         }
-        else if (Config.getGlobal().MYSQL && owner.length() > 255) {
+        else if (Config.getGlobal().MYSQL && owner != null && owner.length() > 255) {
             return owner.substring(0, 255);
         }
 

diff --git a/src/main/java/net/coreprotect/utility/Util.java b/src/main/java/net/coreprotect/utility/Util.java
@@ -127,6 +127,9 @@ public static CentralProcessor getProcessorInfo() {
             if (System.getProperty("os.name").startsWith("Windows") && !System.getProperty("sun.arch.data.model").equals("64")) {
                 Class.forName("com.sun.jna.platform.win32.Win32Exception");
             }
+            else if (System.getProperty("os.name").toLowerCase().contains("android") || System.getProperty("java.runtime.name").toLowerCase().contains("android")) {
+                return null;
+            }
             Configurator.setLevel("oshi.hardware.common.AbstractCentralProcessor", Level.OFF);
             SystemInfo systemInfo = new SystemInfo();
             result = systemInfo.getHardware().getProcessor();

diff --git a/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java b/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java
@@ -125,12 +125,12 @@ public static List<List<Map<String, Object>>> serialize(ItemStack item, Material
 
             if (itemMeta.hasAttributeModifiers()) {
                 for (Map.Entry<Attribute, AttributeModifier> entry : itemMeta.getAttributeModifiers().entries()) {
-                    Map<Attribute, Map<String, Object>> attributeList = new HashMap<>();
+                    Map<Object, Map<String, Object>> attributeList = new HashMap<>();
                     Attribute attribute = entry.getKey();
                     AttributeModifier modifier = entry.getValue();
 
                     itemMeta.removeAttributeModifier(attribute, modifier);
-                    attributeList.put(attribute, modifier.serialize());
+                    attributeList.put(BukkitAdapter.ADAPTER.getRegistryKey(attribute), modifier.serialize());
                     modifiers.add(attributeList);
                 }
             }