From d410509da5f15dc85fb020861f2ba8f68a09014e Mon Sep 17 00:00:00 2001 From: aPunch Date: Sun, 19 Feb 2012 14:21:35 -0600 Subject: [PATCH] fix command NPE --- src/net/citizensnpcs/EventListen.java | 4 ---- src/net/citizensnpcs/command/command/NPCCommands.java | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/net/citizensnpcs/EventListen.java b/src/net/citizensnpcs/EventListen.java index 3f1103ba6..26399b622 100644 --- a/src/net/citizensnpcs/EventListen.java +++ b/src/net/citizensnpcs/EventListen.java @@ -45,8 +45,6 @@ public class EventListen implements Listener { NPC npc = npcManager.getNPC(id); Location loc = npc.getTrait(SpawnLocation.class).getLocation(); npc.spawn(loc); - Messaging.log("Spawned " + npc.getId() + " at " + loc.getX() + ", " + loc.getY() + ", " + loc.getZ() - + " in world " + loc.getWorld().getName()); } toRespawn.remove(event.getChunk()); } @@ -63,8 +61,6 @@ public class EventListen implements Listener { Location loc = npc.getBukkitEntity().getLocation(); if (event.getWorld().equals(loc.getWorld()) && event.getChunk().getX() == loc.getChunk().getX() && event.getChunk().getZ() == loc.getChunk().getZ()) { - Messaging.log("Despawned " + npc.getId() + " at " + loc.getX() + ", " + loc.getY() + ", " + loc.getZ() - + " in world " + loc.getWorld().getName()); npc.getTrait(SpawnLocation.class).setLocation(loc); npc.despawn(); respawn.add(npc.getId()); diff --git a/src/net/citizensnpcs/command/command/NPCCommands.java b/src/net/citizensnpcs/command/command/NPCCommands.java index 8be1dbf7a..0bbc5f348 100644 --- a/src/net/citizensnpcs/command/command/NPCCommands.java +++ b/src/net/citizensnpcs/command/command/NPCCommands.java @@ -38,8 +38,8 @@ public class NPCCommands { public void showInfo(CommandContext args, Player player, NPC npc) { Messaging.send(player, StringHelper.wrapHeader(npc.getName())); Messaging.send(player, " ID: " + npc.getId()); - Messaging.send(player, " Character: " + npc.getCharacter() != null ? npc.getCharacter().getName() - : "None"); + Messaging.send(player, " Character: " + (npc.getCharacter() != null ? npc.getCharacter().getName() + : "None")); } @Command(