From 5c3c0e2ea9f74fc07ba3446e95cdd2869b5599c1 Mon Sep 17 00:00:00 2001
From: csnv <ctt@csnv.es>
Date: Sun, 5 Jul 2015 20:35:59 +0200
Subject: Fixes skill blocks overiding larger blocks

---
 src/map/skill.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/map/skill.c b/src/map/skill.c
index c6233c31d..666af315a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -17905,6 +17905,9 @@ int skill_blockpc_start_(struct map_session_data *sd, uint16 skill_id, int tick)
 		}
 
 		if( i != cd->cursor ) {/* duplicate, update necessary */
+			// Don't do anything if there's already a tick longer than the incoming one
+			if (DIFF_TICK32(cd->entry[i]->started + cd->entry[i]->duration, now) > tick)
+				return 0;
 			cd->entry[i]->duration = tick;
 #if PACKETVER >= 20120604
 			cd->entry[i]->total = tick;
-- 
cgit v1.2.3-60-g2f50