revert

effect.h

@@ -381,6 +381,7 @@ public:
 #define EFFECT_ADD_SETCODE				334
 #define EFFECT_NO_EFFECT_DAMAGE			335
 #define EFFECT_UNSUMMONABLE_CARD		336
+#define EFFECT_DISABLE_CHAIN_FIELD		337
 
 #define EVENT_STARTUP		1000
 #define EVENT_FLIP			1001

libduel.cpp

@@ -1256,6 +1256,7 @@ int32 scriptlib::duel_negate_effect(lua_State *L) {
 	lua_pushboolean(L, pduel->game_field->disable_chain(c));
 	return 1;
 }
+// negate the effects activated on field
 int32 scriptlib::duel_negate_related_chain(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);
@@ -1269,7 +1270,7 @@ int32 scriptlib::duel_negate_related_chain(lua_State *L) {
 	effect* negeff = pduel->new_effect();
 	negeff->owner = pduel->game_field->core.reason_effect->handler;
 	negeff->type = EFFECT_TYPE_SINGLE;
-	negeff->code = EFFECT_DISABLE_CHAIN;
+	negeff->code = EFFECT_DISABLE_CHAIN_FIELD;
 	negeff->reset_flag = RESET_CHAIN | RESET_EVENT | reset_flag;
 	pcard->add_effect(negeff);
 	return 0;

processor.cpp

@@ -4564,7 +4564,8 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
 		card* pcard = cait->triggering_effect->handler;
 		if(is_chain_disablable(cait->chain_count)) {
 			if((cait->flag & CHAIN_DISABLE_EFFECT) || pcard->is_affected_by_effect(EFFECT_DISABLE_CHAIN)
-			        || (pcard->is_status(STATUS_DISABLED) && pcard->is_has_relation(cait->triggering_effect))) {
+					|| ((cait->triggering_location & LOCATION_ONFIELD) && pcard->is_affected_by_effect(EFFECT_DISABLE_CHAIN_FIELD))
+					|| (pcard->is_status(STATUS_DISABLED) && pcard->is_has_relation(cait->triggering_effect))) {
 				if(!(cait->flag & CHAIN_DISABLE_EFFECT)) {
 					pduel->write_buffer8(MSG_CHAIN_DISABLED);
 					pduel->write_buffer8(cait->chain_count);