forked from External/mage
* Fixed a problem with "put into the graveyard from anywhere triggers" that checked wrongly the state of the source object on the battlefield if went to graveyard itself.
This commit is contained in:
LevelX2
parent
d40afd9ef5
commit
eb0ae55257
16 changed files with 229 additions and 128 deletions
|
|
@ -1,36 +1,34 @@
|
|||
/*
|
||||
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification, are
|
||||
* permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
* conditions and the following disclaimer.
|
||||
*
|
||||
* 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
|
||||
* provided with the distribution.
|
||||
*
|
||||
* 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
|
||||
* 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
|
||||
* 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
|
||||
* 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
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* 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
|
||||
* or implied, of BetaSteward_at_googlemail.com.
|
||||
*/
|
||||
|
||||
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification, are
|
||||
* permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
* conditions and the following disclaimer.
|
||||
*
|
||||
* 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
|
||||
* provided with the distribution.
|
||||
*
|
||||
* 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
|
||||
* 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
|
||||
* 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
|
||||
* 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
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* 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
|
||||
* or implied, of BetaSteward_at_googlemail.com.
|
||||
*/
|
||||
package mage.counters;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import java.io.Serializable;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
/**
|
||||
* @author BetaSteward_at_googlemail.com
|
||||
|
|
@ -42,9 +40,9 @@ public class Counter implements Serializable {
|
|||
protected final String name;
|
||||
protected int count;
|
||||
|
||||
|
||||
/**
|
||||
* Creates a {@link Counter} with the provided {@code name} and a default value of 1
|
||||
* Creates a {@link Counter} with the provided {@code name} and a default
|
||||
* value of 1
|
||||
*
|
||||
* @param name the name of this counter.
|
||||
*/
|
||||
|
|
@ -53,11 +51,11 @@ public class Counter implements Serializable {
|
|||
this.count = 1;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates a {@link Counter} with the provided {@code name} and {@code count}
|
||||
* Creates a {@link Counter} with the provided {@code name} and
|
||||
* {@code count}
|
||||
*
|
||||
* @param name the name of this counter.
|
||||
* @param name the name of this counter.
|
||||
* @param count the value of this counter.
|
||||
*/
|
||||
public Counter(final String name, final int count) {
|
||||
|
|
@ -65,7 +63,6 @@ public class Counter implements Serializable {
|
|||
this.count = count;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates a {@link Counter} from an existing {@link Counter} object.
|
||||
*
|
||||
|
|
@ -92,36 +89,37 @@ public class Counter implements Serializable {
|
|||
count += amount;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Decreases the {@code count} by one. Will not allow the count to be less than 0.
|
||||
* If an attempt is made to make the count be less than zero, the call will be logged.
|
||||
* Decreases the {@code count} by one. Will not allow the count to be less
|
||||
* than 0. If an attempt is made to make the count be less than zero, the
|
||||
* call will be logged.
|
||||
*/
|
||||
public void decrease() {
|
||||
if (count > 0) {
|
||||
count--;
|
||||
} else {
|
||||
logger.warn("An attempt was made to set the counter '" + name +
|
||||
"' to less than 0. Setting to 0.");
|
||||
logger.warn("An attempt was made to set the counter '" + name
|
||||
+ "' to less than 0. Setting to 0.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Decreases the {@code count} by tne passed in {@code amount}. Will not allow the count
|
||||
* to be less than 0. If an attempt is made to make the count be less than zero, the call will be logged.
|
||||
* Decreases the {@code count} by the passed in {@code amount}. Will not
|
||||
* allow the count to be less than 0. If an attempt is made to make the
|
||||
* count be less than zero, the call will be logged.
|
||||
*
|
||||
* @param amount
|
||||
*/
|
||||
public void remove(int amount) {
|
||||
if (count >= amount) {
|
||||
count -= amount;
|
||||
} else {
|
||||
logger.warn("An attempt was made to set the counter '" + name +
|
||||
"' to less than 0. Setting to 0.");
|
||||
logger.warn("An attempt was made to set the counter '" + name
|
||||
+ "' to less than 0. Setting to 0.");
|
||||
count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the name of this {@link Counter}
|
||||
*
|
||||
|
|
@ -149,20 +147,24 @@ public class Counter implements Serializable {
|
|||
return new Counter(this);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Counter counter = (Counter) o;
|
||||
|
||||
if (count != counter.count) return false;
|
||||
if (count != counter.count) {
|
||||
return false;
|
||||
}
|
||||
return !(name != null ? !name.equals(counter.name) : counter.name != null);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = name != null ? name.hashCode() : 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue