From cd5046fc7149ac060e3fb11fd594a8907fb9a117 Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <22407829+FrankHeijden@users.noreply.github.com>
Date: Mon, 7 Sep 2020 14:20:12 +0200
Subject: [PATCH] Stop execution if PreventPvPEvent is canceled (#998)

---
 .../GriefPrevention/EntityEventHandler.java           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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