Skip to content

Commit 42b91d5

Browse files
authored
Fix fake skins for nicknamed players on SportPaper (#108)
Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>
1 parent 7030398 commit 42b91d5

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

core/src/main/java/dev/pgm/community/nick/skin/SkinCache.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ public class SkinCache implements Listener {
3939
// TODO: NEEDS WORK! Backup skins when 0 are online, prevent duplicates, etc
4040
private Skin getRandomSkin() {
4141
if (offlineSkins.size() == 0) {
42-
return Skin.EMPTY; // TODO: Warning, this may be bad for 1.16 clients...
42+
// Sunny
43+
return new Skin(
44+
"ewogICJ0aW1lc3RhbXAiIDogMTY2NjM1NjEyNzE3MiwKICAicHJvZmlsZUlkIiA6ICI1MTY4ZjZlMjIyM2E0Y2FjYjdiN2QyZjYyZWMxZGFhOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJkZWZfbm90X2FzaCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9hM2JkMTYwNzlmNzY0Y2Q1NDFlMDcyZTg4OGZlNDM4ODVlNzExZjk4NjU4MzIzZGIwZjlhNjA0NWRhOTFlZTdhIgogICAgfQogIH0KfQ==",
45+
"gUaeJg93CpJwZm3QbT59cX9pKrT+KBEXSYoQFFyyYl3d/sEcPM/n4uRGFSZDJm6hD5qNpOIrD/Tdm9aW9224LXwoOhXTH4QjIy7m7ZH29oXwiUCs0UR/cFGOnUFaCF+8ggWYyf/UhUnTVfyZb/XonejaTI9+/WBQmuCbF7TcgGzvuhYaEb9mWxhEfBeaiHV1iMiEgo4NJVya0MKTaZ10jfqq09JgijbJidims4Y6Ep7ozvbcsDMjGK02/nzdZ6cq7eJ3w5ZanGrhVdvyV05mKfGGU3SaLwMZ4Yj/WtSO3ZC36KT9kMBWyTWjWDyIK+wYDhv9LTQ/XWezsnV0uJQv3ngy0yMZh/O+sQzsb3kGXlSzZQjWkhoCkgASS5P/dSTr4mHAgctnG96NczNJA2caYgone6ytGcet63Z5iGx23t+XYiFxK9xsEbJFSW0qpOOMxn1H/gH3b3lkJfsWt0kcxSNsbWWL5WdPEw6aN5TfAVUDnhtxNbtwXqqNcNDHkrvfWC9UQw5NFf41ytnBJRWVyAitz3u0+u7l0G2vfPtusEUkkiYElXCYT+dURnT41y5sbZ6FLh05J3WWLA4ZTHqpp3mEHbmV3NwbNWadTiXH3MmKBHgNT0Q3ZgENcdnaomTTEvOGsN8PymBYLUIDj3DfSp8yl/dCgy1jBiSPk+A+wgs=");
4346
}
4447
List<Skin> skins = offlineSkins.asMap().values().stream().toList();
4548
return skins.get(random.nextInt(skins.size()));

platform/platform-sportpaper/src/main/java/dev/pgm/community/platform/sportpaper/SpPlayerUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ public Skin getPlayerSkin(Player player) {
3535
@Override
3636
public void setFakeNameAndSkin(
3737
Player player, Player viewer, String displayName, String nick, Skin skin) {
38+
var fakeSkin = skin == null ? null : new org.bukkit.Skin(skin.getData(), skin.getSignature());
39+
3840
player.setFakeDisplayName(viewer, displayName);
39-
player.setFakeNameAndSkin(viewer, nick, player.getSkin(viewer));
41+
player.setFakeNameAndSkin(viewer, nick, fakeSkin);
4042
}
4143

4244
@Override

0 commit comments

Comments
 (0)