diff --git a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java index 0951487353..e3ac958be5 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java @@ -206,7 +206,7 @@ final class SelMahumDrill extends AbstractNpcAI // group hate for (L2Character ch : npc.getKnownList().getKnownCharacters()) { - if (!ch.isInCombat() && ch.isMonster() && (((L2Npc) ch).getSpawn().getName() == npc.getSpawn().getName())) + if (!ch.isInCombat() && ch.isMonster() && (((L2Npc) ch).getSpawn().getName().equals(npc.getSpawn().getName()))) { addAttackDesire((L2Npc) ch, attacker); } diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java b/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java index c190873d27..b5968ef86d 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java +++ b/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java @@ -651,14 +651,11 @@ public final class Raina extends AbstractNpcAI for (PlayerClass pclass : availSubs) { // scan for already used subclasses - final int availClassId = pclass.ordinal(); - final ClassId cid = ClassId.getClassId(availClassId); - for (SubClass subList : player.getSubClasses().values()) { - if (ClassId.getClassId(subList.getClassId()).equalsOrChildOf(cid)) + if (ClassId.getClassId(subList.getClassId()).equalsOrChildOf(ClassId.getClassId(pclass.ordinal()))) { - availSubs.remove(cid); + availSubs.remove(pclass); break; } } diff --git a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 97b2a08b50..57a7e19ac3 100644 --- a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -81,7 +81,7 @@ final class FreyaCelebration extends LongTimeEvent { final long _curr_time = System.currentTimeMillis(); final String value = loadGlobalQuestVar(player.getAccountName()); - final long _reuse_time = value == "" ? 0 : Long.parseLong(value); + final long _reuse_time = value.equals("") ? 0 : Long.parseLong(value); if (_curr_time > _reuse_time) { diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 81e64c93a4..02358ba324 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -369,7 +369,7 @@ public class AdminAdmin implements IAdminCommandHandler } else if (command.startsWith("admin_gmon")) { - // nothing + // TODO why is this empty? } return true; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java b/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java index cdbec4aaf0..17daa45a2d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java @@ -638,16 +638,9 @@ public class AutoSpawnHandler return _locList.toArray(new Location[_locList.size()]); } - public L2Npc[] getNPCInstanceList() + public List getNPCInstanceList() { - L2Npc[] ret; - synchronized (_npcList) - { - ret = new L2Npc[_npcList.size()]; - _npcList.toArray(ret); - } - - return ret; + return _npcList; } public List getSpawns() diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2Party.java b/trunk/java/com/l2jmobius/gameserver/model/L2Party.java index dbaeb37a88..ee78a46a8d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2Party.java @@ -386,10 +386,7 @@ public class L2Party extends AbstractPlayerGroup { synchronized (this) { - if (_tacticalSigns == null) - { - _tacticalSigns = new ConcurrentHashMap<>(1); - } + _tacticalSigns = new ConcurrentHashMap<>(1); } } return _tacticalSigns; diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index b88697a767..4d0f208177 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -8320,7 +8320,7 @@ public final class L2PcInstance extends L2Playable // Add Henna skills for (SkillHolder skill : henna.getSkills()) { - if (!getAllSkills().contains(skill)) + if (!getAllSkills().contains(skill.getSkill())) { addSkill(skill.getSkill(), true); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Friend.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Friend.java index 23d12d3dcd..a16f5dc4e2 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Friend.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Friend.java @@ -128,7 +128,7 @@ public class Friend public String getName() { - if (_name == "") + if (_name.equals("")) { _name = CharNameTable.getInstance().getNameById(_friendOID); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index 9eae1bd68b..4b6101876f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -150,19 +150,17 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable PreparedStatement ps = con.prepareStatement(SQL_LOAD_GUARDS)) { ps.setInt(1, _hall.getId()); - try (ResultSet rset = ps.executeQuery()) + final ResultSet rset = ps.executeQuery(); + while (rset.next()) { - while (rset.next()) - { - final L2Spawn spawn = new L2Spawn(rset.getInt("npcId")); - spawn.setX(rset.getInt("x")); - spawn.setY(rset.getInt("y")); - spawn.setZ(rset.getInt("z")); - spawn.setHeading(rset.getInt("heading")); - spawn.setRespawnDelay(rset.getInt("respawnDelay")); - spawn.setAmount(1); - _guards.add(spawn); - } + final L2Spawn spawn = new L2Spawn(rset.getInt("npcId")); + spawn.setX(rset.getInt("x")); + spawn.setY(rset.getInt("y")); + spawn.setZ(rset.getInt("z")); + spawn.setHeading(rset.getInt("heading")); + spawn.setRespawnDelay(rset.getInt("respawnDelay")); + spawn.setAmount(1); + _guards.add(spawn); } } catch (Exception e) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index d0563c8f19..a7e196d5e8 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -66,7 +66,7 @@ public class RequestAlchemyTryMixCube extends L2GameClientPacket activeChar.sendPacket(ExTryMixCube.FAIL); return; } - if (activeChar.isInStoreMode() || activeChar.isInStoreMode()) + if (activeChar.isInStoreMode()) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_ALCHEMY_WHILE_TRADING_OR_USING_A_PRIVATE_STORE_OR_SHOP); activeChar.sendPacket(ExTryMixCube.FAIL); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 46556761ae..a4a3ca1825 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -55,8 +55,8 @@ public final class RequestAnswerFriendInvite extends L2GameClientPacket return; } - if (player.getFriendList().containsValue(requestor.getObjectId()) // - || requestor.getFriendList().containsValue(player.getObjectId())) + if (player.getFriendList().containsKey(requestor.getObjectId()) // + || requestor.getFriendList().containsKey(player.getObjectId())) { requestor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST)); return; diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index b7fa3f988d..6dfcf62024 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -74,7 +74,7 @@ public class PledgeShowMemberListAll extends L2GameServerPacket { _name = subPledge.getName(); } - writeD((_name == "") || (_name == name) ? 0 : 1); + writeD((_name.equals("")) || (_name.equals(name)) ? 0 : 1); writeD(_clan.getId()); writeD(Config.SERVER_ID); writeD(_pledgeType); diff --git a/trunk/java/com/l2jmobius/util/IPSubnet.java b/trunk/java/com/l2jmobius/util/IPSubnet.java index a152c79df5..df195c9ee4 100644 --- a/trunk/java/com/l2jmobius/util/IPSubnet.java +++ b/trunk/java/com/l2jmobius/util/IPSubnet.java @@ -136,7 +136,7 @@ public class IPSubnet { return applyMask(((IPSubnet) o).getAddress()); } - else if (o instanceof InetAddress) + if (o instanceof InetAddress) { return applyMask(((InetAddress) o).getAddress()); }