Add pvp dissalowed event. Adds #421

src/com/massivecraft/factions/event/FactionsEventPvpDisallowed.java

@@ -0,0 +1,52 @@
+package com.massivecraft.factions.event;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+import com.massivecraft.factions.entity.UPlayer;
+
+/**
+ * This event is fired when PVP is disallowed between players due to a "pvp deny" flag.
+ * Canceling this event allows the PVP in spite of this.
+ * 
+ * Note that the defender field always is set but the attacker can be null.
+ * Some other plugins seem to fire EntityDamageByEntityEvent without an attacker.
+ */
+public class FactionsEventPvpDisallowed extends FactionsEventAbstract
+{
+	// -------------------------------------------- //
+	// REQUIRED EVENT CODE
+	// -------------------------------------------- //
+	
+	private static final HandlerList handlers = new HandlerList();
+	@Override public HandlerList getHandlers() { return handlers; }
+	public static HandlerList getHandlerList() { return handlers; }
+	
+	// -------------------------------------------- //
+	// FIELDS
+	// -------------------------------------------- //
+	
+	private final Player attacker;
+	public Player getAttacker() { return this.attacker; }
+	public UPlayer getUAttacker() { return this.attacker == null ? null : UPlayer.get(this.attacker); }
+	
+	private final Player defender;
+	public Player getDefender() { return this.defender; }
+	public UPlayer getUDefender() { return this.defender == null ? null : UPlayer.get(this.defender); }
+	
+	private final EntityDamageByEntityEvent event;
+	public EntityDamageByEntityEvent getEvent() { return this.event; }
+	
+	// -------------------------------------------- //
+	// CONSTRUCT
+	// -------------------------------------------- //
+	
+	public FactionsEventPvpDisallowed(Player attacker, Player defender, EntityDamageByEntityEvent event)
+	{
+		this.attacker = attacker;
+		this.defender = defender;
+		this.event = event;
+	}
+
+}

src/com/massivecraft/factions/listeners/FactionsListenerMain.java

@@ -63,6 +63,7 @@ import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.entity.UConf;
 import com.massivecraft.factions.entity.UPlayerColl;
 import com.massivecraft.factions.entity.UPlayerColls;
+import com.massivecraft.factions.event.FactionsEventPvpDisallowed;
 import com.massivecraft.factions.event.FactionsEventPowerChange;
 import com.massivecraft.factions.event.FactionsEventPowerChange.PowerChangeReason;
 import com.massivecraft.factions.util.VisualizeUtil;
@@ -269,8 +270,18 @@ public class FactionsListenerMain implements Listener
 		}
 	}
 
+	// Utility method used in "canCombatDamageHappen" below.
+	public static boolean falseUnlessDisallowedPvpEventCancelled(Player attacker, Player defender, EntityDamageByEntityEvent event)
+	{
+		FactionsEventPvpDisallowed dpe = new FactionsEventPvpDisallowed(attacker, defender, event);
+		dpe.run();
+		return dpe.isCancelled();
+	}
+	
 	public boolean canCombatDamageHappen(EntityDamageByEntityEvent event, boolean notify)
 	{
+		boolean ret = true;
+		
 		// If the defender is a player ...
 		Entity edefender = event.getEntity();
 		if (!(edefender instanceof Player)) return true;
@@ -301,16 +312,17 @@ public class FactionsListenerMain implements Listener
 			{
 				// No attacker?
 				// Let's behave as if it were a player
-				return false;
+				return falseUnlessDisallowedPvpEventCancelled(null, defender, event);
 			}
 			if (eattacker instanceof Player)
 			{
-				if (notify)
+				ret = falseUnlessDisallowedPvpEventCancelled((Player)eattacker, defender, event);
+				if (!ret && notify)
 				{
 					UPlayer attacker = UPlayer.get(eattacker);
 					attacker.msg("<i>PVP is disabled in %s.", defenderPsFaction.describeTo(attacker));
 				}
-				return false;
+				return ret;
 			}
 			return defenderPsFaction.getFlag(FFlag.MONSTERS);
 		}
@@ -332,8 +344,9 @@ public class FactionsListenerMain implements Listener
 		// NOTE: This check is probably not that important but we could keep it anyways.
 		if (attackerPsFaction.getFlag(FFlag.PVP) == false)
 		{
-			if (notify) uattacker.msg("<i>PVP is disabled in %s.", attackerPsFaction.describeTo(uattacker));
+			ret = falseUnlessDisallowedPvpEventCancelled((Player)eattacker, defender, event);
-			return false;
+			if (!ret && notify) uattacker.msg("<i>PVP is disabled in %s.", attackerPsFaction.describeTo(uattacker));
+			return ret;
 		}
 
 		// ... are PVP rules completely ignored in this world? ...
@@ -345,8 +358,9 @@ public class FactionsListenerMain implements Listener
 
 		if (attackFaction.isNone() && uconf.disablePVPForFactionlessPlayers)
 		{
-			if (notify) uattacker.msg("<i>You can't hurt other players until you join a faction.");
+			ret = falseUnlessDisallowedPvpEventCancelled((Player)eattacker, defender, event);
-			return false;
+			if (!ret && notify) uattacker.msg("<i>You can't hurt other players until you join a faction.");
+			return ret;
 		}
 		else if (defendFaction.isNone())
 		{
@@ -357,8 +371,9 @@ public class FactionsListenerMain implements Listener
 			}
 			else if (uconf.disablePVPForFactionlessPlayers)
 			{
-				if (notify) uattacker.msg("<i>You can't hurt players who are not currently in a faction.");
+				ret = falseUnlessDisallowedPvpEventCancelled((Player)eattacker, defender, event);
-				return false;
+				if (!ret && notify) uattacker.msg("<i>You can't hurt players who are not currently in a faction.");
+				return ret;
 			}
 		}
 
@@ -367,8 +382,9 @@ public class FactionsListenerMain implements Listener
 		// Check the relation
 		if (udefender.hasFaction() && relation.isFriend() && defenderPsFaction.getFlag(FFlag.FRIENDLYFIRE) == false)
 		{
-			if (notify) uattacker.msg("<i>You can't hurt %s<i>.", relation.getDescPlayerMany());
+			ret = falseUnlessDisallowedPvpEventCancelled((Player)eattacker, defender, event);
-			return false;
+			if (!ret && notify) uattacker.msg("<i>You can't hurt %s<i>.", relation.getDescPlayerMany());
+			return ret;
 		}
 
 		// You can not hurt neutrals in their own territory.
@@ -376,12 +392,13 @@ public class FactionsListenerMain implements Listener
 		
 		if (udefender.hasFaction() && ownTerritory && relation == Rel.NEUTRAL)
 		{
-			if (notify)
+			ret = falseUnlessDisallowedPvpEventCancelled((Player)eattacker, defender, event);
+			if (!ret && notify)
 			{
 				uattacker.msg("<i>You can't hurt %s<i> in their own territory unless you declare them as an enemy.", udefender.describeTo(uattacker));
 				udefender.msg("%s<i> tried to hurt you.", uattacker.describeTo(udefender, true));
 			}
-			return false;
+			return ret;
 		}
 
 		// Damage will be dealt. However check if the damage should be reduced.