Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

72d3f2ce · nanahira · c06fbb93 · 37faac25 · 72d3f2ce
Commit 72d3f2ce authored Nov 28, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

effect.cpp effect.cpp +2 -1

No files found.
--- a/effect.cpp
+++ b/effect.cpp
@@ -597,7 +597,8 @@ void effect::dec_count(uint32 playerid) {
 		return;
 	if(count_limit == 0)
 		return;
-	count_limit -= 1;
+	if(count_code == 0 || is_flag(EFFECT_FLAG_NO_TURN_RESET))
+		count_limit -= 1;
 	if(count_code) {
 		uint32 code = count_code & 0xfffffff;
 		if(code == 1)