External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 12:02:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Test message cleanup

Browse source
This commit is contained in:
Zzooouhh 2017-12-06 19:50:06 +01:00 • committed by GitHub
parent edd07d4f80
commit c6e69868fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/game/combat/CombatGroup.java
View file

@ -9,7 +9,7 @@
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.i * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
@ -144,7 +144,6 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
if (!attackers.isEmpty() && (!first || hasFirstOrDoubleStrike(game))) { if (!attackers.isEmpty() && (!first || hasFirstOrDoubleStrike(game))) {
Permanent attacker = game.getPermanent(attackers.get(0)); Permanent attacker = game.getPermanent(attackers.get(0));
if (isButcherOrgg(attacker, attacker.getControllerId(), first, game, true)) { if (isButcherOrgg(attacker, attacker.getControllerId(), first, game, true)) {
game.informPlayers("test one");
return; return;
} }
if (blockers.isEmpty()) { if (blockers.isEmpty()) {
@ -173,7 +172,6 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
for (UUID blockerId : blockers) { for (UUID blockerId : blockers) {
Permanent blocker = game.getPermanent(blockerId); Permanent blocker = game.getPermanent(blockerId);
if (isButcherOrgg(blocker, blocker.getControllerId(), first, game, false)) { if (isButcherOrgg(blocker, blocker.getControllerId(), first, game, false)) {
game.informPlayers("test two");
altDamageMethod = true; altDamageMethod = true;
} }
} }