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

Wolves are wolves, not players

Browse Source
This commit is contained in:
Brian
2013-01-03 21:53:00 -05:00
parent 051c058c1a
commit b012d9c0c0
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/plugin.yml
+1 -1
View File
@@ -1,7 +1,7 @@
name: MobArena name: MobArena
author: garbagemule author: garbagemule
main: com.garbagemule.MobArena.MobArena main: com.garbagemule.MobArena.MobArena
version: 0.94.4.92 version: 0.94.4.93
softdepend: [Spout,MultiVerse,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault] softdepend: [Spout,MultiVerse,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault]
commands: commands:
ma: ma:
src/com/garbagemule/MobArena/ArenaListener.java
+1 -4
View File
@@ -480,9 +480,6 @@ public class ArenaListener
if (damager instanceof Projectile) { if (damager instanceof Projectile) {
damager = ((Projectile) damager).getShooter(); damager = ((Projectile) damager).getShooter();
} }
else if (damager instanceof Wolf && arena.hasPet(damager)) {
damager = (Player) ((Wolf) damager).getOwner();
}
} }
// Pet wolf // Pet wolf
@@ -545,7 +542,7 @@ public class ArenaListener
aps.inc("hits"); aps.inc("hits");
} }
else if (damager instanceof Wolf && arena.hasPet(damager)) { else if (damager instanceof Wolf && arena.hasPet(damager)) {
event.setDamage(1); //event.setDamage(1);
Player p = (Player) ((Wolf) damager).getOwner(); Player p = (Player) ((Wolf) damager).getOwner();
ArenaPlayerStatistics aps = arena.getArenaPlayer(p).getStats(); ArenaPlayerStatistics aps = arena.getArenaPlayer(p).getStats();
aps.add("dmgDone", event.getDamage()); aps.add("dmgDone", event.getDamage());