Start cleaning up BlockListener.

This commit is contained in:
GJ 2013-01-23 17:52:59 -05:00
parent 7e91776cfb
commit 0a9e1ba42e

View File

@ -101,27 +101,33 @@ public class BlockListener implements Listener {
*/ */
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
Config configInstance = Config.getInstance(); Player player = event.getPlayer();
if (Misc.isNPC(player)) {
return;
}
Block block = event.getBlock(); Block block = event.getBlock();
Player player = event.getPlayer();
int id = block.getTypeId();
if (player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
/* Check if the blocks placed should be monitored so they do not give out XP in the future */ /* Check if the blocks placed should be monitored so they do not give out XP in the future */
if (BlockChecks.shouldBeWatched(block)) { if (BlockChecks.shouldBeWatched(block)) {
mcMMO.placeStore.setTrue(block); mcMMO.placeStore.setTrue(block);
} }
if (id == configInstance.getRepairAnvilId() && configInstance.getRepairAnvilMessagesEnabled()) { if (Config.getInstance().getRepairAnvilMessagesEnabled()) {
int id = block.getTypeId();
if (id == Config.getInstance().getRepairAnvilId()) {
Repair.placedAnvilCheck(player, id); Repair.placedAnvilCheck(player, id);
} }
if (id == configInstance.getSalvageAnvilId() && configInstance.getRepairAnvilMessagesEnabled()) { else if (id == Config.getInstance().getSalvageAnvilId()) {
Salvage.placedAnvilCheck(player, id); Salvage.placedAnvilCheck(player, id);
} }
} }
}
/** /**
* Monitor BlockBreak events. * Monitor BlockBreak events.
* *