Merge branch 'fh'

47af86f6 · nanahira · 7e0dad11 · 35888392 · 47af86f6
Commit 47af86f6 authored Jul 11, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

libeffect.cpp libeffect.cpp +1 -1

No files found.
--- a/libeffect.cpp
+++ b/libeffect.cpp
@@ -76,7 +76,7 @@ int32 scriptlib::effect_reset(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_EFFECT, 1);
 	effect* peffect = *(effect**) lua_touserdata(L, 1);
-	if(peffect->owner == 0)
+	if(peffect->owner == 0 || peffect->handler == 0)
 		return 0;
 	if(peffect->is_flag(EFFECT_FLAG_FIELD_ONLY))
 		peffect->pduel->game_field->remove_effect(peffect);