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

Fixed Heroes PvP stuff...

Browse Source
This commit is contained in:
Garbage Mule 2011-09-13 16:09:58 +02:00
parent 0c66b00967
commit 7457aea412
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
MobArena.jar
View File

Binary file not shown.

12
src/com/garbagemule/MobArena/MAListener.java
View File

@ -295,8 +295,9 @@ public class MAListener implements ArenaListener
if (!arena.running) return;
EntityDamageByEntityEvent e = (event instanceof EntityDamageByEntityEvent) ? (EntityDamageByEntityEvent) event : null;
Entity damager = (e != null) ? e.getDamager() : null;
Entity damagee = event.getEntity();
Entity damager = (e != null) ? e.getDamager() : null;
if (e != null) damager = ((Projectile) e.getDamager()).getShooter();
// Pet wolf
if (damagee instanceof Wolf && arena.pets.contains(damagee))
@ -326,7 +327,7 @@ public class MAListener implements ArenaListener
event.setCancelled(true);
// If PvP is disabled and damager is a player, cancel damage
else if (!arena.pvp && (damager instanceof Player || (damager instanceof Projectile && ((Projectile) damager).getShooter() instanceof Player)))
else if (!arena.pvp && damager instanceof Player)
event.setCancelled(true);
// Log damage
@ -340,14 +341,13 @@ public class MAListener implements ArenaListener
{
if (arena.hellhounds)
pet.setFireTicks(32768);
event.setCancelled(true);
}
// Cancel player and projectile damage
else if (damager instanceof Player || damager instanceof Projectile)
{
// Cancel player and projectile damage
event.setCancelled(true);
}
// Set damage to 0 for knockbacks from monsters
else event.setDamage(0);
}

2
src/com/garbagemule/MobArena/MobArena.java
View File

@ -135,7 +135,7 @@ public class MobArena extends JavaPlugin
pm.registerEvent(Event.Type.PLAYER_KICK, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_ANIMATION, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Priority.High, this); // mcMMO is "Highest"
pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Priority.Low, this); // Must cancel before Heroes
pm.registerEvent(Event.Type.ENTITY_DEATH, entityListener, Priority.Lowest, this); // Lowest because of Tombstone
pm.registerEvent(Event.Type.ENTITY_REGAIN_HEALTH, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.Highest, this);