From 0b5708fd83059874f287c59b5ddab7e21b2688cf Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:37:29 +0000 Subject: [PATCH] Removed unnecessary boolean literals. --- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../instances/EtisVanEtinaSolo/EtinaHelperAliber.java | 8 ++++---- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../homunculus/RequestExActivateHomunculus.java | 2 +- .../game/data/scripts/events/DreamMaker/DreamMaker.java | 8 ++++---- .../instances/EtisVanEtinaSolo/EtinaHelperAliber.java | 8 ++++---- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../homunculus/RequestExActivateHomunculus.java | 2 +- .../java/org/l2jmobius/gameserver/model/items/Item.java | 2 +- .../java/org/l2jmobius/gameserver/model/items/Item.java | 2 +- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/items/Item.java | 4 ++-- 26 files changed, 54 insertions(+), 54 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java index 4e8384244c..c7f2b29152 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java index 4e8384244c..c7f2b29152 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java index 4e8384244c..c7f2b29152 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java index 2037df0278..840cc08084 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java @@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java index 7fae2e7cce..00b968ab5f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java @@ -206,7 +206,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -615,7 +615,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java index f46db57cad..77bdeff14f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java index 4667ed8eee..61b667097a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java index 4667ed8eee..61b667097a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java index 590d0bf8ad..6405674018 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java @@ -157,7 +157,7 @@ public class EtinaHelperAliber extends AbstractNpcAI _aliber.setInvul(true); _aliber.setCanReturnToSpawnPoint(false); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[0]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[0], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[0], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); @@ -176,7 +176,7 @@ public class EtinaHelperAliber extends AbstractNpcAI { _aliber.setRunning(); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[1]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[1], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[1], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); @@ -195,7 +195,7 @@ public class EtinaHelperAliber extends AbstractNpcAI { _aliber.setRunning(); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[2]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[2], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[2], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); @@ -214,7 +214,7 @@ public class EtinaHelperAliber extends AbstractNpcAI { _aliber.setRunning(); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[3]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[3], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[3], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Item.java index 4667ed8eee..61b667097a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java index b48b902112..159719ee61 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java @@ -37,7 +37,7 @@ public class RequestExActivateHomunculus implements IClientIncomingPacket public boolean read(GameClient client, PacketReader packet) { _slot = packet.readD(); - _activate = packet.readC() == 1 ? true : false; // enabled? + _activate = packet.readC() == 1; // enabled? return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java index 35bedad1d3..c7f65f1d84 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java @@ -63,7 +63,7 @@ public class DreamMaker extends LongTimeEvent { case "get_gift": { - if (player.getVariables().getBoolean("DREAM_MAKER_GIFT_RECEIVED", false) == false) + if (!player.getVariables().getBoolean("DREAM_MAKER_GIFT_RECEIVED", false)) { giveItems(player, Rnd.get(LUCKY_POUCH_GROWTH, LUCKY_POUCH_HARMONY), 1); player.getVariables().set("DREAM_MAKER_GIFT_RECEIVED", true); @@ -81,7 +81,7 @@ public class DreamMaker extends LongTimeEvent { htmltext = "34590-gift-no-level.htm"; } - else if (player.getVariables().getBoolean("DREAM_MAKER_GIFT_EXCHANGED", false) == true) + else if (player.getVariables().getBoolean("DREAM_MAKER_GIFT_EXCHANGED", false)) { htmltext = "34590-already-exchanged.htm"; } @@ -111,7 +111,7 @@ public class DreamMaker extends LongTimeEvent { htmltext = "34590-gift-no-level.htm"; } - else if (player.getVariables().getBoolean("DREAM_MAKER_GIFT_EXCHANGED", false) == true) + else if (player.getVariables().getBoolean("DREAM_MAKER_GIFT_EXCHANGED", false)) { htmltext = "34590-pouch-exchanged.htm"; } @@ -141,7 +141,7 @@ public class DreamMaker extends LongTimeEvent { htmltext = "34590-gift-no-level.htm"; } - else if (player.getVariables().getBoolean("DREAM_MAKER_GIFT_EXCHANGED", false) == true) + else if (player.getVariables().getBoolean("DREAM_MAKER_GIFT_EXCHANGED", false)) { htmltext = "34590-pouch-exchanged.htm"; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java index 590d0bf8ad..6405674018 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java @@ -157,7 +157,7 @@ public class EtinaHelperAliber extends AbstractNpcAI _aliber.setInvul(true); _aliber.setCanReturnToSpawnPoint(false); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[0]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[0], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[0], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); @@ -176,7 +176,7 @@ public class EtinaHelperAliber extends AbstractNpcAI { _aliber.setRunning(); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[1]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[1], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[1], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); @@ -195,7 +195,7 @@ public class EtinaHelperAliber extends AbstractNpcAI { _aliber.setRunning(); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[2]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[2], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[2], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); @@ -214,7 +214,7 @@ public class EtinaHelperAliber extends AbstractNpcAI { _aliber.setRunning(); _aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[3]); - if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[3], 200) && (BARRICADE_DESTROYED == false)) + if (_aliber.getLocation().isIn2DRadius(SKILL_CAST_LOCATIONS[3], 200) && !BARRICADE_DESTROYED) { _aliber.broadcastPacket(new MagicSkillUse(_aliber, _aliber, BARRICADE_DESTRUCTION.getSkillId(), 1, 500, 0)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Item.java index 4667ed8eee..61b667097a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java index b48b902112..159719ee61 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java @@ -37,7 +37,7 @@ public class RequestExActivateHomunculus implements IClientIncomingPacket public boolean read(GameClient client, PacketReader packet) { _slot = packet.readD(); - _activate = packet.readC() == 1 ? true : false; // enabled? + _activate = packet.readC() == 1; // enabled? return true; } 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 97fa04224e..11ced80eab 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 @@ -653,7 +653,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 5d91222d8e..9d66cff267 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 @@ -647,7 +647,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 09b6f3d281..2507807452 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 @@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 09b6f3d281..2507807452 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 @@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 425ee05336..fb23aa1785 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 @@ -206,7 +206,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -615,7 +615,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 0b301e82b3..5849b8e5bb 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 @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 0b301e82b3..5849b8e5bb 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 @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 0b301e82b3..5849b8e5bb 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 @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** 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 4e8384244c..c7f2b29152 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 @@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Item.java index d352cd042c..6878d6103f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Item.java index d352cd042c..6878d6103f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Item.java @@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable _questItem = set.getBoolean("is_questitem", false); if (Config.CUSTOM_DEPOSITABLE_ENABLED) { - _depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; } else { @@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable */ public boolean isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; } /**