Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-14 19:31:58 +01:00
Code Issues Projects Releases Wiki Activity

Null check signature

Browse Source
This commit is contained in:
fullwall 2016-08-24 22:15:13 +08:00
parent 95261e4548
commit 2dab3d338d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -1512,7 +1512,6 @@ public class NPCCommands {
} }
Messaging.sendTr(sender, Messages.SKIN_SET, npc.getName(), skinName); Messaging.sendTr(sender, Messages.SKIN_SET, npc.getName(), skinName);
if (npc.isSpawned()) { if (npc.isSpawned()) {
SkinnableEntity skinnable = npc.getEntity() instanceof SkinnableEntity ? (SkinnableEntity) npc.getEntity() SkinnableEntity skinnable = npc.getEntity() instanceof SkinnableEntity ? (SkinnableEntity) npc.getEntity()
: null; : null;
if (skinnable != null) { if (skinnable != null) {

2
main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
View File

@ -327,7 +327,7 @@ public class Skin {
// packet errors that disconnect the client. // packet errors that disconnect the client.
Property current = Iterables.getFirst(profile.getProperties().get("textures"), null); Property current = Iterables.getFirst(profile.getProperties().get("textures"), null);
if (current != null && current.getValue().equals(skinProperty.getValue()) if (current != null && current.getValue().equals(skinProperty.getValue())
&& current.getSignature().equals(skinProperty.getSignature())) { && (current.getSignature() != null && current.getSignature().equals(skinProperty.getSignature()))) {
return; return;
} }