Skip to content

Commit 8ed08f0

Browse files
committed
Add skull null check
1 parent 3682fae commit 8ed08f0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

main/src/main/java/net/citizensnpcs/Citizens.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Iterator;
55
import java.util.Locale;
66
import java.util.Map;
7+
import java.util.UUID;
78
import java.util.concurrent.Callable;
89

910
import org.bstats.bukkit.Metrics;
@@ -79,13 +80,16 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
7980
private final SkullMetaProvider skullMetaProvider = new SkullMetaProvider() {
8081
@Override
8182
public String getTexture(SkullMeta meta) {
83+
if (NMS.getProfile(meta) == null)
84+
return null;
8285
return Iterables.getFirst(NMS.getProfile(meta).getProperties().get("textures"), new Property("", ""))
8386
.getValue();
8487
}
8588

8689
@Override
8790
public void setTexture(String string, SkullMeta meta) {
88-
NMS.setProfile(meta, new GameProfile(meta.getOwningPlayer().getUniqueId(), string));
91+
UUID uuid = meta.getOwningPlayer() == null ? UUID.randomUUID() : meta.getOwningPlayer().getUniqueId();
92+
NMS.setProfile(meta, new GameProfile(uuid, string));
8993
}
9094
};
9195
private CitizensSpeechFactory speechFactory;

0 commit comments

Comments
 (0)