From 393e53514c36b0e2eaed3b27e2342ae6407dfe76 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 28 Jan 2020 15:26:44 +0000
Subject: [PATCH] Removed pointless EffectTickTask tick count variable.

---
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 18 +---------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 18 +---------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 .../admincommandhandlers/AdminBuffs.java      |  2 +-
 .../model/effects/EffectTickTask.java         | 14 +------------
 .../gameserver/model/skills/BuffInfo.java     | 21 +------------------
 51 files changed, 51 insertions(+), 572 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 13f0901e9d..fd8956fda5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -271,7 +271,7 @@ public class AdminBuffs implements IAdminCommandHandler
 					html.append(")");
 					html.append(!info.isInUse() ? FONT_RED2 : "");
 					html.append("</td><td>");
-					html.append(skill.isToggle() ? "T (" + info.getTickCount(effect) + ")" : skill.isPassive() ? "P" : info.getTime() + "s");
+					html.append(skill.isToggle() ? "T" : skill.isPassive() ? "P" : info.getTime() + "s");
 					html.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 					html.append(target.getObjectId());
 					html.append(" ");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 0b61a4b98c..1ff4ab56fd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -288,9 +288,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -445,21 +444,6 @@ public class BuffInfo
 		_effected.removeStatsOwner(_skill);
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-		if (effectTaskInfo != null)
-		{
-			return effectTaskInfo.getEffectTask().getTickCount();
-		}
-		return 0;
-	}
-	
 	@Override
 	public String toString()
 	{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 13f0901e9d..fd8956fda5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -271,7 +271,7 @@ public class AdminBuffs implements IAdminCommandHandler
 					html.append(")");
 					html.append(!info.isInUse() ? FONT_RED2 : "");
 					html.append("</td><td>");
-					html.append(skill.isToggle() ? "T (" + info.getTickCount(effect) + ")" : skill.isPassive() ? "P" : info.getTime() + "s");
+					html.append(skill.isToggle() ? "T" : skill.isPassive() ? "P" : info.getTime() + "s");
 					html.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 					html.append(target.getObjectId());
 					html.append(" ");
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 0b61a4b98c..1ff4ab56fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -288,9 +288,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -445,21 +444,6 @@ public class BuffInfo
 		_effected.removeStatsOwner(_skill);
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-		if (effectTaskInfo != null)
-		{
-			return effectTaskInfo.getEffectTask().getTickCount();
-		}
-		return 0;
-	}
-	
 	@Override
 	public String toString()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 29367048dd..afd515d4d7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 29367048dd..afd515d4d7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index c06da7f7c4..5ccf63ee1d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
 				sb.append(")");
 				sb.append(!info.isInUse() ? FONT_RED2 : "");
 				sb.append("</td><td>");
-				sb.append(info.getSkill().isToggle() ? "T (" + info.getTickCount(effect) + ")" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
+				sb.append(info.getSkill().isToggle() ? "T" : info.getSkill().isPassive() ? "P" : info.getTime() + "s");
 				sb.append("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
 				sb.append(target.getObjectId());
 				sb.append(" ");
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
index 32f4aeb89e..d277533835 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.effects;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.l2jmobius.gameserver.model.skills.BuffInfo;
 
 /**
@@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
 {
 	private final BuffInfo _info;
 	private final AbstractEffect _effect;
-	private final AtomicInteger _tickCount = new AtomicInteger();
 	
 	/**
 	 * EffectTickTask constructor.
@@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
 		return _effect;
 	}
 	
-	/**
-	 * Gets the current tick count.
-	 * @return the tick count
-	 */
-	public int getTickCount()
-	{
-		return _tickCount.get();
-	}
-	
 	@Override
 	public void run()
 	{
-		_info.onTick(_effect, _tickCount.incrementAndGet());
+		_info.onTick(_effect);
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
index 54aba123b5..2853c5e1fd 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
@@ -346,9 +346,8 @@ public class BuffInfo
 	 * Called on each tick.<br>
 	 * Verify if the effect should end and the effect task should be cancelled.
 	 * @param effect the effect that is ticking
-	 * @param tickCount the tick count
 	 */
-	public void onTick(AbstractEffect effect, int tickCount)
+	public void onTick(AbstractEffect effect)
 	{
 		boolean continueForever = false;
 		// If the effect is in use, allow it to affect the effected.
@@ -424,24 +423,6 @@ public class BuffInfo
 		}
 	}
 	
-	/**
-	 * Gets the effect tick count.
-	 * @param effect the effect
-	 * @return the current tick count
-	 */
-	public int getTickCount(AbstractEffect effect)
-	{
-		if (_tasks != null)
-		{
-			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
-			if (effectTaskInfo != null)
-			{
-				return effectTaskInfo.getEffectTask().getTickCount();
-			}
-		}
-		return 0;
-	}
-	
 	public void resetAbnormalTime(int abnormalTime)
 	{
 		if (_abnormalTime > 0)