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

oubliette difference is blocking me from pulls from origin2

Browse source
This commit is contained in:
MarcoMarin 2016-04-11 17:26:32 -03:00
parent 318c18fb34
commit 7149ecd2dd
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -222,11 +222,7 @@ 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
if(c!=null) newPermanent.getCounters(game).addCounter(c);
}
}