Erwan
- Fixed a bug with control magic (see tests/control_magic2.txt)
This commit is contained in:
@@ -1131,8 +1131,9 @@ class ATakeControlAura:public MTGAbility{
|
||||
|
||||
int destroy(){
|
||||
MTGCardInstance * _target = (MTGCardInstance *) target;
|
||||
if (_target->controller()->game->inPlay->hasCard(_target)){
|
||||
_target->controller()->game->putInZone(_target, _target->controller()->game->inPlay, previousController->game->inPlay);
|
||||
Player * p = _target->controller();
|
||||
if (p && p->game->inPlay->hasCard(_target)){
|
||||
p->game->putInZone(_target, p->game->inPlay, previousController->game->inPlay);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -40,8 +40,6 @@ template <typename T, size_t N>
|
||||
|
||||
int lowercase(string source);
|
||||
|
||||
int substr_copy(char *source, char *target, int start, int len);
|
||||
int append_str(char * s1, char * s2, char * target);
|
||||
int filesize(const char * filename);
|
||||
int read_file (const char * filename, char * buffer, int filesize);
|
||||
int readline (char * in_buffer, char * out_buffer, int cursor);
|
||||
|
||||
Reference in New Issue
Block a user