lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed pointless EffectTickTask tick count variable.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-01-28 15:26:44 +00:00
parent fe05c1cddc
commit 393e53514c
51 changed files with 51 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

18
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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()
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

18
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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()
{

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -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(" ");

14
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/EffectTickTask.java
View File

@ -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);
}
}

21
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -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)