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

Removed unnecessary boolean literals.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-02 17:37:29 +00:00
parent 79e4b4024a
commit 0b5708fd83
26 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -206,7 +206,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -615,7 +615,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

8
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java vendored
View File

@@ -157,7 +157,7 @@ public class EtinaHelperAliber extends AbstractNpcAI
_aliber.setInvul(true); _aliber.setInvul(true);
_aliber.setCanReturnToSpawnPoint(false); _aliber.setCanReturnToSpawnPoint(false);
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[0]); _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 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)); _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.setRunning();
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[1]); _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 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)); _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.setRunning();
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[2]); _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 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)); _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.setRunning();
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[3]); _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 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)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true));

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java
View File

@@ -37,7 +37,7 @@ public class RequestExActivateHomunculus implements IClientIncomingPacket
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_slot = packet.readD(); _slot = packet.readD();
_activate = packet.readC() == 1 ? true : false; // enabled? _activate = packet.readC() == 1; // enabled?
return true; return true;
} }

8
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java vendored
View File

@@ -63,7 +63,7 @@ public class DreamMaker extends LongTimeEvent
{ {
case "get_gift": 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); giveItems(player, Rnd.get(LUCKY_POUCH_GROWTH, LUCKY_POUCH_HARMONY), 1);
player.getVariables().set("DREAM_MAKER_GIFT_RECEIVED", true); player.getVariables().set("DREAM_MAKER_GIFT_RECEIVED", true);
@@ -81,7 +81,7 @@ public class DreamMaker extends LongTimeEvent
{ {
htmltext = "34590-gift-no-level.htm"; 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"; htmltext = "34590-already-exchanged.htm";
} }
@@ -111,7 +111,7 @@ public class DreamMaker extends LongTimeEvent
{ {
htmltext = "34590-gift-no-level.htm"; 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"; htmltext = "34590-pouch-exchanged.htm";
} }
@@ -141,7 +141,7 @@ public class DreamMaker extends LongTimeEvent
{ {
htmltext = "34590-gift-no-level.htm"; 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"; htmltext = "34590-pouch-exchanged.htm";
} }

8
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtinaHelperAliber.java vendored
View File

@@ -157,7 +157,7 @@ public class EtinaHelperAliber extends AbstractNpcAI
_aliber.setInvul(true); _aliber.setInvul(true);
_aliber.setCanReturnToSpawnPoint(false); _aliber.setCanReturnToSpawnPoint(false);
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[0]); _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 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)); _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.setRunning();
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[1]); _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 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)); _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.setRunning();
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[2]); _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 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)); _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.setRunning();
_aliber.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, SKILL_CAST_LOCATIONS[3]); _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 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)); _aliber.broadcastPacket(new ExShowScreenMessage(NpcStringId.ALIBER_IS_CASTING_A_SPELL_TO_DESTROY_THE_BARRICADE, ExShowScreenMessage.TOP_CENTER, 7000, true));

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -621,7 +621,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExActivateHomunculus.java
View File

@@ -37,7 +37,7 @@ public class RequestExActivateHomunculus implements IClientIncomingPacket
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_slot = packet.readD(); _slot = packet.readD();
_activate = packet.readC() == 1 ? true : false; // enabled? _activate = packet.readC() == 1; // enabled?
return true; return true;
} }

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -653,7 +653,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -647,7 +647,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -206,7 +206,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -615,7 +615,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -205,7 +205,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -614,7 +614,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -210,7 +210,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_questItem = set.getBoolean("is_questitem", false); _questItem = set.getBoolean("is_questitem", false);
if (Config.CUSTOM_DEPOSITABLE_ENABLED) if (Config.CUSTOM_DEPOSITABLE_ENABLED)
{ {
_depositable = _questItem ? Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS : true; _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS;
} }
else else
{ {
@@ -620,7 +620,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
*/ */
public boolean isEnchantable() public boolean isEnchantable()
{ {
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false; return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable;
} }
/** /**