potential fix part 2 for skull skins

DenizenScript · Sep 25, 2016 · dec1b23 · dec1b23
1 parent ce87e8e
commit dec1b23
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
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
@@ -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
@@ -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
@@ -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);
                 }