Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-26 12:36:00 +01:00
Code Issues Projects Releases Wiki Activity

Remove pets in case they die.

Browse Source 
This technically can't happen because all pet damage is cancelled, but we never know, and we best be sure to clean up.
This commit is contained in:
Andreas Troelsen 2019-08-05 16:04:44 +02:00
parent cb8983b162
commit ab031e3e63
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/garbagemule/MobArena/ArenaListener.java
View File

@ -494,6 +494,9 @@ public class ArenaListener
if (event instanceof PlayerDeathEvent) {
onPlayerDeath((PlayerDeathEvent) event, (Player) event.getEntity());
}
else if (monsters.hasPet(event.getEntity())) {
monsters.removePet(event.getEntity());
}
else if (monsters.removeMonster(event.getEntity())) {
onMonsterDeath(event);
}

12
src/main/java/com/garbagemule/MobArena/MonsterManager.java
View File

@ -131,6 +131,18 @@ public class MonsterManager
return petToPlayer.containsKey(e);
}
public void removePet(Entity pet) {
pet.remove();
Player owner = petToPlayer.remove(pet);
if (owner != null) {
Set<Entity> pets = playerToPets.get(owner);
if (pets != null) {
pets.remove(pet);
}
}
}
public Player getOwner(Entity pet) {
return petToPlayer.get(pet);
}