From d996722643fa88938ad69d50741508abcc6e17b9 Mon Sep 17 00:00:00 2001 From: aPunch Date: Sun, 22 Jan 2012 01:58:02 -0600 Subject: [PATCH] more formatting --- src/net/citizensnpcs/Citizens.java | 4 ++-- src/net/citizensnpcs/EventListen.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java index b1a624642..b880fe811 100644 --- a/src/net/citizensnpcs/Citizens.java +++ b/src/net/citizensnpcs/Citizens.java @@ -101,9 +101,9 @@ public class Citizens extends JavaPlugin { NPC npc = npcManager.createNPC(key.getString("name"), character); // Load the character if it exists, otherwise remove the character - if (character != null) { + if (character != null) character.load(key.getRelative(character.getName())); - } else { + else { if (key.keyExists("character")) { Messaging.debug("Character '" + key.getString("character") + "' does not exist. Removing character from the NPC with ID '" + npc.getId() + "'."); diff --git a/src/net/citizensnpcs/EventListen.java b/src/net/citizensnpcs/EventListen.java index 22322c5b2..7475e4e57 100644 --- a/src/net/citizensnpcs/EventListen.java +++ b/src/net/citizensnpcs/EventListen.java @@ -39,9 +39,8 @@ public class EventListen implements Listener { EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event; if (e.getDamager() instanceof Player) { NPC npc = manager.getNPC(event.getEntity()); - if (npc.getCharacter() != null) { + if (npc.getCharacter() != null) npc.getCharacter().onLeftClick(npc, (Player) e.getDamager()); - } } } }