From e1f4230ed2ed5c8c45d42646c1cbdd1e95212992 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 26 Jan 2020 17:34:54 +0000 Subject: [PATCH] Removed underscores from Item class variables. --- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 30 +++++++-------- .../gameserver/model/items/Item.java | 30 +++++++-------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- .../gameserver/model/items/Item.java | 38 +++++++++---------- 17 files changed, 315 insertions(+), 315 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java index 7ed78ba385..e919088ff1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java @@ -144,15 +144,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -210,15 +210,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -806,7 +806,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -874,12 +874,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -887,12 +887,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -925,7 +925,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -934,7 +934,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java index 7ed78ba385..e919088ff1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java @@ -144,15 +144,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -210,15 +210,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -806,7 +806,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -874,12 +874,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -887,12 +887,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -925,7 +925,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -934,7 +934,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java index 7ed78ba385..e919088ff1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java @@ -144,15 +144,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -210,15 +210,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -806,7 +806,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -874,12 +874,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -887,12 +887,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -925,7 +925,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -934,7 +934,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java index 913b622479..15946c4364 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java @@ -144,15 +144,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -210,15 +210,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -806,7 +806,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -874,12 +874,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -887,12 +887,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -925,7 +925,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -934,7 +934,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java index 8dab17b4f2..6235683261 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java @@ -145,15 +145,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -211,15 +211,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -807,7 +807,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -875,12 +875,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -888,12 +888,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -926,7 +926,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -935,7 +935,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java index 16536c3e17..3bca2449af 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java @@ -147,15 +147,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -215,16 +215,16 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); _artifactSlot = set.getInt("artifactSlot", 0); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -812,7 +812,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -880,12 +880,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -893,12 +893,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -936,7 +936,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -945,7 +945,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java index 95b6a9ebdc..87b00b463a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java @@ -147,15 +147,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -215,16 +215,16 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); _artifactSlot = set.getInt("artifactSlot", 0); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -813,7 +813,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -881,12 +881,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -894,12 +894,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -937,7 +937,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -946,7 +946,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java index 95b6a9ebdc..87b00b463a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java @@ -147,15 +147,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -215,16 +215,16 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); _artifactSlot = set.getInt("artifactSlot", 0); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -813,7 +813,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -881,12 +881,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -894,12 +894,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -937,7 +937,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -946,7 +946,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java index 36e702f73e..9f577aa355 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java @@ -129,14 +129,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -189,12 +189,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _forNpc = set.getBoolean("for_npc", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -902,17 +902,17 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } public boolean isForNpc() { - return _for_npc; + return _forNpc; } /** @@ -932,7 +932,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -941,7 +941,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java index e96459fbc7..faa1b38841 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java @@ -129,14 +129,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -189,12 +189,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _forNpc = set.getBoolean("for_npc", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -902,17 +902,17 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } public boolean isForNpc() { - return _for_npc; + return _forNpc; } /** @@ -932,7 +932,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -941,7 +941,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java index 926f0ad8bd..4ad2f7c61d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java @@ -144,15 +144,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -210,15 +210,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -805,7 +805,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -873,12 +873,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -886,12 +886,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -924,7 +924,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -933,7 +933,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java index 926f0ad8bd..4ad2f7c61d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java @@ -144,15 +144,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -210,15 +210,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -805,7 +805,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -873,12 +873,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -886,12 +886,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -924,7 +924,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -933,7 +933,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java index 3271b32a69..8d126b4d44 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java @@ -145,15 +145,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -211,15 +211,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -806,7 +806,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -874,12 +874,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -887,12 +887,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -925,7 +925,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -934,7 +934,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java index 4f2d125bdf..2c8449f886 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java @@ -147,15 +147,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -213,15 +213,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -808,7 +808,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -876,12 +876,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -889,12 +889,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -927,7 +927,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -936,7 +936,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java index 4f2d125bdf..2c8449f886 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java @@ -147,15 +147,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -213,15 +213,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -808,7 +808,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -876,12 +876,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -889,12 +889,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -927,7 +927,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -936,7 +936,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java index 4f2d125bdf..2c8449f886 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java @@ -147,15 +147,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -213,15 +213,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -808,7 +808,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -876,12 +876,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -889,12 +889,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -927,7 +927,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -936,7 +936,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java index 7ed78ba385..e919088ff1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java @@ -144,15 +144,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable private boolean _elementable; private boolean _questItem; private boolean _freightable; - private boolean _allow_self_resurrection; - private boolean _is_oly_restricted; - private boolean _is_coc_restricted; - private boolean _for_npc; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isCocRestricted; + private boolean _forNpc; private boolean _common; private boolean _heroItem; private boolean _pvpItem; - private boolean _immediate_effect; - private boolean _ex_immediate_effect; + private boolean _immediateEffect; + private boolean _exImmediateEffect; private int _defaultEnchantLevel; private ActionType _defaultAction; @@ -210,15 +210,15 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _enchantable = set.getInt("enchant_enabled", 0); _questItem = set.getBoolean("is_questitem", false); _freightable = set.getBoolean("is_freightable", false); - _allow_self_resurrection = set.getBoolean("allow_self_resurrection", false); - _is_oly_restricted = set.getBoolean("is_oly_restricted", false); - _is_coc_restricted = set.getBoolean("is_coc_restricted", false); - _for_npc = set.getBoolean("for_npc", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isCocRestricted = set.getBoolean("is_coc_restricted", false); + _forNpc = set.getBoolean("for_npc", false); _isAppearanceable = set.getBoolean("isAppearanceable", false); _isBlessed = set.getBoolean("blessed", false); - _immediate_effect = set.getBoolean("immediate_effect", false); - _ex_immediate_effect = set.getBoolean("ex_immediate_effect", false); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); _useSkillDisTime = set.getInt("useSkillDisTime", 0); @@ -806,7 +806,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable return false; } - if (_is_coc_restricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_isCocRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; @@ -874,12 +874,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable public boolean isAllowSelfResurrection() { - return _allow_self_resurrection; + return _allowSelfResurrection; } public boolean isOlyRestrictedItem() { - return _is_oly_restricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); } /** @@ -887,12 +887,12 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isCocRestrictedItem() { - return _is_coc_restricted; + return _isCocRestricted; } public boolean isForNpc() { - return _for_npc; + return _forNpc; } public boolean isAppearanceable() @@ -925,7 +925,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasExImmediateEffect() { - return _ex_immediate_effect; + return _exImmediateEffect; } /** @@ -934,7 +934,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean hasImmediateEffect() { - return _immediate_effect; + return _immediateEffect; } /**