Null check signature

CitizensDev · Aug 24, 2016 · 2dab3d3 · 2dab3d3
1 parent 95261e4
commit 2dab3d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1512,7 +1512,6 @@ public void skin(final CommandContext args, final CommandSender sender, final NP
         }
         Messaging.sendTr(sender, Messages.SKIN_SET, npc.getName(), skinName);
         if (npc.isSpawned()) {
-
             SkinnableEntity skinnable = npc.getEntity() instanceof SkinnableEntity ? (SkinnableEntity) npc.getEntity()
                     : null;
             if (skinnable != null) {

diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
@@ -327,7 +327,7 @@ private static void setNPCTexture(SkinnableEntity entity, Property skinProperty)
         // packet errors that disconnect the client.
         Property current = Iterables.getFirst(profile.getProperties().get("textures"), null);
         if (current != null && current.getValue().equals(skinProperty.getValue())
-                && current.getSignature().equals(skinProperty.getSignature())) {
+                && (current.getSignature() != null && current.getSignature().equals(skinProperty.getSignature()))) {
             return;
         }