diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/MpRewardTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/MpRewardTask.java index 69bd1e7c2c..512d7af994 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/MpRewardTask.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/MpRewardTask.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; @@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; */ public class MpRewardTask { - private final AtomicInteger _count; + private int _count; private final double _value; private final ScheduledFuture _task; private final Creature _creature; @@ -39,7 +38,7 @@ public class MpRewardTask { final NpcTemplate template = npc.getTemplate(); _creature = creature; - _count = new AtomicInteger(template.getMpRewardTicks()); + _count = template.getMpRewardTicks(); _value = calculateBaseValue(npc, creature); _task = ThreadPool.scheduleAtFixedRate(this::run, Config.EFFECT_TICK_RATIO, Config.EFFECT_TICK_RATIO); } @@ -64,7 +63,7 @@ public class MpRewardTask private void run() { - if ((_count.decrementAndGet() <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) + if ((--_count <= 0) || (_creature.isPlayer() && !_creature.getActingPlayer().isOnline())) { _task.cancel(false); return;