External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 03:39:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed compile for me, revert pls if I do something wrong

Browse source
This commit is contained in:
Loki 2010-10-06 10:31:53 +00:00
parent ee0fb21ae4
commit 017e02aedc
3 changed files with 158 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/nbproject/project.properties
View file

@ -1,3 +1,6 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.run.all.processors=true
application.title=Mage application.title=Mage
application.vendor=BetaSteward_at_googlemail.com application.vendor=BetaSteward_at_googlemail.com
build.classes.dir=${build.dir}/classes build.classes.dir=${build.dir}/classes
@ -20,6 +23,7 @@ debug.test.classpath=\
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/Mage.jar dist.jar=${dist.dir}/Mage.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes= excludes=
includes=** includes=**
jar.compress=false jar.compress=false
@ -27,6 +31,8 @@ javac.classpath=
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.deprecation=false javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.6 javac.source=1.6
javac.target=1.6 javac.target=1.6
javac.test.classpath=\ javac.test.classpath=\

1
Mage/nbproject/project.xml
View file

@ -4,7 +4,6 @@
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Mage</name> <name>Mage</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
</source-roots> </source-roots>

140
Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java
View file

@ -1,70 +1,70 @@
/* ///*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. // * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* // *
* Redistribution and use in source and binary forms, with or without modification, are // * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: // * permitted provided that the following conditions are met:
* // *
* 1. Redistributions of source code must retain the above copyright notice, this list of // * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. // * conditions and the following disclaimer.
* // *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list // * 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials // * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. // * provided with the distribution.
* // *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED // * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND // * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR // * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR // * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR // * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON // * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING // * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF // * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* // *
* The views and conclusions contained in the software and documentation are those of the // * The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed // * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. // * or implied, of BetaSteward_at_googlemail.com.
*/ // */
//
package mage.abilities.effects.common; //package mage.abilities.effects.common;
//
import mage.abilities.Ability; //import mage.abilities.Ability;
import mage.filter.FilterPermanent; //import mage.filter.FilterPermanent;
import mage.game.Game; //import mage.game.Game;
import mage.game.events.GameEvent; //import mage.game.events.GameEvent;
//
/** ///**
* // *
* @author BetaSteward_at_googlemail.com // * @author BetaSteward_at_googlemail.com
*/ // */
public class EntersBattlefieldTappedUnlessControlsEffect extends EntersBattlefieldTappedEffect { //public class EntersBattlefieldTappedUnlessControlsEffect extends EntersBattlefieldTappedEffect {
//
FilterPermanent filter; // FilterPermanent filter;
//
public EntersBattlefieldTappedUnlessControlsEffect(FilterPermanent filter) { // public EntersBattlefieldTappedUnlessControlsEffect(FilterPermanent filter) {
this.filter = filter; // this.filter = filter;
} // }
//
public EntersBattlefieldTappedUnlessControlsEffect(final EntersBattlefieldTappedUnlessControlsEffect effect) { // public EntersBattlefieldTappedUnlessControlsEffect(final EntersBattlefieldTappedUnlessControlsEffect effect) {
super(effect); // super(effect);
this.filter = effect.filter.copy(); // this.filter = effect.filter.copy();
} // }
//
@Override // @Override
public EntersBattlefieldTappedUnlessControlsEffect copy() { // public EntersBattlefieldTappedUnlessControlsEffect copy() {
return new EntersBattlefieldTappedUnlessControlsEffect(this); // return new EntersBattlefieldTappedUnlessControlsEffect(this);
} // }
//
@Override // @Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) { // public boolean replaceEvent(GameEvent event, Ability source, Game game) {
if (game.getBattlefield().countAll(filter, source.getControllerId()) == 0) // if (game.getBattlefield().countAll(filter, source.getControllerId()) == 0)
return apply(game, source); // return apply(game, source);
return false; // return false;
} // }
//
@Override // @Override
public String getText(Ability source) { // public String getText(Ability source) {
return super.getText(source) + " unless you control a " + filter.getMessage(); // return super.getText(source) + " unless you control a " + filter.getMessage();
} // }
//
} //}