From 347085e8e0363b2eaef437ca112d58970d3fc1cb Mon Sep 17 00:00:00 2001
From: ryanhamshire <ryanhamshire@live.com>
Date: Tue, 3 Mar 2015 20:35:53 -0800
Subject: [PATCH] Fixed "combat" starting for blocked damage events.

When another plugin prevents an attack, neither player should be put "in
combat" where GP's combat rules are concerned.
---
 .../GriefPrevention/EntityEventHandler.java   | 59 ++++++++++++++++---
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 6074cf9..2651e8a 100644
--- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -617,15 +617,6 @@ class EntityEventHandler implements Listener
     					return;
     				}
     			}
-    			
-    			//FEATURE: prevent players who very recently participated in pvp combat from hiding inventory to protect it from looting
-    			//FEATURE: prevent players who are in pvp combat from logging out to avoid being defeated
-    			
-    			long now = Calendar.getInstance().getTimeInMillis();
-    			defenderData.lastPvpTimestamp = now;
-    			defenderData.lastPvpPlayer = attacker.getName();
-    			attackerData.lastPvpTimestamp = now;
-    			attackerData.lastPvpPlayer = defender.getName();
 			}
 		}
 		
@@ -790,6 +781,56 @@ class EntityEventHandler implements Listener
 		}
 	}
 	
+	//when an entity is damaged
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void onEntityDamageMonitor (EntityDamageEvent event)
+    {
+        //FEATURE: prevent players who very recently participated in pvp combat from hiding inventory to protect it from looting
+        //FEATURE: prevent players who are in pvp combat from logging out to avoid being defeated
+        
+        if(event.getEntity().getType() != EntityType.PLAYER) return;
+        
+        Player defender = (Player)event.getEntity();
+        
+        //only interested in entities damaging entities (ignoring environmental damage)
+        if(!(event instanceof EntityDamageByEntityEvent)) return;
+        
+        EntityDamageByEntityEvent subEvent = (EntityDamageByEntityEvent) event;
+        
+        //determine which player is attacking, if any
+        Player attacker = null;
+        Projectile arrow = null;
+        Entity damageSource = subEvent.getDamager();
+        
+        if(damageSource != null)
+        {
+            if(damageSource instanceof Player)
+            {
+                attacker = (Player)damageSource;
+            }
+            else if(damageSource instanceof Projectile)
+            {
+                arrow = (Projectile)damageSource;
+                if(arrow.getShooter() instanceof Player)
+                {
+                    attacker = (Player)arrow.getShooter();
+                }
+            }
+        }
+        
+        //if attacker not a player, do nothing
+        if(attacker == null) return;
+        
+        PlayerData defenderData = this.dataStore.getPlayerData(defender.getUniqueId());
+        PlayerData attackerData = this.dataStore.getPlayerData(attacker.getUniqueId());
+        
+        long now = Calendar.getInstance().getTimeInMillis();
+        defenderData.lastPvpTimestamp = now;
+        defenderData.lastPvpPlayer = attacker.getName();
+        attackerData.lastPvpTimestamp = now;
+        attackerData.lastPvpPlayer = defender.getName();
+    }
+	
 	//when a vehicle is damaged
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
 	public void onVehicleDamage (VehicleDamageEvent event)