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

CREATURE_VALUES renamed to PLAYER_VALUES to reflect Map contents.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-13 22:10:00 +00:00
parent d10d61cc94
commit dbafa83a79
20 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }

10
L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/GiveItemByExp.java vendored
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
*/ */
public class GiveItemByExp extends AbstractEffect public class GiveItemByExp extends AbstractEffect
{ {
private static final Map<Player, Long> CREATURE_VALUES = new ConcurrentHashMap<>(); private static final Map<Player, Long> PLAYER_VALUES = new ConcurrentHashMap<>();
private final long _exp; private final long _exp;
private final int _itemId; private final int _itemId;
@@ -60,7 +60,7 @@ public class GiveItemByExp extends AbstractEffect
{ {
if (effected.isPlayer()) if (effected.isPlayer())
{ {
CREATURE_VALUES.remove(effected.getActingPlayer()); PLAYER_VALUES.remove(effected.getActingPlayer());
effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); effected.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
} }
} }
@@ -73,15 +73,15 @@ public class GiveItemByExp extends AbstractEffect
} }
final Player player = playable.getActingPlayer(); final Player player = playable.getActingPlayer();
final long sum = CREATURE_VALUES.getOrDefault(player, 0L) + exp; final long sum = PLAYER_VALUES.getOrDefault(player, 0L) + exp;
if (sum >= _exp) if (sum >= _exp)
{ {
CREATURE_VALUES.remove(player); PLAYER_VALUES.remove(player);
player.addItem("GiveItemByExp effect", _itemId, 1, player, true); player.addItem("GiveItemByExp effect", _itemId, 1, player, true);
} }
else else
{ {
CREATURE_VALUES.put(player, sum); PLAYER_VALUES.put(player, sum);
} }
} }
} }