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

Fixed more Heroes stuff, pet stuff, etc.

Browse Source
This commit is contained in:
Garbage Mule 2011-09-13 17:14:50 +02:00
parent 7457aea412
commit 4c0726a822
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
MobArena.jar
View File

Binary file not shown.

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

@ -60,14 +60,6 @@ public class MAListener implements ArenaListener
this.plugin = plugin;
}
/*
public void onBlockPhysics(BlockPhysicsEvent event)
{
if (!arena.inRegion(event.getBlock().getLocation()) || arena.softRestore)
return;
}
*/
public void onBlockBreak(BlockBreakEvent event)
{
if (onBlockDestroy(event))
@ -296,8 +288,13 @@ public class MAListener implements ArenaListener
EntityDamageByEntityEvent e = (event instanceof EntityDamageByEntityEvent) ? (EntityDamageByEntityEvent) event : null;
Entity damagee = event.getEntity();
Entity damager = (e != null) ? e.getDamager() : null;
if (e != null) damager = ((Projectile) e.getDamager()).getShooter();
Entity damager = null;
if (e != null)
{
damager = e.getDamager();
if (damager instanceof Projectile)
damager = ((Projectile) damager).getShooter();
}
// Pet wolf
if (damagee instanceof Wolf && arena.pets.contains(damagee))
@ -337,20 +334,11 @@ public class MAListener implements ArenaListener
private void onPetDamage(EntityDamageEvent event, Wolf pet, Entity damager)
{
if (damager == null)
{
if (arena.hellhounds)
if (arena.hellhounds && (damager == null || damager instanceof Player))
pet.setFireTicks(32768);
event.setCancelled(true);
}
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);
}
private void onMonsterDamage(EntityDamageEvent event, Entity monster, Entity damager)
{