Removed pointless EffectTickTask tick count variable.
This commit is contained in:
parent
fe05c1cddc
commit
393e53514c
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -271,7 +271,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
html.append(")");
|
html.append(")");
|
||||||
html.append(!info.isInUse() ? FONT_RED2 : "");
|
html.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
html.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
html.append(target.getObjectId());
|
html.append(target.getObjectId());
|
||||||
html.append(" ");
|
html.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -288,9 +288,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// If the effect is in use, allow it to affect the effected.
|
||||||
@ -445,21 +444,6 @@ public class BuffInfo
|
|||||||
_effected.removeStatsOwner(_skill);
|
_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
|
@Override
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
|
@ -271,7 +271,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
html.append(")");
|
html.append(")");
|
||||||
html.append(!info.isInUse() ? FONT_RED2 : "");
|
html.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
html.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
html.append(target.getObjectId());
|
html.append(target.getObjectId());
|
||||||
html.append(" ");
|
html.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -288,9 +288,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// If the effect is in use, allow it to affect the effected.
|
||||||
@ -445,21 +444,6 @@ public class BuffInfo
|
|||||||
_effected.removeStatsOwner(_skill);
|
_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
|
@Override
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
@ -320,7 +320,7 @@ public class AdminBuffs implements IAdminCommandHandler
|
|||||||
sb.append(")");
|
sb.append(")");
|
||||||
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
sb.append(!info.isInUse() ? FONT_RED2 : "");
|
||||||
sb.append("</td><td>");
|
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("</td><td><button value=\"X\" action=\"bypass -h admin_stopbuff ");
|
||||||
sb.append(target.getObjectId());
|
sb.append(target.getObjectId());
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver.model.effects;
|
package org.l2jmobius.gameserver.model.effects;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
import org.l2jmobius.gameserver.model.skills.BuffInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,6 @@ public class EffectTickTask implements Runnable
|
|||||||
{
|
{
|
||||||
private final BuffInfo _info;
|
private final BuffInfo _info;
|
||||||
private final AbstractEffect _effect;
|
private final AbstractEffect _effect;
|
||||||
private final AtomicInteger _tickCount = new AtomicInteger();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EffectTickTask constructor.
|
* EffectTickTask constructor.
|
||||||
@ -59,18 +56,9 @@ public class EffectTickTask implements Runnable
|
|||||||
return _effect;
|
return _effect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current tick count.
|
|
||||||
* @return the tick count
|
|
||||||
*/
|
|
||||||
public int getTickCount()
|
|
||||||
{
|
|
||||||
return _tickCount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
_info.onTick(_effect, _tickCount.incrementAndGet());
|
_info.onTick(_effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -346,9 +346,8 @@ public class BuffInfo
|
|||||||
* Called on each tick.<br>
|
* Called on each tick.<br>
|
||||||
* Verify if the effect should end and the effect task should be cancelled.
|
* Verify if the effect should end and the effect task should be cancelled.
|
||||||
* @param effect the effect that is ticking
|
* @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;
|
boolean continueForever = false;
|
||||||
// If the effect is in use, allow it to affect the effected.
|
// 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)
|
public void resetAbnormalTime(int abnormalTime)
|
||||||
{
|
{
|
||||||
if (_abnormalTime > 0)
|
if (_abnormalTime > 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user