diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 2651e8a..720f90a 100644
--- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -824,11 +824,14 @@ class EntityEventHandler implements Listener
         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();
+        if(attacker != defender)
+        {
+            long now = Calendar.getInstance().getTimeInMillis();
+            defenderData.lastPvpTimestamp = now;
+            defenderData.lastPvpPlayer = attacker.getName();
+            attackerData.lastPvpTimestamp = now;
+            attackerData.lastPvpPlayer = defender.getName();
+        }
     }
 	
 	//when a vehicle is damaged