Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

oubliette difference is blocking me from pulls from origin

Browse source
This commit is contained in:
MarcoMarin 2016-04-11 17:24:31 -03:00
commit 318c18fb34
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/arabiannights/Oubliette.java
View file

@ -222,7 +222,11 @@ class OublietteReturnEffect extends OneShotEffect {
}
if (oubliette == null) return false;//1st stab at getting those counters back
for(Counter c : ((Oubliette)oubliette).godHelpMe.values()){ //would be nice if could just use that copy function to set the whole field
<<<<<<< HEAD
if(c!=null) newPermanent.getCounters(game).addCounter(c);
=======
newPermanent.getCounters(game).addCounter(c);
>>>>>>> 013c506facb3e0cdc381116053e4fc7e90b17a42
}
}