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

Since now use effect.setValue(key, object) instead of gameState.setValue(key, object).

Browse source
This commit is contained in:
magenoxx 2011-08-19 08:55:27 +04:00
parent 2c861461aa
commit 0267e963e9
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/effects/Effect.java
View file

@ -51,6 +51,8 @@ public interface Effect<T extends Effect<T>> extends Serializable {
public EffectType getEffectType();
public void setTargetPointer(TargetPointer targetPointer);
public TargetPointer getTargetPointer();
public void setValue(String key, Object value);
public Object getValue(String key);
public T copy();

30
Mage/src/mage/abilities/effects/EffectImpl.java
View file

@ -28,6 +28,8 @@
package mage.abilities.effects;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import mage.Constants.EffectType;
import mage.Constants.Outcome;
@ -46,6 +48,7 @@ public abstract class EffectImpl<T extends Effect<T>> implements Effect<T> {
protected EffectType effectType;
protected TargetPointer targetPointer = FirstTargetPointer.getInstance();
protected String staticText = "";
protected Map<String, Object> values;
public EffectImpl(Outcome outcome) {
this.id = UUID.randomUUID();
@ -58,6 +61,13 @@ public abstract class EffectImpl<T extends Effect<T>> implements Effect<T> {
this.effectType = effect.effectType;
this.staticText = effect.staticText;
this.targetPointer = effect.targetPointer.copy();
if (effect.values != null) {
values = new HashMap<String, Object>();
Map<String, Object> map = effect.values;
for (Map.Entry<String, Object> entry : map.entrySet()) {
values.put(entry.getKey(), entry.getValue());
}
}
}
@Override
@ -107,4 +117,24 @@ public abstract class EffectImpl<T extends Effect<T>> implements Effect<T> {
public void newId() {
this.id = UUID.randomUUID();
}
@Override
public void setValue(String key, Object value) {
if (values == null) {
synchronized (this) {
if (values == null) {
values = new HashMap<String, Object>();
}
}
}
values.put(key, value);
}
@Override
public Object getValue(String key) {
if (values == null) { // no value was set
return null;
}
return values.get(key);
}
}