skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from zonedabone/master

Browse Source 
Adds more flexible support for other death plugins.
This commit is contained in:
garbagemule
2011-06-16 15:31:01 -07:00
parent 1e4933d1ae 04ab729a48
commit 70766da9b6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/garbagemule/MobArena/MADeathListener.java
+1
View File
@@ -36,6 +36,7 @@ public class MADeathListener extends EntityListener
event.getDrops().clear(); event.getDrops().clear();
ArenaManager.playerDeath(p); ArenaManager.playerDeath(p);
p.getInventory().clear();
} }
// If monster, remove from monster set // If monster, remove from monster set
else if (event.getEntity() instanceof LivingEntity) else if (event.getEntity() instanceof LivingEntity)
src/com/garbagemule/MobArena/MobArena.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class MobArena extends JavaPlugin
pm.registerEvent(Event.Type.PLAYER_JOIN, discListener, Priority.Normal, this); pm.registerEvent(Event.Type.PLAYER_JOIN, discListener, Priority.Normal, this);
pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.Normal, this); pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.Normal, this);
pm.registerEvent(Event.Type.BLOCK_PLACE, blockListener, Priority.Normal, this); pm.registerEvent(Event.Type.BLOCK_PLACE, blockListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DEATH, deathListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_DEATH, deathListener, Priority.Lowest, this);
pm.registerEvent(Event.Type.ENTITY_EXPLODE, monsterListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_EXPLODE, monsterListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_COMBUST, monsterListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_COMBUST, monsterListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_TARGET, monsterListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_TARGET, monsterListener, Priority.Normal, this);