mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 20:28:00 +00:00
GameLossReason moved to player package, since it's individual per player and to avoid confusion with GameEndReason
This commit is contained in:
@@ -29,7 +29,6 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import com.esotericsoftware.minlog.Log;
|
||||
@@ -113,7 +112,7 @@ public class Card extends GameEntity implements Comparable<Card> {
|
||||
|
||||
// changes by AF animate and continuous static effects
|
||||
private ArrayList<CardType> changedCardTypes = new ArrayList<CardType>();
|
||||
private ArrayList<CardKeywords> changedCardKeywords = new ArrayList<CardKeywords>();
|
||||
private List<CardKeywords> changedCardKeywords = new ArrayList<CardKeywords>();
|
||||
|
||||
private final ArrayList<Object> rememberedObjects = new ArrayList<Object>();
|
||||
private final ArrayList<Card> imprintedCards = new ArrayList<Card>();
|
||||
@@ -4294,7 +4293,7 @@ public class Card extends GameEntity implements Comparable<Card> {
|
||||
// see if keyword changes are in effect
|
||||
if (!this.changedCardKeywords.isEmpty()) {
|
||||
|
||||
final ArrayList<CardKeywords> newKeywords = this.changedCardKeywords;
|
||||
final ArrayList<CardKeywords> newKeywords = new ArrayList<CardKeywords>(this.changedCardKeywords);
|
||||
Collections.sort(newKeywords); // sorts newKeywords by timeStamp
|
||||
|
||||
for (final CardKeywords ck : newKeywords) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.List;
|
||||
import forge.Card;
|
||||
import forge.card.ability.SpellAbilityEffect;
|
||||
import forge.card.spellability.SpellAbility;
|
||||
import forge.game.GameLossReason;
|
||||
import forge.game.player.GameLossReason;
|
||||
import forge.game.player.Player;
|
||||
|
||||
public class GameLossEffect extends SpellAbilityEffect {
|
||||
|
||||
@@ -59,6 +59,7 @@ import forge.game.event.CardDestroyedEvent;
|
||||
import forge.game.event.CardRegeneratedEvent;
|
||||
import forge.game.event.CardSacrificedEvent;
|
||||
import forge.game.player.AIPlayer;
|
||||
import forge.game.player.GameLossReason;
|
||||
import forge.game.player.HumanPlayer;
|
||||
import forge.game.player.Player;
|
||||
import forge.game.player.PlayerType;
|
||||
|
||||
@@ -22,8 +22,8 @@ import forge.Singletons;
|
||||
import forge.card.mana.ManaCost;
|
||||
import forge.card.spellability.Ability;
|
||||
import forge.card.spellability.SpellAbility;
|
||||
import forge.game.GameLossReason;
|
||||
import forge.game.GameState;
|
||||
import forge.game.player.GameLossReason;
|
||||
import forge.game.player.Player;
|
||||
import forge.game.zone.ZoneType;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package forge.game;
|
||||
package forge.game.player;
|
||||
|
||||
/**
|
||||
* The Enum GameLossReason.
|
||||
@@ -55,7 +55,6 @@ import forge.card.spellability.Target;
|
||||
import forge.card.staticability.StaticAbility;
|
||||
import forge.card.trigger.TriggerType;
|
||||
import forge.game.GameActionUtil;
|
||||
import forge.game.GameLossReason;
|
||||
import forge.game.GameState;
|
||||
import forge.game.GlobalRuleChange;
|
||||
import forge.game.event.CardDiscardedEvent;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package forge.game.player;
|
||||
|
||||
import forge.game.GameLossReason;
|
||||
|
||||
/**
|
||||
* TODO: Write javadoc for this type.
|
||||
|
||||
@@ -38,9 +38,9 @@ import forge.card.UnOpenedProduct;
|
||||
import forge.control.FControl;
|
||||
import forge.game.GameEndReason;
|
||||
import forge.game.GameFormat;
|
||||
import forge.game.GameLossReason;
|
||||
import forge.game.GameOutcome;
|
||||
import forge.game.MatchController;
|
||||
import forge.game.player.GameLossReason;
|
||||
import forge.game.player.LobbyPlayer;
|
||||
import forge.game.player.Player;
|
||||
import forge.game.player.PlayerOutcome;
|
||||
|
||||
Reference in New Issue
Block a user