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

Fixed self-damage putting a player "in combat".

Browse Source 
Fixes especially ender pearls + immediate disconnect = death.
This commit is contained in:
ryanhamshire 2015-02-06 18:45:00 -08:00
parent d43356897f
commit ac0a87124f
1 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -567,6 +567,8 @@ class EntityEventHandler implements Listener
Player defender = (Player)(event.getEntity()); Player defender = (Player)(event.getEntity());
if(attacker != defender)
{
PlayerData defenderData = this.dataStore.getPlayerData(((Player)event.getEntity()).getUniqueId()); PlayerData defenderData = this.dataStore.getPlayerData(((Player)event.getEntity()).getUniqueId());
PlayerData attackerData = this.dataStore.getPlayerData(attacker.getUniqueId()); PlayerData attackerData = this.dataStore.getPlayerData(attacker.getUniqueId());
@ -625,6 +627,7 @@ class EntityEventHandler implements Listener
attackerData.lastPvpTimestamp = now; attackerData.lastPvpTimestamp = now;
attackerData.lastPvpPlayer = defender.getName(); attackerData.lastPvpPlayer = defender.getName();
} }
}
//FEATURE: protect claimed animals, boats, minecarts, and items inside item frames //FEATURE: protect claimed animals, boats, minecarts, and items inside item frames
//NOTE: animals can be lead with wheat, vehicles can be pushed around. //NOTE: animals can be lead with wheat, vehicles can be pushed around.