github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed that player names for damage assigning during combat had html tags.

Browse source
This commit is contained in:
LevelX2 2015-05-25 10:51:44 +02:00
parent 6480fb321e
commit 0847d3f820
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/mage/game/combat/CombatGroup.java
View file

@ -244,7 +244,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
else {
Player player = game.getPlayer(attacker.getControllerId());
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getLogName(), game);
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getName(), game);
blocker.markDamage(damageAssigned, attacker.getId(), game, true, true);
damage -= damageAssigned;
if (damage > 0) {
@ -298,7 +298,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
damage = 0;
break;
}
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getLogName(), game);
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + blocker.getName(), game);
assigned.put(blockerId, damageAssigned);
damage -= damageAssigned;
}
@ -380,7 +380,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
assigned.put(attackerId, damage);
break;
}
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + attacker.getLogName(), game);
int damageAssigned = player.getAmount(lethalDamage, damage, "Assign damage to " + attacker.getName(), game);
assigned.put(attackerId, damageAssigned);
damage -= damageAssigned;
}