From f8170aa348cc66b0edb3cc08da4cddf59fe3dfee Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Thu, 5 Jul 2012 21:01:13 -0400 Subject: [PATCH] Make sure drain/recoil works correctly against Substitute --- simulator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simulator.js b/simulator.js index bb6791bb0b..8a91af5447 100644 --- a/simulator.js +++ b/simulator.js @@ -287,7 +287,6 @@ function BattlePokemon(set, side) { this.gotAttacked = function(move, damage, source) { if (!damage) damage = 0; move = selfB.getMove(move); - source.lastDamage = damage; selfP.lastAttackedBy = { pokemon: source, damage: damage, @@ -1873,6 +1872,7 @@ function Battle(roomid, format, rated) { this.debug('pokemon.damage said zero'); return 0; } + source.lastDamage = damage; var name = effect.fullname; if (name === 'tox') name = 'psn'; switch (effect.id) {