From dec1b233cc4ea9719da1cb3a2cdd3ec173bf4205 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Sun, 25 Sep 2016 03:19:50 -0700 Subject: [PATCH] potential fix part 2 for skull skins --- .../net/aufdemrand/denizen/nms/Handler_v1_10_R1.java | 9 +++++++++ .../java/net/aufdemrand/denizen/nms/Handler_v1_8_R3.java | 9 +++++++++ .../java/net/aufdemrand/denizen/nms/Handler_v1_9_R2.java | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_10_R1.java b/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_10_R1.java index 074a7f92c9..76529b2b39 100644 --- a/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_10_R1.java +++ b/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_10_R1.java @@ -157,6 +157,15 @@ public PlayerProfile fillPlayerProfile(PlayerProfile playerProfile) { if (gameProfile1 == null) { gameProfile1 = gameProfile; } + if (playerProfile.hasTexture()) { + gameProfile1.getProperties().get("textures").clear(); + if (playerProfile.getTextureSignature() != null) { + gameProfile1.getProperties().put("textures", new Property("value", playerProfile.getTexture(), playerProfile.getTextureSignature())); + } + else { + gameProfile1.getProperties().put("textures", new Property("value", playerProfile.getTexture())); + } + } if (Iterables.getFirst(gameProfile1.getProperties().get("textures"), null) == null) { gameProfile1 = minecraftServer.ay().fillProfileProperties(gameProfile1, true); } diff --git a/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_8_R3.java b/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_8_R3.java index 99749600d9..1c2a9920e3 100644 --- a/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_8_R3.java +++ b/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_8_R3.java @@ -155,6 +155,15 @@ public PlayerProfile fillPlayerProfile(PlayerProfile playerProfile) { if (gameProfile1 == null) { gameProfile1 = gameProfile; } + if (playerProfile.hasTexture()) { + gameProfile1.getProperties().get("textures").clear(); + if (playerProfile.getTextureSignature() != null) { + gameProfile1.getProperties().put("textures", new Property("value", playerProfile.getTexture(), playerProfile.getTextureSignature())); + } + else { + gameProfile1.getProperties().put("textures", new Property("value", playerProfile.getTexture())); + } + } if (Iterables.getFirst(gameProfile1.getProperties().get("textures"), null) == null) { gameProfile1 = minecraftServer.aD().fillProfileProperties(gameProfile1, true); } diff --git a/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_9_R2.java b/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_9_R2.java index 62969c0ab0..c76425b188 100644 --- a/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_9_R2.java +++ b/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/Handler_v1_9_R2.java @@ -157,6 +157,15 @@ public PlayerProfile fillPlayerProfile(PlayerProfile playerProfile) { if (gameProfile1 == null) { gameProfile1 = gameProfile; } + if (playerProfile.hasTexture()) { + gameProfile1.getProperties().get("textures").clear(); + if (playerProfile.getTextureSignature() != null) { + gameProfile1.getProperties().put("textures", new Property("value", playerProfile.getTexture(), playerProfile.getTextureSignature())); + } + else { + gameProfile1.getProperties().put("textures", new Property("value", playerProfile.getTexture())); + } + } if (Iterables.getFirst(gameProfile1.getProperties().get("textures"), null) == null) { gameProfile1 = minecraftServer.ay().fillProfileProperties(gameProfile1, true); }