diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java
index 83b903b671..80204e749e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -535,20 +535,32 @@ public final class CharEffectList
 			{
 				case TRIGGER:
 				{
-					return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT);
+					if (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				case DANCE:
 				{
-					return (_danceCount.get() > Config.DANCES_MAX_AMOUNT);
+					if (_danceCount.get() > Config.DANCES_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				// case TOGGLE: Do toggles have limit?
 				case DEBUFF:
 				{
-					return (_debuffCount.get() > 24);
+					if (_debuffCount.get() > 24)
+					{
+						return true;
+					}
 				}
 				case BUFF:
 				{
-					return (getBuffCount() > _owner.getStat().getMaxBuffCount());
+					if (getBuffCount() > _owner.getStat().getMaxBuffCount())
+					{
+						return true;
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java
index 83b903b671..80204e749e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -535,20 +535,32 @@ public final class CharEffectList
 			{
 				case TRIGGER:
 				{
-					return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT);
+					if (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				case DANCE:
 				{
-					return (_danceCount.get() > Config.DANCES_MAX_AMOUNT);
+					if (_danceCount.get() > Config.DANCES_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				// case TOGGLE: Do toggles have limit?
 				case DEBUFF:
 				{
-					return (_debuffCount.get() > 24);
+					if (_debuffCount.get() > 24)
+					{
+						return true;
+					}
 				}
 				case BUFF:
 				{
-					return (getBuffCount() > _owner.getStat().getMaxBuffCount());
+					if (getBuffCount() > _owner.getStat().getMaxBuffCount())
+					{
+						return true;
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java
index 83b903b671..80204e749e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -535,20 +535,32 @@ public final class CharEffectList
 			{
 				case TRIGGER:
 				{
-					return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT);
+					if (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				case DANCE:
 				{
-					return (_danceCount.get() > Config.DANCES_MAX_AMOUNT);
+					if (_danceCount.get() > Config.DANCES_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				// case TOGGLE: Do toggles have limit?
 				case DEBUFF:
 				{
-					return (_debuffCount.get() > 24);
+					if (_debuffCount.get() > 24)
+					{
+						return true;
+					}
 				}
 				case BUFF:
 				{
-					return (getBuffCount() > _owner.getStat().getMaxBuffCount());
+					if (getBuffCount() > _owner.getStat().getMaxBuffCount())
+					{
+						return true;
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java
index 83b903b671..80204e749e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -535,20 +535,32 @@ public final class CharEffectList
 			{
 				case TRIGGER:
 				{
-					return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT);
+					if (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				case DANCE:
 				{
-					return (_danceCount.get() > Config.DANCES_MAX_AMOUNT);
+					if (_danceCount.get() > Config.DANCES_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				// case TOGGLE: Do toggles have limit?
 				case DEBUFF:
 				{
-					return (_debuffCount.get() > 24);
+					if (_debuffCount.get() > 24)
+					{
+						return true;
+					}
 				}
 				case BUFF:
 				{
-					return (getBuffCount() > _owner.getStat().getMaxBuffCount());
+					if (getBuffCount() > _owner.getStat().getMaxBuffCount())
+					{
+						return true;
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java
index 83b903b671..80204e749e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -535,20 +535,32 @@ public final class CharEffectList
 			{
 				case TRIGGER:
 				{
-					return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT);
+					if (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				case DANCE:
 				{
-					return (_danceCount.get() > Config.DANCES_MAX_AMOUNT);
+					if (_danceCount.get() > Config.DANCES_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				// case TOGGLE: Do toggles have limit?
 				case DEBUFF:
 				{
-					return (_debuffCount.get() > 24);
+					if (_debuffCount.get() > 24)
+					{
+						return true;
+					}
 				}
 				case BUFF:
 				{
-					return (getBuffCount() > _owner.getStat().getMaxBuffCount());
+					if (getBuffCount() > _owner.getStat().getMaxBuffCount())
+					{
+						return true;
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java
index 83b903b671..80204e749e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -535,20 +535,32 @@ public final class CharEffectList
 			{
 				case TRIGGER:
 				{
-					return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT);
+					if (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				case DANCE:
 				{
-					return (_danceCount.get() > Config.DANCES_MAX_AMOUNT);
+					if (_danceCount.get() > Config.DANCES_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				// case TOGGLE: Do toggles have limit?
 				case DEBUFF:
 				{
-					return (_debuffCount.get() > 24);
+					if (_debuffCount.get() > 24)
+					{
+						return true;
+					}
 				}
 				case BUFF:
 				{
-					return (getBuffCount() > _owner.getStat().getMaxBuffCount());
+					if (getBuffCount() > _owner.getStat().getMaxBuffCount())
+					{
+						return true;
+					}
 				}
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java
index 83b903b671..80204e749e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -535,20 +535,32 @@ public final class CharEffectList
 			{
 				case TRIGGER:
 				{
-					return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT);
+					if (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				case DANCE:
 				{
-					return (_danceCount.get() > Config.DANCES_MAX_AMOUNT);
+					if (_danceCount.get() > Config.DANCES_MAX_AMOUNT)
+					{
+						return true;
+					}
 				}
 				// case TOGGLE: Do toggles have limit?
 				case DEBUFF:
 				{
-					return (_debuffCount.get() > 24);
+					if (_debuffCount.get() > 24)
+					{
+						return true;
+					}
 				}
 				case BUFF:
 				{
-					return (getBuffCount() > _owner.getStat().getMaxBuffCount());
+					if (getBuffCount() > _owner.getStat().getMaxBuffCount())
+					{
+						return true;
+					}
 				}
 			}
 		}