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

* Stinkdrinker Bandit - Fixed triggered ability only triggering for controlled creatures now.

Browse source
This commit is contained in:
LevelX2 2016-02-03 00:25:17 +01:00
parent a796fe5adb
commit 6458a95912
3 changed files with 66 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -50,6 +50,7 @@ import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterPlaneswalkerPermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.players.PlayerList;
@ -415,6 +416,12 @@ public class Combat implements Serializable, Copyable<Combat> {
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.DECLARING_BLOCKERS, attackerId, attackerId))) {
game.getCombat().selectBlockers(null, game);
}
for (UUID attackingCreatureID : game.getCombat().getAttackers()) {
Permanent permanent = game.getPermanent(attackingCreatureID);
if (permanent != null && permanent.getBlocking() == 0) {
game.fireEvent(GameEvent.getEvent(EventType.UNBLOCKED_ATTACKER, attackingCreatureID, attackerId));
}
}
}
/**
@ -822,8 +829,8 @@ public class Combat implements Serializable, Copyable<Combat> {
// the creature is blocking a forcing attacker, so the block is ok
blockIsValid = true;
break CombatGroups;
} else {
// check if the blocker blocks a attacker that must be blocked at least by one and is the only blocker, this block is also valid
} else // check if the blocker blocks a attacker that must be blocked at least by one and is the only blocker, this block is also valid
{
if (combatGroup.getBlockers().size() == 1) {
if (mustBeBlockedByAtLeastOne.containsKey(forcingAttackerId)) {
if (mustBeBlockedByAtLeastOne.get(forcingAttackerId).contains(creatureForcedToBlock.getId())) {
@ -910,7 +917,7 @@ public class Combat implements Serializable, Copyable<Combat> {
* @return
*/
public boolean checkBlockRestrictionsAfter(Player player, Player controller, Game game) {
// Restrictions applied to blocking creatures
// Restrictions applied to blocking creatures
for (UUID blockingCreatureId : this.getBlockers()) {
Permanent blockingCreature = game.getPermanent(blockingCreatureId);
if (blockingCreature != null) {
@ -998,12 +1005,10 @@ public class Combat implements Serializable, Copyable<Combat> {
if (defendingPlayer != null) {
if (defendingPlayer.getMaxAttackedBy() == Integer.MAX_VALUE) {
maxAttackers = Integer.MAX_VALUE;
} else if (maxAttackers == Integer.MIN_VALUE) {
maxAttackers = defendingPlayer.getMaxAttackedBy();
} else {
if (maxAttackers == Integer.MIN_VALUE) {
maxAttackers = defendingPlayer.getMaxAttackedBy();
} else {
maxAttackers += defendingPlayer.getMaxAttackedBy();
}
maxAttackers += defendingPlayer.getMaxAttackedBy();
}
}
}

1
Mage/src/main/java/mage/game/events/GameEvent.java
View file

@ -185,6 +185,7 @@ public class GameEvent implements Serializable {
DECLARED_BLOCKERS,
DECLARE_BLOCKER, BLOCKER_DECLARED,
CREATURE_BLOCKED,
UNBLOCKED_ATTACKER,
SEARCH_LIBRARY, LIBRARY_SEARCHED,
SHUFFLE_LIBRARY, LIBRARY_SHUFFLED,
ENCHANT_PLAYER, ENCHANTED_PLAYER,