BETA: Fixed an issue where Herbs/Potions (with instant effects) were not working when you are with full-buffs (Reported by: Tavo22). Also now the Herbs/Potions (with continuous effects) will remove the first-buff when you are with full-buffs (Confirmed by: Tans, Valdaron).

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CharEffectList.java

@@ -886,13 +886,6 @@ public class CharEffectList
 				}
 			}
 			
-			// if max buffs, no herb effects are used, even if they would replace one old
-			if (newEffect.isHerbEffect() && (getBuffCount() >= _owner.getMaxBuffCount()))
-			{
-				newEffect.stopEffectTask();
-				return;
-			}
-			
 			// Remove first buff when buff list is full
 			if (!doesStack(newSkill) && !newSkill.is7Signs())
 			{
@@ -1091,7 +1084,7 @@ public class CharEffectList
 				// skill.exit() could be used, if the users don't wish to see "effect
 				// removed" always when a timer goes off, even if the buff isn't active
 				// any more (has been replaced). but then check e.g. npc hold and raid petrification.
-				if (Config.EFFECT_CANCELING && !newEffect.isHerbEffect() && (stackQueue.size() > 1))
+				if (Config.EFFECT_CANCELING && (stackQueue.size() > 1))
 				{
 					if (newSkill.isDebuff())
 					{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -8416,7 +8416,7 @@ public final class L2PcInstance extends L2Playable
 					
 					storedSkills.add(skill.getReuseHashCode());
 					
-					if (!effect.isHerbEffect() && effect.getInUse() && !skill.isToggle())
+					if (effect.getInUse() && !skill.isToggle())
 					{
 						
 						statement.setInt(1, getObjectId());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -1095,7 +1095,7 @@ public class L2PetInstance extends L2Summon
 					
 					storedSkills.add(skill.getReuseHashCode());
 					
-					if (!effect.isHerbEffect() && effect.getInUse() && !skill.isToggle())
+					if (effect.getInUse() && !skill.isToggle())
 					{
 						ps2.setInt(1, getControlObjectId());
 						ps2.setInt(2, skill.getId());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java

@@ -393,7 +393,7 @@ public class L2ServitorInstance extends L2Summon
 						
 						storedSkills.add(skill.getReuseHashCode());
 						
-						if (!effect.isHerbEffect() && effect.getInUse() && !skill.isToggle())
+						if (effect.getInUse() && !skill.isToggle())
 						{
 							ps2.setInt(1, getOwner().getObjectId());
 							ps2.setInt(2, getOwner().getClassIndex());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/L2Effect.java

@@ -65,11 +65,6 @@ public abstract class L2Effect implements IChanceSkillTrigger
 	// the skill that was used.
 	private final L2Skill _skill;
 	
-	private final boolean _isHerbEffect;
-	
-	// or the items that was used.
-	// private final L2Item _item;
-	
 	// the value of an update
 	private final Lambda _lambda;
 	
@@ -188,8 +183,6 @@ public abstract class L2Effect implements IChanceSkillTrigger
 		_effectPower = template.effectPower;
 		_effectSkillType = template.effectType;
 		
-		_isHerbEffect = _skill.getName().contains("Herb");
-		
 		/*
 		 * Commented out by DrHouse: scheduleEffect can call onStart before effect is completly initialized on constructor (child classes constructor)
 		 */
@@ -225,8 +218,6 @@ public abstract class L2Effect implements IChanceSkillTrigger
 		_periodFirstTime = effect.getTime();
 		_icon = _template.icon;
 		
-		_isHerbEffect = _skill.getName().contains("Herb");
-		
 		/*
 		 * Commented out by DrHouse: scheduleEffect can call onStart before effect is completly initialized on constructor (child classes constructor)
 		 */
@@ -347,11 +338,6 @@ public abstract class L2Effect implements IChanceSkillTrigger
 		_isPassiveEffect = true;
 	}
 	
-	public boolean isHerbEffect()
-	{
-		return _isHerbEffect;
-	}
-	
 	public final double calc()
 	{
 		Env env = new Env();