More cleaning on listeners. Also fixes NPE with itemInHand, because

Bukkit is dumb.
This commit is contained in:
GJ
2013-01-24 15:46:29 -05:00
parent 8736aae2ef
commit 7c59621c9e
16 changed files with 124 additions and 78 deletions

View File

@ -20,7 +20,7 @@ public class ArcheryManager extends SkillManager {
* @param livingEntity Entity damaged by the arrow
*/
public void trackArrows(LivingEntity livingEntity) {
if (Misc.isNPC(player) || !Permissions.trackArrows(player)) {
if (Misc.isNPCPlayer(player) || !Permissions.trackArrows(player)) {
return;
}
@ -40,7 +40,7 @@ public class ArcheryManager extends SkillManager {
* @param event The event to modify
*/
public void dazeCheck(Player defender, EntityDamageEvent event) {
if (Misc.isNPC(player) || !Permissions.daze(player)) {
if (Misc.isNPCPlayer(player) || !Permissions.daze(player)) {
return;
}
@ -60,7 +60,7 @@ public class ArcheryManager extends SkillManager {
* @param event The event to modify.
*/
public void skillShot(EntityDamageEvent event) {
if (Misc.isNPC(player) || !Permissions.archeryBonus(player)) {
if (Misc.isNPCPlayer(player) || !Permissions.archeryBonus(player)) {
return;
}