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

Improved freeze checks and canRespond/isInGame usage

Browse source
This commit is contained in:
Oleg Agafonov 2020-07-01 13:48:22 +04:00
parent 3b19e3db35
commit adbe84c540
17 changed files with 54 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -122,8 +122,7 @@ public class DamageTargetEffect extends OneShotEffect {
permanent.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, preventable);
}
Player player = game.getPlayer(targetId);
if (player != null
&& player.isInGame()) {
if (player != null) {
player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, preventable);
}
}
@ -136,8 +135,7 @@ public class DamageTargetEffect extends OneShotEffect {
permanent.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, preventable);
} else {
Player player = game.getPlayer(targetId);
if (player != null
&& player.isInGame()) {
if (player != null) {
player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, preventable);
}
}

11
Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java
View file

@ -1,6 +1,5 @@
package mage.abilities.effects.common.continuous;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
import mage.abilities.Mode;
@ -16,8 +15,9 @@ import mage.players.Player;
import mage.target.Target;
import mage.util.CardUtil;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class GainControlTargetEffect extends ContinuousEffectImpl {
@ -31,17 +31,15 @@ public class GainControlTargetEffect extends ContinuousEffectImpl {
}
/**
*
* @param duration
* @param fixedControl Controlling player is fixed even if the controller of
* the ability changes later
* the ability changes later
*/
public GainControlTargetEffect(Duration duration, boolean fixedControl) {
this(duration, fixedControl, null);
}
/**
*
* @param duration
* @param controllingPlayerId Player that controls the target creature
*/
@ -112,8 +110,7 @@ public class GainControlTargetEffect extends ContinuousEffectImpl {
}
}
// no valid target exists and the controller is no longer in the game, effect can be discarded
if (!oneTargetStillExists
|| !controller.isInGame()) {
if (!oneTargetStillExists || !controller.isInGame()) {
discard();
}
firstControlChange = false;

8
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -982,7 +982,7 @@ public abstract class GameImpl implements Game, Serializable {
targetPlayer.setTargetName("starting player");
if (choosingPlayerId != null) {
choosingPlayer = this.getPlayer(choosingPlayerId);
if (choosingPlayer != null && !choosingPlayer.isInGame()) {
if (choosingPlayer != null && !choosingPlayer.canRespond()) {
choosingPlayer = null;
}
}
@ -1007,7 +1007,7 @@ public abstract class GameImpl implements Game, Serializable {
if (startingPlayerId == null) {
// choose any available player as starting player
for (Player player : state.getPlayers().values()) {
if (player.isInGame()) {
if (player.canRespond()) {
startingPlayerId = player.getId();
break;
}
@ -1161,7 +1161,7 @@ public abstract class GameImpl implements Game, Serializable {
while (!hasEnded()) {
playerId = players[RandomUtil.nextInt(players.length)];
Player player = getPlayer(playerId);
if (player != null && player.isInGame()) {
if (player != null && player.canRespond()) {
fireInformEvent(state.getPlayer(playerId).getLogName() + " won the toss");
return player.getId();
}
@ -3281,7 +3281,7 @@ public abstract class GameImpl implements Game, Serializable {
gameStatesRollBack.put(getTurnNum(), state.copy());
executingRollback = true;
for (Player playerObject : getPlayers().values()) {
if (playerObject.isHuman() && playerObject.isInGame()) {
if (playerObject.isHuman() && playerObject.canRespond()) {
playerObject.resetStoredBookmark(this);
playerObject.abort();
playerObject.resetPlayerPassedActions();

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

@ -1,17 +1,10 @@
package mage.game.combat;
import mage.abilities.Ability;
import mage.abilities.common.ControllerAssignCombatDamageToBlockersAbility;
import mage.abilities.common.ControllerDivideCombatDamageAbility;
import mage.abilities.common.DamageAsThoughNotBlockedAbility;
import mage.abilities.keyword.BandingAbility;
import mage.abilities.keyword.BandsWithOtherAbility;
import mage.abilities.keyword.CantBlockAloneAbility;
import mage.abilities.keyword.DeathtouchAbility;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.*;
import mage.constants.AsThoughEffectType;
import mage.constants.Outcome;
import mage.filter.StaticFilters;
@ -27,7 +20,6 @@ import java.util.*;
import java.util.stream.Stream;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class CombatGroup implements Serializable, Copyable<CombatGroup> {
@ -43,9 +35,9 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
protected boolean defenderIsPlaneswalker;
/**
* @param defenderId the player that controls the defending permanents
* @param defenderId the player that controls the defending permanents
* @param defenderIsPlaneswalker is the defending permanent a planeswalker
* @param defendingPlayerId regular controller of the defending permanents
* @param defendingPlayerId regular controller of the defending permanents
*/
public CombatGroup(UUID defenderId, boolean defenderIsPlaneswalker, UUID defendingPlayerId) {
this.defenderId = defenderId;
@ -174,7 +166,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
Player player = game.getPlayer(defenderAssignsCombatDamage(game) ? defendingPlayerId : attacker.getControllerId());
if ((attacker.getAbilities().containsKey(DamageAsThoughNotBlockedAbility.getInstance().getId()) &&
player.chooseUse(Outcome.Damage, "Do you wish to assign damage for "
+ attacker.getLogName() + " as though it weren't blocked?", null, game)) ||
+ attacker.getLogName() + " as though it weren't blocked?", null, game)) ||
game.getContinuousEffects().asThough(attacker.getId(), AsThoughEffectType.DAMAGE_NOT_BLOCKED
, null, attacker.getControllerId(), game) != null) {
// for handling creatures like Thorn Elemental
@ -227,7 +219,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
* Determines if permanent can damage in current (First Strike or not)
* combat damage step
*
* @param perm Permanent to check
* @param perm Permanent to check
* @param first First strike or common combat damage step
* @return
*/
@ -409,7 +401,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
if (damage > 0) {
Player defendingPlayer = game.getPlayer(defendingPlayerId);
if (defendingPlayer.isInGame()) {
if (defendingPlayer != null) {
defendingPlayer.damage(damage, attacker.getId(), game, true, true);
}
}
@ -466,9 +458,9 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
* Damages attacking creatures by a creature that blocked several ones
* Damages only attackers as blocker was damage in
* {@link #singleBlockerDamage}.
*
* <p>
* Handles abilities like "{this} an block any number of creatures.".
*
* <p>
* Blocker damage for blockers blocking single creatures is handled in the
* single/multi blocker methods, so this shouldn't be used anymore.
*
@ -492,7 +484,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
* Damages attacking creatures by a creature that blocked several ones
* Damages only attackers as blocker was damage in either
* {@link #singleBlockerDamage} or {@link #multiBlockerDamage}.
*
* <p>
* Handles abilities like "{this} an block any number of creatures.".
*
* @param first
@ -552,7 +544,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
} else {
Player defender = game.getPlayer(defenderId);
if (defender.isInGame()) {
if (defender != null) {
defender.damage(amount, attacker.getId(), game, true, true);
}
}
@ -572,9 +564,8 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
/**
*
* @param blockerId
* @param playerId controller of the blocking creature
* @param playerId controller of the blocking creature
* @param game
*/
public void addBlocker(UUID blockerId, UUID playerId, Game game) {
@ -591,7 +582,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
* event.
*
* @param blockerId
* @param playerId controller of the blocking creature
* @param playerId controller of the blocking creature
* @param game
*/
public void addBlockerToGroup(UUID blockerId, UUID playerId, Game game) {
@ -645,7 +636,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
attackerPerms.add(game.getPermanent(attackerId));
}
UUID attackerId = player.chooseAttackerOrder(attackerPerms, game);
if (!player.isInGame()) {
if (attackerId == null) {
break;
}
attackerOrder.add(attackerId);
@ -791,7 +782,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
/**
* There are effects, that set an attacker to be blocked. Therefore this
* setter can be used.
*
* <p>
* This method lacks a band check, use setBlocked(blocked, game) instead.
*
* @param blocked

5
Mage/src/main/java/mage/players/PlayerList.java
View file

@ -53,6 +53,7 @@ public class PlayerList extends CircularList<UUID> {
player.setReachedNextTurnAfterLeaving(true);
}
}
if (player.getId().equals(start)) {
return null;
}
@ -63,11 +64,15 @@ public class PlayerList extends CircularList<UUID> {
public Player getPrevious(Game game) {
Player player;
UUID start = this.get();
if (start == null) {
return null;
}
while (true) {
player = game.getPlayer(super.getPrevious());
if (player.isInGame()) {
break;
}
if (player.getId().equals(start)) {
return null;
}