From d315e359f16d7e5279c7b9b80bb05efc87367ad9 Mon Sep 17 00:00:00 2001
From: Light2 <light_pswg@yahoo.com>
Date: Mon, 9 Jun 2014 19:28:47 +0200
Subject: [PATCH] fixed? #841

---
 src/services/BuffService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/BuffService.java b/src/services/BuffService.java
index 8d2d4038..d8c95147 100644
--- a/src/services/BuffService.java
+++ b/src/services/BuffService.java
@@ -274,7 +274,7 @@ public class BuffService implements INetworkDispatch {
 
 		for(final Buff buff : creature.getBuffList().get().toArray(new Buff[] { })) {
 
-			if (buff.getGroup1().startsWith("setBonus")) { continue; }
+			if (buff.getGroup1().startsWith("setBonus") || buff.getRemovalTask() != null) { continue; }
 
 			if(buff.isGroupBuff() && buff.getGroupBufferId() != creature.getObjectID()) {
 				removeBuffFromCreature(creature, buff);