From 2dab3d338d52982f87480baf4cd0a7e08a7dcffd Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 24 Aug 2016 22:15:13 +0800 Subject: [PATCH] Null check signature --- main/src/main/java/net/citizensnpcs/commands/NPCCommands.java | 1 - main/src/main/java/net/citizensnpcs/npc/skin/Skin.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java index ba9cc0279..a9b98da40 100644 --- 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 class NPCCommands { } 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 index 8a16944ea..7c309aee4 100644 --- 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 @@ public class Skin { // 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; }