Bug 738312: Attack animations of other players are always visible

mepcotterell · Mar 23, 2012 · bacd714 · bacd714
1 parent fdd42db
commit bacd714
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/client/js/character.js b/client/js/character.js
@@ -492,7 +492,14 @@ define(['entity', 'transition', 'timer'], function(Entity, Transition, Timer) {
          * 
          */
         canAttack: function(time) {
-            if(this.hasTarget() && this.isAdjacentNonDiagonal(this.target) && this.attackCooldown.isOver(time)) {
+            if(this.canReachTarget() && this.attackCooldown.isOver(time)) {
+                return true;
+            }
+            return false;
+        },
+
+        canReachTarget: function() {
+            if(this.hasTarget() && this.isAdjacentNonDiagonal(this.target)) {
                 return true;
             }
             return false;

diff --git a/client/js/game.js b/client/js/game.js
@@ -1229,10 +1229,16 @@ function(InfoManager, BubbleManager, Renderer, Map, Animation, Sprite, AnimatedT
                         if(entity instanceof Item) {
                             self.removeItem(entity);
                         } else if(entity instanceof Character) {
+                            entity.forEachAttacker(function(attacker) {
+                                if(attacker.canReachTarget()) {
+                                    attacker.hit();
+                    	        }
+                            });
                             entity.die();
                         } else if(entity instanceof Chest) {
                             entity.open();
                         }
+
                         entity.clean();
                     }
                 });