external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Checkstyle fixes

Browse Source
This commit is contained in:
jendave
2011-10-08 07:49:38 +00:00
parent 0f748398bf
commit c4df569af1
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -10042,7 +10042,7 @@ src/main/java/forge/Player.java svneol=native#text/plain
src/main/java/forge/PlayerType.java svneol=native#text/plain
src/main/java/forge/PlayerUtil.java svneol=native#text/plain
src/main/java/forge/PlayerZone.java svneol=native#text/plain
src/main/java/forge/PlayerZone_ComesIntoPlay.java svneol=native#text/plain
src/main/java/forge/PlayerZoneComesIntoPlay.java svneol=native#text/plain
src/main/java/forge/SetInfo.java svneol=native#text/plain
src/main/java/forge/SetUtils.java svneol=native#text/plain
src/main/java/forge/SimpleCombat.java svneol=native#text/plain

8
src/main/java/forge/GameAction.java
View File

@@ -262,8 +262,8 @@ public class GameAction {
}
AllZone.getTriggerHandler().suppressMode("ChangesZone");
((PlayerZone_ComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(false);
((PlayerZone_ComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(false);
((PlayerZoneComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(false);
((PlayerZoneComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(false);
int tiz = c.getTurnInZone();
@@ -273,8 +273,8 @@ public class GameAction {
c.setTurnInZone(tiz);
AllZone.getTriggerHandler().clearSuppression("ChangesZone");
((PlayerZone_ComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(true);
((PlayerZone_ComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(true);
((PlayerZoneComesIntoPlay) AllZone.getHumanPlayer().getZone(Zone.Battlefield)).setTriggers(true);
((PlayerZoneComesIntoPlay) AllZone.getComputerPlayer().getZone(Zone.Battlefield)).setTriggers(true);
}
/**

2
src/main/java/forge/Player.java
View File

@@ -68,7 +68,7 @@ public abstract class Player extends GameEntity {
*/
public Player(String myName, int myLife, int myPoisonCounters) {
for (Zone z : ALL_ZONES) {
PlayerZone toPut = z == Zone.Battlefield ? new PlayerZone_ComesIntoPlay(z, this) : new DefaultPlayerZone(z, this);
PlayerZone toPut = z == Zone.Battlefield ? new PlayerZoneComesIntoPlay(z, this) : new DefaultPlayerZone(z, this);
zones.put(z, toPut);
}

31
src/main/java/forge/PlayerZone_ComesIntoPlay.java → src/main/java/forge/PlayerZoneComesIntoPlay.java
View File

@@ -14,7 +14,7 @@ import forge.card.spellability.SpellAbility;
* @author Forge
* @version $Id$
*/
public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
/** Constant <code>serialVersionUID=5750837078903423978L</code>. */
private static final long serialVersionUID = 5750837078903423978L;
@@ -27,7 +27,7 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
* @param zone a {@link java.lang.String} object.
* @param player a {@link forge.Player} object.
*/
public PlayerZone_ComesIntoPlay(final Constant.Zone zone, final Player player) {
public PlayerZoneComesIntoPlay(final Constant.Zone zone, final Player player) {
super(zone, player);
}
@@ -99,7 +99,9 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
list = list.filter(new CardListFilter() {
public boolean addCard(final Card c) {
return c.hasKeyword("Landfall")
|| c.hasKeyword("Landfall - Whenever a land enters the battlefield under your control, CARDNAME gets +2/+2 until end of turn.");
|| c.hasKeyword(
"Landfall - Whenever a land enters the battlefield under your control, "
+ "CARDNAME gets +2/+2 until end of turn.");
}
});
@@ -110,12 +112,12 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
// Check for a mountain
if (!listValakut.isEmpty() && c.isType("Mountain") ) {
for (int i = 0; i < listValakut.size(); i++) {
boolean b = GameActionUtil.executeValakutEffect(listValakut.get(i),c);
if (!b) {
// Not enough mountains to activate Valakut -- stop the loop
break;
}
}
boolean b = GameActionUtil.executeValakutEffect(listValakut.get(i),c);
if (!b) {
// Not enough mountains to activate Valakut -- stop the loop
break;
}
}
}*/
//Tectonic Instability
@@ -315,21 +317,20 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
leavesTrigger = b;
}
@Override
public Card[] getCards(boolean filter) {
public final Card[] getCards(final boolean filter) {
// Battlefield filters out Phased Out cards by default. Needs to call getCards(false) to get Phased Out cards
Card[] c;
if (!filter){
if (!filter) {
c = new Card[cards.size()];
cards.toArray(c);
}
else{
else {
Iterator<Card> itr = cards.iterator();
ArrayList<Card> list = new ArrayList<Card>();
while(itr.hasNext()){
while (itr.hasNext()) {
Card crd = itr.next();
if (!crd.isPhasedOut()){
if (!crd.isPhasedOut()) {
list.add(crd);
}
}