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

Allow null in CitizensNPCRegistry#getNPC(Entity)

Browse Source
This commit is contained in:
fullwall 2012-09-03 15:40:40 +08:00
parent 634dd441cb
commit d43ee95408
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
View File

@ -37,7 +37,6 @@ import net.citizensnpcs.npc.entity.CitizensZombieNPC;
import net.citizensnpcs.util.ByIdArray; import net.citizensnpcs.util.ByIdArray;
import net.citizensnpcs.util.Messaging; import net.citizensnpcs.util.Messaging;
import org.apache.commons.lang.Validate;
import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -140,7 +139,8 @@ public class CitizensNPCRegistry implements NPCRegistry {
@Override @Override
public NPC getNPC(Entity entity) { public NPC getNPC(Entity entity) {
Validate.notNull(entity); if (entity == null)
return null;
net.minecraft.server.Entity handle = ((CraftEntity) entity).getHandle(); net.minecraft.server.Entity handle = ((CraftEntity) entity).getHandle();
return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null; return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null;
} }