Allow Towny admins to bypass PvP damage prevention (TownyAdvanced#7013)

* check if player has towny.admin permission

* fix error when referring to the attacking player

* try to fix formatting issues

* just some minor testing, will be reverted

* undo recent testing, hopefully fix formatting issues

* fix formatting issues

* comply with reviews

* Unnest if statement, make cancelled local to its own if block, extract
isTownyAdmin method for readability, update comments to reflect what is
happening.

---------

Co-authored-by: LlmDl <llmdlio@gmail.com>

Author: ImperialSam12

Towny/src/main/java/com/palmergames/bukkit/towny/utils/CombatUtil.java

@@ -136,21 +136,23 @@ private static boolean preventDamageCall(TownyWorld world, Entity attackingEntit
 		 */
 		if (attackingPlayer != null && isNotNPC(attackingPlayer)) {
 
-			boolean cancelled = false;
-			
 			/*
 			 * Defender is a player, which is not an NPC..
 			 */
 			if (defendingPlayer != null && isNotNPC(defendingPlayer)) {
-				
+
+				boolean cancelled = false;
+
 				/*
-				 * Both townblocks are not Arena plots.
+				 * Both townblocks are not Arena plot and Player is not considered an Admin by Towny.
+				 * Arena plots never prevent pvp, admins are never prevented from pvping.
 				 */
-				if (!isArenaPlot(attackerTB, defenderTB)) {
+				if (!isArenaPlot(attackerTB, defenderTB) && !isTownyAdmin(attackingPlayer)) {
 					/*
 					 * Check if we are preventing friendly fire between allies
-					 * Check the attackers TownBlock and it's Town for their PvP status, else the world.
-					 * Check the defenders TownBlock and it's Town for their PvP status, else the world.
+					 * Check the attackers TownBlock for its PvP status, else the world.
+					 * Check the defenders TownBlock for its PvP status, else the world.
+					 * Check whether this involves someone who is jailed and in a Jail plot. 
 					 */
 					cancelled = preventFriendlyFire(attackingPlayer, defendingPlayer, world) || preventPvP(world, attackerTB) || preventPvP(world, defenderTB) || preventJailedPVP(defendingPlayer, attackingPlayer);
 				}
@@ -702,4 +704,8 @@ private static boolean isNotNPC(Entity entity) {
 			return null;
 		}
 	}
+
+	private static boolean isTownyAdmin(Player attackingPlayer) {
+		return TownyUniverse.getInstance().getPermissionSource().isTownyAdmin(attackingPlayer);
+	}
 }