External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 21:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Militant Angel - fixed rollback error on usage (#7239);

Browse source
This commit is contained in:
Oleg Agafonov 2020-12-19 04:48:55 +04:00
parent 3cccad2138
commit 1b830032ac
2 changed files with 87 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/main/java/mage/watchers/Watcher.java
View file

@ -1,12 +1,14 @@
package mage.watchers;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.PlayerList;
import org.apache.log4j.Logger;
import java.io.Serializable;
import java.lang.reflect.*;
import java.util.*;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import org.apache.log4j.Logger;
/**
* watches for certain game events to occur and flags condition
@ -123,6 +125,14 @@ public abstract class Watcher implements Serializable {
set.addAll(e.getValue());
target.put(e.getKey(), set);
}
} else if (valueType.getTypeName().contains("PlayerList")) {
Map<Object, PlayerList> source = (Map<Object, PlayerList>) field.get(this);
Map<Object, PlayerList> target = (Map<Object, PlayerList>) field.get(watcher);
target.clear();
for (Map.Entry<Object, PlayerList> e : source.entrySet()) {
PlayerList list = e.getValue().copy();
target.put(e.getKey(), list);
}
} else if (valueType.getTypeName().contains("List")) {
Map<Object, List<Object>> source = (Map<Object, List<Object>>) field.get(this);
Map<Object, List<Object>> target = (Map<Object, List<Object>>) field.get(watcher);
@ -141,14 +151,12 @@ public abstract class Watcher implements Serializable {
map.putAll(e.getValue());
target.put(e.getKey(), map);
}
} else {
((Map) field.get(watcher)).putAll((Map) field.get(this));
}
} else if (field.getType() == List.class) {
((List) field.get(watcher)).clear();
((List) field.get(watcher)).addAll((List) field.get(this));
} else {
field.set(watcher, field.get(this));
}