PandacubeFr/DiscoSheep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

event handlers ignore cancelled events

Browse Source
This commit is contained in:
Gibstick 2013-07-28 11:51:00 -04:00
parent 17400da96a
commit f64f15d7a0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ca/gibstick/discosheep/BaaBaaBlockSheepEvents.java
View File

@ -30,7 +30,7 @@ public class BaaBaaBlockSheepEvents implements Listener {
} }
// prevent sheep shearing // prevent sheep shearing
@EventHandler (priority = EventPriority.HIGHEST) @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerShear(PlayerShearEntityEvent e) { public void onPlayerShear(PlayerShearEntityEvent e) {
if (e.getEntity() instanceof Sheep) { if (e.getEntity() instanceof Sheep) {
for (DiscoParty party : parent.getParties()) { for (DiscoParty party : parent.getParties()) {
@ -42,7 +42,7 @@ public class BaaBaaBlockSheepEvents implements Listener {
} }
// actually make sheep and other guests invincible // actually make sheep and other guests invincible
@EventHandler (priority = EventPriority.NORMAL) @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onLivingEntityDamageEvent(EntityDamageEvent e) { public void onLivingEntityDamageEvent(EntityDamageEvent e) {
if (e.getEntity() instanceof Sheep) { if (e.getEntity() instanceof Sheep) {
for (DiscoParty party : parent.getParties()) { for (DiscoParty party : parent.getParties()) {
@ -65,7 +65,7 @@ public class BaaBaaBlockSheepEvents implements Listener {
} }
// prevent uninvited guests from targetting players // prevent uninvited guests from targetting players
@EventHandler (priority = EventPriority.HIGHEST) @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onEntityTargetLivingEntityEvent(EntityTargetEvent e) { public void onEntityTargetLivingEntityEvent(EntityTargetEvent e) {
for (DiscoParty party : parent.getParties()) { for (DiscoParty party : parent.getParties()) {
if (party.getGuestList().contains(e.getEntity())) { // safe; event is only triggered by LivingEntity targetting LivingEntity if (party.getGuestList().contains(e.getEntity())) { // safe; event is only triggered by LivingEntity targetting LivingEntity