Fixed NullPointerException when attempting to roll back skulls with t…

…exture data
PlayPro · Aug 16, 2024 · cae29f2 · cae29f2
1 parent c6f8be9
commit cae29f2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/src/main/java/net/coreprotect/database/statement/SkullStatement.java b/src/main/java/net/coreprotect/database/statement/SkullStatement.java
@@ -3,9 +3,7 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.UUID;
 
-import org.bukkit.Bukkit;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
 
@@ -48,10 +46,7 @@ public static void getData(Statement statement, BlockState block, String query)
 
             while (resultSet.next()) {
                 String owner = resultSet.getString("owner");
-                if (owner != null && owner.length() >= 32 && owner.contains("-")) {
-                    skull.setOwningPlayer(Bukkit.getOfflinePlayer(UUID.fromString(owner)));
-                }
-                else if (owner != null && owner.length() > 1) {
+                if (owner != null && owner.length() > 1) {
                     PaperAdapter.ADAPTER.setSkullOwner(skull, owner);
                 }
 

diff --git a/src/main/java/net/coreprotect/paper/PaperAdapter.java b/src/main/java/net/coreprotect/paper/PaperAdapter.java
@@ -1,5 +1,8 @@
 package net.coreprotect.paper;
 
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.block.Sign;
@@ -83,7 +86,9 @@ public String getSkullOwner(Skull skull) {
 
     @Override
     public void setSkullOwner(Skull skull, String owner) {
-        return;
+        if (owner != null && owner.length() >= 32 && owner.contains("-")) {
+            skull.setOwningPlayer(Bukkit.getOfflinePlayer(UUID.fromString(owner)));
+        }
     }
 
     @Override

diff --git a/src/main/java/net/coreprotect/paper/Paper_v1_20.java b/src/main/java/net/coreprotect/paper/Paper_v1_20.java
@@ -2,11 +2,15 @@
 
 import java.net.URI;
 import java.net.URL;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
 import org.bukkit.block.sign.Side;
+import org.bukkit.profile.PlayerTextures;
+
+import com.destroystokyo.paper.profile.PlayerProfile;
 
 import net.coreprotect.config.Config;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@@ -27,21 +31,24 @@ public String getLine(Sign sign, int line) {
     @Override
     public String getSkullOwner(Skull skull) {
         String owner = skull.getPlayerProfile().getName();
-        if (Config.getGlobal().MYSQL) {
-            if (owner.length() > 255 && skull.getPlayerProfile().getId() != null) {
-                return skull.getPlayerProfile().getId().toString();
-            }
-            else if (owner.length() > 255) {
-                return owner.substring(0, 255);
-            }
+        if (skull.getPlayerProfile().getId() != null) {
+            owner = skull.getPlayerProfile().getId().toString();
+        }
+        else if (Config.getGlobal().MYSQL && owner.length() > 255) {
+            return owner.substring(0, 255);
         }
 
         return owner;
     }
 
     @Override
     public void setSkullOwner(Skull skull, String owner) {
-        skull.setPlayerProfile(Bukkit.createProfile(owner));
+        if (owner != null && owner.length() >= 32 && owner.contains("-")) {
+            skull.setPlayerProfile(Bukkit.createProfile(UUID.fromString(owner)));
+        }
+        else {
+            skull.setPlayerProfile(Bukkit.createProfile(owner));
+        }
     }
 
     @Override
@@ -57,7 +64,11 @@ public String getSkullSkin(Skull skull) {
     @Override
     public void setSkullSkin(Skull skull, String skin) {
         try {
-            skull.getPlayerProfile().getTextures().setSkin(URI.create(skin).toURL());
+            PlayerProfile playerProfile = skull.getPlayerProfile();
+            PlayerTextures textures = playerProfile.getTextures();
+            textures.setSkin(URI.create(skin).toURL());
+            playerProfile.setTextures(textures);
+            skull.setPlayerProfile(playerProfile);
         }
         catch (Exception e) {
             e.printStackTrace();