Fixed self-damage putting a player "in combat".
Fixes especially ender pearls + immediate disconnect = death.
This commit is contained in:
parent
d43356897f
commit
ac0a87124f
|
|
@ -567,6 +567,8 @@ class EntityEventHandler implements Listener
|
|||
|
||||
Player defender = (Player)(event.getEntity());
|
||||
|
||||
if(attacker != defender)
|
||||
{
|
||||
PlayerData defenderData = this.dataStore.getPlayerData(((Player)event.getEntity()).getUniqueId());
|
||||
PlayerData attackerData = this.dataStore.getPlayerData(attacker.getUniqueId());
|
||||
|
||||
|
|
@ -625,6 +627,7 @@ class EntityEventHandler implements Listener
|
|||
attackerData.lastPvpTimestamp = now;
|
||||
attackerData.lastPvpPlayer = defender.getName();
|
||||
}
|
||||
}
|
||||
|
||||
//FEATURE: protect claimed animals, boats, minecarts, and items inside item frames
|
||||
//NOTE: animals can be lead with wheat, vehicles can be pushed around.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user