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

There is no need for MpRewardTask to use AtomicInteger.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-01-28 15:21:23 +00:00
parent e5bd883546
commit fe05c1cddc
15 changed files with 45 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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

7
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/MpRewardTask.java
View File

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