github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/magefree/mage.git

Browse source
This commit is contained in:
LevelX2 2013-02-25 18:32:30 +01:00
commit d925dda0f8
22 changed files with 63 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/release/startClient.bat
View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files\Java\jre6"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH% set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR :NOJAVADIR
start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled

2
Mage.Client/release/startClient.command
View file

@ -2,4 +2,4 @@
cd "`dirname "$0"`" cd "`dirname "$0"`"
java -jar ./lib/mage-client-${project.version}.jar -Xms256M -Xmx1024M & java -jar ./lib/mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled &

2
Mage.Client/release/startClient.sh
View file

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
java -jar ./lib/mage-client-${project.version}.jar -Xms256M -Xmx1024M & java -jar ./lib/mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled &

2
Mage.Client/release/startClientWin7.bat
View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre6\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH% set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR :NOJAVADIR
start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled

2
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -318,7 +318,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
@Override @Override
public void run() { public void run() {
disableButtons(); disableButtons();
if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_CHECK, "true").equals("true")) { if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_CHECK, "false").equals("true")) {
checkForNewImages(); checkForNewImages();
} }
logger.info("Client start up time: " + ((System.currentTimeMillis() - startTime) / 1000 + " seconds")); logger.info("Client start up time: " + ((System.currentTimeMillis() - startTime) / 1000 + " seconds"));

2
Mage.Server/release/startServer.bat
View file

@ -1,3 +1,3 @@
@ECHO OFF @ECHO OFF
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m
pause pause

2
Mage.Server/release/startServer.command
View file

@ -2,4 +2,4 @@
cd "`dirname "$0"`" cd "`dirname "$0"`"
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m

2
Mage.Server/release/startServer.sh
View file

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m

2
Mage.Server/release/startServerWin7.bat
View file

@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre6\"
set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH% set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
set PATH=%JAVA_HOME%/bin;%PATH% set PATH=%JAVA_HOME%/bin;%PATH%
:NOJAVADIR :NOJAVADIR
java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m

8
Mage.Sets/src/mage/sets/futuresight/Narcomoeba.java
View file

@ -27,8 +27,6 @@
*/ */
package mage.sets.futuresight; package mage.sets.futuresight;
import com.sun.corba.se.impl.orbutil.closure.Constant;
import java.util.UUID;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Rarity; import mage.Constants.Rarity;
@ -37,10 +35,8 @@ import mage.abilities.common.ZoneChangeTriggeredAbility;
import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.counters.CounterType;
import mage.game.Game; import java.util.UUID;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/** /**
* *

11
Mage.Sets/src/mage/sets/gatecrash/AureliasFury.java
View file

@ -27,9 +27,6 @@
*/ */
package mage.sets.gatecrash; package mage.sets.gatecrash;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Outcome; import mage.Constants.Outcome;
@ -55,6 +52,10 @@ import mage.target.common.TargetCreatureOrPlayerAmount;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* GATECRASH FAQ 11.01.2013 * GATECRASH FAQ 11.01.2013
* *
@ -198,8 +199,8 @@ class AureliasFuryDamagedByWatcher extends WatcherImpl<AureliasFuryDamagedByWatc
public AureliasFuryDamagedByWatcher(final AureliasFuryDamagedByWatcher watcher) { public AureliasFuryDamagedByWatcher(final AureliasFuryDamagedByWatcher watcher) {
super(watcher); super(watcher);
this.damagedCreatures = watcher.damagedCreatures; this.damagedCreatures.addAll(watcher.damagedCreatures);
this.damagedPlayers = watcher.damagedPlayers; this.damagedPlayers.addAll(watcher.damagedPlayers);
} }
@Override @Override

9
Mage.Sets/src/mage/sets/iceage/TinderWall.java
View file

