Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ender pearls don't trigger PvP combat mode.

Browse Source 
Broke this when I fixed the issue with other plugins cancelling PvP
events.
This commit is contained in:
ryanhamshire 2015-03-16 18:56:25 -07:00
parent d3a2637b92
commit 447a8a1fc4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -824,12 +824,15 @@ class EntityEventHandler implements Listener
PlayerData defenderData = this.dataStore.getPlayerData(defender.getUniqueId()); PlayerData defenderData = this.dataStore.getPlayerData(defender.getUniqueId());
PlayerData attackerData = this.dataStore.getPlayerData(attacker.getUniqueId()); PlayerData attackerData = this.dataStore.getPlayerData(attacker.getUniqueId());
if(attacker != defender)
{
long now = Calendar.getInstance().getTimeInMillis(); long now = Calendar.getInstance().getTimeInMillis();
defenderData.lastPvpTimestamp = now; defenderData.lastPvpTimestamp = now;
defenderData.lastPvpPlayer = attacker.getName(); defenderData.lastPvpPlayer = attacker.getName();
attackerData.lastPvpTimestamp = now; attackerData.lastPvpTimestamp = now;
attackerData.lastPvpPlayer = defender.getName(); attackerData.lastPvpPlayer = defender.getName();
} }
}
//when a vehicle is damaged //when a vehicle is damaged
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)