field::process_quick_effect()

2d839c23 · salix5 · 222ddb3a · 2d839c23
Commit 2d839c23 authored Mar 01, 2016 by salix5
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

processor.cpp processor.cpp +2 -3

No files found.
--- a/processor.cpp
+++ b/processor.cpp
@@ -2069,12 +2069,11 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
 						if(cait->triggering_player == priority) {
 							effect* pchaineff = cait->triggering_effect;
 							if(!(pchaineff->is_flag(EFFECT_FLAG_FIELD_ONLY)) && (pchaineff->type & EFFECT_TYPE_TRIGGER_O)
-							        && (!(pchaineff->type & EFFECT_TYPE_SINGLE) || (pchaineff->is_flag(EFFECT_FLAG_SINGLE_RANGE)))
+							        && cait->triggering_location == LOCATION_HAND && (pchaineff->range & LOCATION_HAND)) {
-							        && (pchaineff->range & LOCATION_HAND)) {
 								act = false;
 								break;
 							}
-							if(cait->triggering_effect->handler->data.code == peffect->handler->data.code) {
+							if(peffect->is_flag(EFFECT_FLAG_CHAIN_UNIQUE) && cait->triggering_effect->handler->data.code == peffect->handler->data.code) {
 								act = false;
 								break;
 							}