@ -27,9 +27,6 @@
*/ */
package mage.sets.iceage; package mage.sets.iceage;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Rarity; import mage.Constants.Rarity;
@ -52,6 +49,10 @@ import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* *
* @author Plopman * @author Plopman
@ -105,7 +106,7 @@ class BlockedByWatcher extends WatcherImpl<BlockedByWatcher> {
public BlockedByWatcher(final BlockedByWatcher watcher) { public BlockedByWatcher(final BlockedByWatcher watcher) {
super(watcher); super(watcher);
this.blockedByWatcher = watcher.blockedByWatcher; this.blockedByWatcher.addAll(watcher.blockedByWatcher);
} }
@Override @Override

2
Mage.Sets/src/mage/sets/magic2013/FaithsReward.java
View file

@ -110,7 +110,7 @@ class FaithsRewardWatcher extends WatcherImpl<FaithsRewardWatcher> {
public FaithsRewardWatcher(final FaithsRewardWatcher watcher) { public FaithsRewardWatcher(final FaithsRewardWatcher watcher) {
super(watcher); super(watcher);
this.cards = (ArrayList<UUID>) watcher.cards.clone(); this.cards.addAll(watcher.cards);
} }
@Override @Override

15
Mage.Sets/src/mage/sets/newphyrexia/CathedralMembrane.java
View file

@ -27,15 +27,8 @@
*/ */
package mage.sets.newphyrexia; package mage.sets.newphyrexia;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.*;
import mage.Constants.Rarity;
import mage.Constants.TurnPhase;
import mage.Constants.WatcherScope;
import mage.Constants.Zone;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.common.ZoneChangeTriggeredAbility;
@ -47,6 +40,10 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* *
* @author BetaSteward * @author BetaSteward
@ -149,7 +146,7 @@ class CathedralMembraneWatcher extends WatcherImpl<CathedralMembraneWatcher> {
public CathedralMembraneWatcher(final CathedralMembraneWatcher watcher) { public CathedralMembraneWatcher(final CathedralMembraneWatcher watcher) {
super(watcher); super(watcher);
this.blockedCreatures = watcher.blockedCreatures; this.blockedCreatures.addAll(watcher.blockedCreatures);
} }
@Override @Override

12
Mage.Sets/src/mage/sets/scarsofmirrodin/SteelHellkite.java
View file

@ -30,6 +30,7 @@ package mage.sets.scarsofmirrodin;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.WatcherScope;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.ActivateOncePerTurnActivatedAbility; import mage.abilities.common.ActivateOncePerTurnActivatedAbility;
@ -40,15 +41,16 @@ import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.BoostSourceEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.filter.common.FilterNonlandPermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.events.DamagedPlayerEvent; import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.*; import java.util.ArrayList;
import mage.Constants.WatcherScope; import java.util.List;
import mage.filter.common.FilterNonlandPermanent; import java.util.UUID;
/** /**
* @author nantuko * @author nantuko
@ -125,9 +127,7 @@ class SteelHellkiteWatcher extends WatcherImpl<SteelHellkiteWatcher> {
public SteelHellkiteWatcher(final SteelHellkiteWatcher watcher) { public SteelHellkiteWatcher(final SteelHellkiteWatcher watcher) {
super(watcher); super(watcher);
for (UUID playerId: watcher.damagedPlayers) { damagedPlayers.addAll(watcher.damagedPlayers);
damagedPlayers.add(playerId);
}
} }
@Override @Override

10
Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java
View file

@ -27,13 +27,8 @@
*/ */
package mage.sets.zendikar; package mage.sets.zendikar;
import java.util.UUID;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.*;
import mage.Constants.Duration;
import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.Constants.WatcherScope;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
@ -50,6 +45,8 @@ import mage.players.Player;
import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInLibrary;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.UUID;
/** /**
* *
* @author jeffwadsworth * @author jeffwadsworth
@ -122,6 +119,7 @@ class CardsDrawnControllerWatcher extends WatcherImpl<CardsDrawnControllerWatche
public CardsDrawnControllerWatcher(final CardsDrawnControllerWatcher watcher) { public CardsDrawnControllerWatcher(final CardsDrawnControllerWatcher watcher) {
super(watcher); super(watcher);
this.cardsDrawn = watcher.cardsDrawn;
} }
@Override @Override

9
Mage.Sets/src/mage/sets/zendikar/Gomazoa.java
View file

@ -27,9 +27,6 @@
*/ */
package mage.sets.zendikar; package mage.sets.zendikar;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants; import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Outcome; import mage.Constants.Outcome;
@ -49,6 +46,10 @@ import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* *
* @author jeffwadsworth * @author jeffwadsworth
@ -142,7 +143,7 @@ class BlockedByWatcher extends WatcherImpl<BlockedByWatcher> {
public BlockedByWatcher(final BlockedByWatcher watcher) { public BlockedByWatcher(final BlockedByWatcher watcher) {
super(watcher); super(watcher);
this.blockedByWatcher = watcher.blockedByWatcher; this.blockedByWatcher.addAll(watcher.blockedByWatcher);
} }
@Override @Override

4
Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java
View file

@ -27,7 +27,6 @@
*/ */
package mage.sets.zendikar; package mage.sets.zendikar;
import java.util.UUID;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.WatcherScope; import mage.Constants.WatcherScope;
@ -43,6 +42,8 @@ import mage.players.Player;
import mage.target.TargetPlayer; import mage.target.TargetPlayer;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.UUID;
/** /**
* *
* @author jeffwadsworth * @author jeffwadsworth
@ -114,6 +115,7 @@ class CardsDrawnOpponentWatcher extends WatcherImpl<CardsDrawnOpponentWatcher> {
public CardsDrawnOpponentWatcher(final CardsDrawnOpponentWatcher watcher) { public CardsDrawnOpponentWatcher(final CardsDrawnOpponentWatcher watcher) {
super(watcher); super(watcher);
this.cardsDrawn = watcher.cardsDrawn;
} }
@Override @Override

2
Mage/src/mage/watchers/common/AttackedThisTurnWatcher.java
View file

@ -49,7 +49,7 @@ public class AttackedThisTurnWatcher extends WatcherImpl<AttackedThisTurnWatcher
public AttackedThisTurnWatcher(final AttackedThisTurnWatcher watcher) { public AttackedThisTurnWatcher(final AttackedThisTurnWatcher watcher) {
super(watcher); super(watcher);
this.attackedThisTurnCreatures = watcher.attackedThisTurnCreatures; this.attackedThisTurnCreatures.addAll(watcher.attackedThisTurnCreatures);
} }
@Override @Override

9
Mage/src/mage/watchers/common/DamagedByWatcher.java
View file

@ -27,15 +27,16 @@
*/ */
package mage.watchers.common; package mage.watchers.common;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants.WatcherScope; import mage.Constants.WatcherScope;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
@ -50,7 +51,7 @@ public class DamagedByWatcher extends WatcherImpl<DamagedByWatcher> {
public DamagedByWatcher(final DamagedByWatcher watcher) { public DamagedByWatcher(final DamagedByWatcher watcher) {
super(watcher); super(watcher);
this.damagedCreatures = watcher.damagedCreatures; this.damagedCreatures.addAll(watcher.damagedCreatures);
} }
@Override @Override

9
Mage/src/mage/watchers/common/PlayerDamagedBySourceWatcher.java
View file

@ -27,15 +27,16 @@
*/ */
package mage.watchers.common; package mage.watchers.common;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants.WatcherScope; import mage.Constants.WatcherScope;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* Watcher stores whitch sources did damage to a player * Watcher stores whitch sources did damage to a player
* *
@ -52,7 +53,7 @@ public class PlayerDamagedBySourceWatcher extends WatcherImpl<PlayerDamagedBySou
public PlayerDamagedBySourceWatcher(final PlayerDamagedBySourceWatcher watcher) { public PlayerDamagedBySourceWatcher(final PlayerDamagedBySourceWatcher watcher) {
super(watcher); super(watcher);
this.damageSources = watcher.damageSources; this.damageSources.addAll(watcher.damageSources);
} }
@Override @Override

9
Mage/src/mage/watchers/common/SourceDidDamageWatcher.java
View file

@ -27,15 +27,16 @@
*/ */
package mage.watchers.common; package mage.watchers.common;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants.WatcherScope; import mage.Constants.WatcherScope;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
import mage.watchers.WatcherImpl; import mage.watchers.WatcherImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* Watcher stores which sources did damage to anything. * Watcher stores which sources did damage to anything.
* *
@ -51,7 +52,7 @@ public class SourceDidDamageWatcher extends WatcherImpl<SourceDidDamageWatcher>
public SourceDidDamageWatcher(final SourceDidDamageWatcher watcher) { public SourceDidDamageWatcher(final SourceDidDamageWatcher watcher) {
super(watcher); super(watcher);
this.damageSources = watcher.damageSources; this.damageSources.addAll(watcher.damageSources);
} }
@Override @Override