Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup, please verify #877

Browse Source
This commit is contained in:
Gabriele C 2016-07-27 03:14:17 +02:00
parent 1e552ea4eb
commit 168ffa9131
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java
View File

@ -39,7 +39,7 @@ public class AuthMeEntityListener implements Listener {
// Note #360: npc status can be used to bypass security!!! // Note #360: npc status can be used to bypass security!!!
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onEntityDamage(EntityDamageEvent event) { public void onDamage(EntityDamageEvent event) {
if (listenerService.shouldCancelEvent(event)) { if (listenerService.shouldCancelEvent(event)) {
event.getEntity().setFireTicks(0); event.getEntity().setFireTicks(0);
event.setDamage(0); event.setDamage(0);
@ -48,20 +48,16 @@ public class AuthMeEntityListener implements Listener {
} }
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onEntityTarget(EntityTargetEvent event) { public void onAttack(EntityDamageByEntityEvent event) {
if (listenerService.shouldCancelEvent(event)) { if (listenerService.shouldCancelEvent(event.getDamager())) {
event.setTarget(null);
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onDamage(EntityDamageByEntityEvent event) { public void onEntityTarget(EntityTargetEvent event) {
if (listenerService.shouldCancelEvent(event)) { if (listenerService.shouldCancelEvent(event)) {
event.setCancelled(true); event.setTarget(null);
return;
}
if (listenerService.shouldCancelEvent(event.getDamager())) {
event.setCancelled(true); event.setCancelled(true);
} }
} }