Upstream/CoreProtect
1
0
Fork 0
mirror of https://github.com/PlayPro/CoreProtect.git synced 2024-11-15 10:45:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NullPointerException when attempting to roll back skulls with texture data

Browse Source
This commit is contained in:
Intelli 2024-08-15 20:48:21 -06:00
parent c6f8be9043
commit cae29f257d
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/coreprotect/database/statement/SkullStatement.java
View File

@ -3,9 +3,7 @@ package net.coreprotect.database.statement;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.Skull; import org.bukkit.block.Skull;
@ -48,10 +46,7 @@ public class SkullStatement {
while (resultSet.next()) { while (resultSet.next()) {
String owner = resultSet.getString("owner"); String owner = resultSet.getString("owner");
if (owner != null && owner.length() >= 32 && owner.contains("-")) { if (owner != null && owner.length() > 1) {
skull.setOwningPlayer(Bukkit.getOfflinePlayer(UUID.fromString(owner)));
}
else if (owner != null && owner.length() > 1) {
PaperAdapter.ADAPTER.setSkullOwner(skull, owner); PaperAdapter.ADAPTER.setSkullOwner(skull, owner);
} }

7
src/main/java/net/coreprotect/paper/PaperAdapter.java
View File

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

29
src/main/java/net/coreprotect/paper/Paper_v1_20.java
View File

@ -2,11 +2,15 @@ package net.coreprotect.paper;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.block.Skull; import org.bukkit.block.Skull;
import org.bukkit.block.sign.Side; import org.bukkit.block.sign.Side;
import org.bukkit.profile.PlayerTextures;
import com.destroystokyo.paper.profile.PlayerProfile;
import net.coreprotect.config.Config; import net.coreprotect.config.Config;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@ -27,13 +31,11 @@ public class Paper_v1_20 extends Paper_v1_17 implements PaperInterface {
@Override @Override
public String getSkullOwner(Skull skull) { public String getSkullOwner(Skull skull) {
String owner = skull.getPlayerProfile().getName(); String owner = skull.getPlayerProfile().getName();
if (Config.getGlobal().MYSQL) { if (skull.getPlayerProfile().getId() != null) {
if (owner.length() > 255 && skull.getPlayerProfile().getId() != null) { owner = skull.getPlayerProfile().getId().toString();
return skull.getPlayerProfile().getId().toString(); }
} else if (Config.getGlobal().MYSQL && owner.length() > 255) {
else if (owner.length() > 255) { return owner.substring(0, 255);
return owner.substring(0, 255);
}
} }
return owner; return owner;
@ -41,7 +43,12 @@ public class Paper_v1_20 extends Paper_v1_17 implements PaperInterface {
@Override @Override
public void setSkullOwner(Skull skull, String owner) { 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 @Override
@ -57,7 +64,11 @@ public class Paper_v1_20 extends Paper_v1_17 implements PaperInterface {
@Override @Override
public void setSkullSkin(Skull skull, String skin) { public void setSkullSkin(Skull skull, String skin) {
try { 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) { catch (Exception e) {
e.printStackTrace(); e.printStackTrace();