Commit fec64124 authored by VanillaSalt's avatar VanillaSalt

fix

parent aec37fd4
...@@ -1391,7 +1391,7 @@ void field::adjust_disable_check_list() { ...@@ -1391,7 +1391,7 @@ void field::adjust_disable_check_list() {
} while(effects.disable_check_list.size()); } while(effects.disable_check_list.size());
} }
void field::adjust_self_destroy_set() { void field::adjust_self_destroy_set() {
if(core.selfdes_disabled) if(core.selfdes_disabled || !core.self_destroy_set.empty() || !core.self_tograve_set.empty())
return; return;
card_set cset; card_set cset;
for(uint8 p = 0; p < 2; ++p) { for(uint8 p = 0; p < 2; ++p) {
......
...@@ -1038,6 +1038,7 @@ int32 field::self_destroy(uint16 step) { ...@@ -1038,6 +1038,7 @@ int32 field::self_destroy(uint16 step) {
return FALSE; return FALSE;
} }
case 1: { case 1: {
core.self_destroy_set.clear();
if(!(core.global_flag & GLOBALFLAG_SELF_TOGRAVE)) if(!(core.global_flag & GLOBALFLAG_SELF_TOGRAVE))
return TRUE; return TRUE;
core.units.begin()->arg1 = returns.ivalue[0]; core.units.begin()->arg1 = returns.ivalue[0];
...@@ -1048,6 +1049,7 @@ int32 field::self_destroy(uint16 step) { ...@@ -1048,6 +1049,7 @@ int32 field::self_destroy(uint16 step) {
return FALSE; return FALSE;
} }
case 2: { case 2: {
core.self_tograve_set.clear();
returns.ivalue[0] += core.units.begin()->arg1; returns.ivalue[0] += core.units.begin()->arg1;
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment