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

move Google Guava to mage-root pom in dependencyManagement, so other modules can use it

Browse source
This commit is contained in:
Ingmar Goudt 2019-03-18 15:48:35 +01:00
parent efb357747d
commit 72c8c267a1
7 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -1,5 +1,6 @@
package mage.cards;
import com.google.common.collect.ImmutableList;
import mage.MageObject;
import mage.MageObjectImpl;
import mage.Mana;
@ -224,11 +225,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
game.getState().getCardState(objectId).addInfo(key, value);
}
protected static final ArrayList<String> rulesError = new ArrayList<String>() {
{
add("Exception occurred in rules generation");
}
};
protected static final List<String> rulesError = ImmutableList.of("Exception occurred in rules generation");
@Override
public List<String> getRules() {

10
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -1,5 +1,6 @@
package mage.players;
import com.google.common.collect.ImmutableMap;
import mage.ConditionalMana;
import mage.MageObject;
import mage.MageObjectReference;
@ -178,11 +179,10 @@ public abstract class PlayerImpl implements Player, Serializable {
/**
* During some steps we can't play anything
*/
protected final Map<PhaseStep, Step.StepPart> silentPhaseSteps = new EnumMap<PhaseStep, Step.StepPart>(PhaseStep.class) {
{
put(PhaseStep.DECLARE_ATTACKERS, Step.StepPart.PRE);
}
};
protected final Map<PhaseStep, Step.StepPart> silentPhaseSteps = ImmutableMap.<PhaseStep, Step.StepPart>builder().
put(PhaseStep.DECLARE_ATTACKERS, Step.StepPart.PRE).build();
public PlayerImpl(String name, RangeOfInfluence range) {
this(UUID.randomUUID());