Merge remote-tracking branch 'upstream/master' into patch1

39148f55 · salix5 · 57bdb864 · faf8c94c · 39148f55
Commit 39148f55 authored Dec 09, 2014 by salix5
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ocgcore/processor.cpp ocgcore/processor.cpp +1 -1

No files found.
--- a/ocgcore/processor.cpp
+++ b/ocgcore/processor.cpp
@@ -2322,7 +2322,7 @@ int32 field::process_instant_event() {
 				}
 			}
 		}
-		if(elit->event_code == EVENT_ADJUST || ((elit->event_code & 0xf000) == EVENT_PHASE_START))
+		if(elit->event_code == EVENT_ADJUST || (((elit->event_code & 0xf000) == EVENT_PHASE_START) && (elit->event_code & 0xff) != PHASE_BATTLE))
 			continue;
 		//triggers
 		pr = effects.trigger_f_effect.equal_range(elit->event_code);