Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop execution if PreventPvPEvent is canceled (#998)

Browse Source
This commit is contained in:
Frank van der Heijden 2020-09-07 14:20:12 +02:00 committed by GitHub
parent 1928b7ece7
commit cd5046fc71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -832,8 +832,8 @@ public class EntityEventHandler implements Listener
if (!pvpEvent.isCancelled()) if (!pvpEvent.isCancelled())
{ {
event.setCancelled(true); event.setCancelled(true);
return;
} }
return;
} }
} }
} }
@ -902,8 +902,8 @@ public class EntityEventHandler implements Listener
event.setCancelled(true); event.setCancelled(true);
if (sendErrorMessagesToPlayers) if (sendErrorMessagesToPlayers)
GriefPrevention.sendMessage(attacker, TextMode.Err, Messages.CantFightWhileImmune); GriefPrevention.sendMessage(attacker, TextMode.Err, Messages.CantFightWhileImmune);
return;
} }
return;
} }
Claim defenderClaim = this.dataStore.getClaimAt(defender.getLocation(), false, defenderData.lastClaim); Claim defenderClaim = this.dataStore.getClaimAt(defender.getLocation(), false, defenderData.lastClaim);
@ -919,8 +919,8 @@ public class EntityEventHandler implements Listener
event.setCancelled(true); event.setCancelled(true);
if (sendErrorMessagesToPlayers) if (sendErrorMessagesToPlayers)
GriefPrevention.sendMessage(attacker, TextMode.Err, Messages.PlayerInPvPSafeZone); GriefPrevention.sendMessage(attacker, TextMode.Err, Messages.PlayerInPvPSafeZone);
return;
} }
return;
} }
} }
} }
@ -963,8 +963,8 @@ public class EntityEventHandler implements Listener
{ {
event.setCancelled(true); event.setCancelled(true);
if (damager instanceof Creature) ((Creature) damager).setTarget(null); if (damager instanceof Creature) ((Creature) damager).setTarget(null);
return;
} }
return;
} }
} }
} }
@ -1430,8 +1430,8 @@ public class EntityEventHandler implements Listener
{ {
event.setIntensity(effected, 0); event.setIntensity(effected, 0);
GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.CantFightWhileImmune); GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.CantFightWhileImmune);
continue;
} }
continue;
} }
Claim defenderClaim = this.dataStore.getClaimAt(effectedPlayer.getLocation(), false, defenderData.lastClaim); Claim defenderClaim = this.dataStore.getClaimAt(effectedPlayer.getLocation(), false, defenderData.lastClaim);
@ -1444,7 +1444,6 @@ public class EntityEventHandler implements Listener
{ {
event.setIntensity(effected, 0); event.setIntensity(effected, 0);
GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.PlayerInPvPSafeZone); GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.PlayerInPvPSafeZone);
continue;
} }
} }
} }