diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 59ca8fcc83..6251faab77 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -40,7 +40,7 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING); return false; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/SocialAction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/SocialAction.java index f7db8c36f7..fde530a2b4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/SocialAction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/SocialAction.java @@ -149,7 +149,7 @@ public final class SocialAction implements IPlayerActionHandler } SystemMessage sm; - if (player.isInStoreMode() || player.isInCraftMode()) + if (player.isInStoreMode() || player.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(player); @@ -228,7 +228,7 @@ public final class SocialAction implements IPlayerActionHandler // Checks for partner. final L2PcInstance partner = target.getActingPlayer(); - if (partner.isInStoreMode() || partner.isInCraftMode()) + if (partner.isInStoreMode() || partner.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(partner); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 881d3eb70b..135edbc233 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -530,7 +530,7 @@ public class Q00663_SeductiveWhispers extends Quest @Override public String toString() { - return getSide() == Side.MOON ? "" + getSide().getName() + ": " + getNumber() + "" : "" + getSide().getName() + ": " + getNumber() + ""; + return _side == Side.MOON ? "" + _side.getName() + ": " + _number + "" : "" + _side.getName() + ": " + _number + ""; } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/PacketReader.java index ea90113f43..bdf5c76ac8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/RecipeController.java index 5bf504afb5..ef52c215f3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/RecipeController.java @@ -199,7 +199,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -291,7 +291,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -438,7 +438,7 @@ public class RecipeController // update load and mana bar of craft window updateCurMp(); _activeMakers.remove(_player.getObjectId()); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendItemList(false); } @@ -654,7 +654,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player.getObjectId()); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java index cad4fb54da..717f999c27 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -608,7 +608,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -648,7 +648,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -680,7 +680,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player)) + if (_actor.isVisibleFor(player)) { if (_clientMoving) { @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (getTarget() instanceof L2Character) && (getIntention() == AI_INTENTION_FOLLOW); + return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); } /** @@ -737,7 +737,7 @@ public abstract class AbstractAI implements Ctrl return; } - final L2Object followTarget = getTarget(); // copy to prevent NPE + final L2Object followTarget = _target; // copy to prevent NPE if (followTarget == null) { if (_actor.isSummon()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8826f4e507..3880807630 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -166,7 +166,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, max_range); } @@ -216,7 +216,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -256,7 +256,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 4f3a018802..0052f4791d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -224,7 +224,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtAttacked(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } @@ -239,7 +239,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtEvaded(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/cache/HtmCache.java index 3127c4156e..265a5a6758 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -66,7 +66,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index 316e1ed757..dd22855ae4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index a60a111c2d..77aa1fb5fb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -133,7 +133,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -345,7 +345,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java index 712d1febdd..6618dcdf1d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java @@ -108,7 +108,7 @@ public final class CastleData implements IGameXmlReader guards.add(new SiegeGuardHolder(castleId, itemId, type, stationary, npcId, npcMaxAmount)); } } - getSiegeGuards().put(castleId, guards); + _siegeGuards.put(castleId, guards); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b0b755ac92..db7fdf9fa6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -258,7 +258,7 @@ public class RecipeData implements IGameXmlReader if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage("No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java index ac3c07c3c9..d5266c07ef 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/enums/AttributeType.java @@ -63,7 +63,7 @@ public enum AttributeType */ public AttributeType getOpposite() { - return ATTRIBUTE_TYPES[((getClientId() % 2) == 0) ? (getClientId() + 1) : (getClientId() - 1)]; + return ATTRIBUTE_TYPES[((_clientId % 2) == 0) ? (_clientId + 1) : (_clientId - 1)]; } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2615be0ddf..f0275d4660 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 792edf3cba..afc836f427 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -68,7 +68,7 @@ public final class CastleManager implements InstanceListManager if (nearestCastle == null) { double distance; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { distance = castle.getDistance(obj); if (maxDistance > distance) @@ -88,7 +88,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastleByOwner(L2Clan clan) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getOwnerId() == clan.getId()) { @@ -100,7 +100,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(String name) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getName().equalsIgnoreCase(name.trim())) { @@ -112,7 +112,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(int x, int y, int z) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.checkIfInZone(x, y, z)) { @@ -135,7 +135,7 @@ public final class CastleManager implements InstanceListManager public boolean hasOwnedCastle() { boolean hasOwnedCastle = false; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { if (castle.getOwnerId() > 0) { @@ -224,7 +224,7 @@ public final class CastleManager implements InstanceListManager final int castleId = rs.getInt("id"); _castles.put(castleId, new Castle(castleId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCastles().size() + " castles."); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.values().size() + " castles."); } catch (Exception e) { @@ -240,7 +240,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { castle.activateInstance(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index dc63278e16..37f7cd0a21 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -47,7 +47,7 @@ public final class FortManager implements InstanceListManager Fort nearestFort = getFort(obj); if (nearestFort == null) { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { final double distance = fort.getDistance(obj); if (maxDistance > distance) @@ -62,7 +62,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getResidenceId() == fortId) { @@ -74,7 +74,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getOwnerClan() == clan) { @@ -86,7 +86,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -98,7 +98,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.checkIfInZone(x, y, z)) { @@ -131,8 +131,8 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); - for (Fort fort : getForts()) + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.values().size() + " fortress"); + for (Fort fort : _forts.values()) { fort.getSiege().loadSiegeGuard(); } @@ -151,7 +151,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { fort.activateInstance(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 58b75f592d..0b4c7601cb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -102,7 +102,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -115,7 +115,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -128,7 +128,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -141,7 +141,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -159,7 +159,7 @@ public final class MailManager public int getMailsInProgress(int objectId) { int count = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getMailType() == MailType.REGULAR)) { @@ -179,7 +179,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 41216a0555..30581681f4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -244,7 +244,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return (currPetition.getState() == PetitionState.IN_PROCESS); } @@ -252,7 +252,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -283,7 +283,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -302,7 +302,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -312,7 +312,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -330,7 +330,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -363,12 +363,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -379,7 +379,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -419,7 +419,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -440,7 +440,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 964757069c..20b6c07319 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -171,7 +171,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java index 1b0e62c021..83b903b671 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -277,7 +277,7 @@ public final class CharEffectList */ public int getBuffCount() { - return _actives != null ? (_buffCount.intValue() - _hiddenBuffs.get()) : 0; + return _actives != null ? (_buffCount.get() - _hiddenBuffs.get()) : 0; } /** @@ -287,7 +287,7 @@ public final class CharEffectList */ public int getDanceCount() { - return _danceCount.intValue(); + return _danceCount.get(); } /** @@ -297,7 +297,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return _triggerBuffCount.intValue(); + return _triggerBuffCount.get(); } /** @@ -307,7 +307,7 @@ public final class CharEffectList */ public int getToggleCount() { - return _toggleCount.intValue(); + return _toggleCount.get(); } /** @@ -317,7 +317,7 @@ public final class CharEffectList */ public int getDebuffCount() { - return _debuffCount.intValue(); + return _debuffCount.get(); } /** @@ -352,7 +352,7 @@ public final class CharEffectList */ public void stopAllToggles() { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { // Ignore necessary toggles. stopEffects(b -> b.getSkill().isToggle() && !b.getSkill().isNecessaryToggle() && !b.getSkill().isIrreplacableBuff(), true, true); @@ -361,7 +361,7 @@ public final class CharEffectList public void stopAllTogglesOfGroup(int toggleGroup) { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { stopEffects(b -> b.getSkill().isToggle() && (b.getSkill().getToggleGroupId() == toggleGroup), true, true); } @@ -508,7 +508,7 @@ public final class CharEffectList */ public void stopEffectsOnAction() { - if (_hasBuffsRemovedOnAnyAction.intValue() > 0) + if (_hasBuffsRemovedOnAnyAction.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnAnyActionExceptMove(), true, true); } @@ -516,7 +516,7 @@ public final class CharEffectList public void stopEffectsOnDamage() { - if (_hasBuffsRemovedOnDamage.intValue() > 0) + if (_hasBuffsRemovedOnDamage.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnDamage(), true, true); } @@ -535,16 +535,16 @@ public final class CharEffectList { case TRIGGER: { - return (getTriggeredBuffCount() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); + return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); } case DANCE: { - return (getDanceCount() > Config.DANCES_MAX_AMOUNT); + return (_danceCount.get() > Config.DANCES_MAX_AMOUNT); } // case TOGGLE: Do toggles have limit? case DEBUFF: { - return (getDebuffCount() > 24); + return (_debuffCount.get() > 24); } case BUFF: { @@ -1106,7 +1106,7 @@ public final class CharEffectList final Skill skill = info.getSkill(); // Handle hidden buffs. Check if there was such abnormal before so we can continue. - if ((getHiddenBuffsCount() > 0) && _stackedEffects.contains(skill.getAbnormalType())) + if ((_hiddenBuffs.get() > 0) && _stackedEffects.contains(skill.getAbnormalType())) { // If incoming buff isnt hidden, remove any hidden buffs with its abnormal type. if (info.isInUse()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 8de8a2fb0e..2265d6876c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -71,7 +71,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Fishing.java index d4098ed013..c99bd47e84 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Fishing.java @@ -110,7 +110,7 @@ public class Fishing public synchronized void startFishing() { - if (isFishing()) + if (_isFishing) { return; } @@ -132,7 +132,7 @@ public class Fishing if (!canFish()) { - if (isFishing()) + if (_isFishing) { _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); } @@ -182,7 +182,7 @@ public class Fishing return; } - if (_player.isInCraftMode() || _player.isInStoreMode()) + if (_player.isCrafting() || _player.isInStoreMode()) { _player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -201,7 +201,7 @@ public class Fishing _baitLocation = calculateBaitLocation(); if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null)) { - if (isFishing()) + if (_isFishing) { // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -262,7 +262,7 @@ public class Fishing private void reelIn(FishingEndReason reason, boolean consumeBait) { - if (!isFishing()) + if (!_isFishing) { return; } @@ -326,7 +326,7 @@ public class Fishing public synchronized void stopFishing(FishingEndType endType) { - if (isFishing()) + if (_isFishing) { reelIn(FishingEndReason.STOP, false); _isFishing = false; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index ec834bcb34..c05e0915be 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -177,7 +177,7 @@ public final class L2ArmorSet public int getLowestSetEnchant(L2PcInstance player) { // Player don't have full set - if (getPiecesCount(player, L2ItemInstance::getId) < getMinimumPieces()) + if (getPiecesCount(player, L2ItemInstance::getId) < _minimumPieces) { return 0; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java index 80453af17c..1a63f18d20 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -169,7 +169,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); final ClanRewardBonus availableOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(this); if ((_lastMembersOnlineBonus == null) && (availableOnlineBonus != null)) @@ -241,7 +241,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -277,7 +277,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -329,7 +329,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - LOGGER.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + _name + " without clan leader!"); return ""; } return _leader.getName(); @@ -569,7 +569,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -607,7 +607,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -627,7 +627,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -881,8 +881,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -925,8 +925,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -941,8 +941,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -977,15 +977,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1014,19 +1014,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1070,7 +1070,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1083,12 +1083,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1108,7 +1108,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1145,7 +1145,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1176,7 +1176,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1236,7 +1236,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1363,7 +1363,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1371,7 +1371,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1611,7 +1611,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1764,7 +1764,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1854,7 +1854,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); return null; @@ -1863,7 +1863,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1878,11 +1878,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1948,7 +1948,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1964,7 +1964,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2013,7 +2013,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2025,7 +2025,7 @@ public class L2Clan implements IIdentifiable, INamable LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } - for (L2ClanMember cm : getMembers()) + for (L2ClanMember cm : _members.values()) { if (cm.isOnline()) { @@ -2049,7 +2049,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2089,12 +2089,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2168,7 +2168,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2205,7 +2205,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2237,7 +2237,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2389,22 +2389,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2425,7 +2425,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2438,12 +2438,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2482,7 +2482,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2490,7 +2490,7 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; - switch (getLevel()) + switch (_level) { case 0: { @@ -2588,9 +2588,9 @@ public class L2Clan implements IIdentifiable, INamable case 5: { // Upgrade to 6 - if ((getReputationScore() >= Config.CLAN_LEVEL_6_COST) && (getMembersCount() >= Config.CLAN_LEVEL_6_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_6_COST) && (_members.size() >= Config.CLAN_LEVEL_6_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_6_COST); player.sendPacket(cr); @@ -2601,9 +2601,9 @@ public class L2Clan implements IIdentifiable, INamable case 6: { // Upgrade to 7 - if ((getReputationScore() >= Config.CLAN_LEVEL_7_COST) && (getMembersCount() >= Config.CLAN_LEVEL_7_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_7_COST) && (_members.size() >= Config.CLAN_LEVEL_7_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_7_COST); player.sendPacket(cr); @@ -2614,9 +2614,9 @@ public class L2Clan implements IIdentifiable, INamable case 7: { // Upgrade to 8 - if ((getReputationScore() >= Config.CLAN_LEVEL_8_COST) && (getMembersCount() >= Config.CLAN_LEVEL_8_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_8_COST) && (_members.size() >= Config.CLAN_LEVEL_8_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_8_COST); player.sendPacket(cr); @@ -2627,12 +2627,12 @@ public class L2Clan implements IIdentifiable, INamable case 8: { // Upgrade to 9 - if ((getReputationScore() >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (getMembersCount() >= Config.CLAN_LEVEL_9_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT)) { // itemId 9910 == Blood Oath if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_9_COST); player.sendPacket(cr); @@ -2648,12 +2648,12 @@ public class L2Clan implements IIdentifiable, INamable case 9: { // Upgrade to 10 - if ((getReputationScore() >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (getMembersCount() >= Config.CLAN_LEVEL_10_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (_members.size() >= Config.CLAN_LEVEL_10_REQUIREMENT)) { // itemId 9911 == Blood Alliance if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_10_COST); player.sendPacket(cr); @@ -2669,9 +2669,9 @@ public class L2Clan implements IIdentifiable, INamable case 10: { // Upgrade to 11 - if ((getReputationScore() >= Config.CLAN_LEVEL_11_COST) && (getMembersCount() >= Config.CLAN_LEVEL_11_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_11_COST) && (_members.size() >= Config.CLAN_LEVEL_11_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_11_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_11_COST); player.sendPacket(cr); @@ -2698,7 +2698,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendItemList(false); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2711,7 +2711,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2721,9 +2721,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2746,7 +2746,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2757,12 +2757,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2779,15 +2779,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2829,7 +2829,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2840,12 +2840,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -3139,7 +3139,7 @@ public class L2Clan implements IIdentifiable, INamable getVariables().set("PREVIOUS_HUNTING_POINTS", getHuntingPoints()); // Reset - getMembers().forEach(L2ClanMember::resetBonus); + _members.values().forEach(L2ClanMember::resetBonus); getVariables().remove("HUNTING_POINTS"); // force store @@ -3154,7 +3154,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_vars == null) { - _vars = new ClanVariables(getId()); + _vars = new ClanVariables(_clanId); if (Config.CLAN_VARIABLES_STORE_INTERVAL > 0) { ThreadPool.scheduleAtFixedRate(this::storeVariables, Config.CLAN_VARIABLES_STORE_INTERVAL, Config.CLAN_VARIABLES_STORE_INTERVAL); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ClanMember.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ClanMember.java index 7f0fa86028..8827f75a89 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ClanMember.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2ClanMember.java @@ -855,7 +855,6 @@ public class L2ClanMember private PlayerVariables getVariables() { - final L2PcInstance player = getPlayerInstance(); - return player != null ? player.getVariables() : new PlayerVariables(_objectId); + return _player != null ? _player.getVariables() : new PlayerVariables(_objectId); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index d91e7e0554..df5da1b8ba 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Crest.java index dc3c3497a3..24eedf1679 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,42 +94,41 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - final byte[] data = getData(); - if (data != null) + if (_data != null) { for (int i = 0; i <= 4; i++) { if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); - activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); + System.arraycopy(_data, (14336 * i), fullChunk, 0, 14336); + activeChar.sendPacket(new ExPledgeEmblem(_id, fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); - activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); + System.arraycopy(_data, (14336 * i), lastChunk, 0, 8320); + activeChar.sendPacket(new ExPledgeEmblem(_id, lastChunk, 0, i)); } } } - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java index a1eb3d2480..5c086b9d83 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -52,7 +52,7 @@ public class L2Mentee try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT char_name, level, base_class FROM characters WHERE charId = ?")) { - statement.setInt(1, getObjectId()); + statement.setInt(1, _objectId); try (ResultSet rset = statement.executeQuery()) { if (rset.next()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java index 171ad1e543..70a2a9e6e2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Object.java @@ -148,15 +148,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -180,7 +175,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -242,7 +237,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -632,7 +627,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get()); } /** @@ -680,13 +675,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -781,7 +775,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -806,7 +800,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -880,19 +874,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -904,6 +897,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java index 9636853228..d01a52009e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java @@ -168,7 +168,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -195,7 +195,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -260,7 +260,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -279,7 +279,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -294,7 +294,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -305,14 +305,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if (pMember != null) { @@ -333,7 +333,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -357,7 +357,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -439,7 +439,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(target, tacticalSignId)); m.sendPacket(sm); @@ -450,7 +450,7 @@ public class L2Party extends AbstractPlayerGroup // Sign already assigned // If the sign is applied on the same target, remove it _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); + _members.forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); } else { @@ -462,7 +462,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); @@ -502,19 +502,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isInDuel()) @@ -573,25 +573,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(ExCloseMPCC.STATIC_PACKET); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -653,7 +653,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -663,9 +663,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -800,7 +800,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -930,11 +930,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2SiegeClan.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2SiegeClan.java index 2ba2a8a219..57266247c3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2SiegeClan.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2SiegeClan.java @@ -53,12 +53,12 @@ public class L2SiegeClan flag.deleteMe(); - return getFlag().remove(flag); + return _flags.remove(flag); } public void removeFlags() { - for (L2Npc flag : getFlag()) + for (L2Npc flag : _flags) { removeFlag(flag); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java index 1b7cb26b50..f36fed74eb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -511,7 +511,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocz = loc.getZ(); setLocation(loc); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -519,9 +519,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -539,16 +539,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } // Set custom Npc server side name and title @@ -670,7 +670,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } public final boolean getRandomWalking() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 97608b326d..4a88a92311 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java index 4b5e290517..3794527a37 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Location.java @@ -190,6 +190,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java index 4eb38cf27b..ef36048457 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -136,16 +136,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -200,12 +200,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + int choice = Rnd.nextInt(getMobs().size()); for (L2ControllableMobInstance mob : getMobs()) { if (--choice == 0) @@ -220,7 +220,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroupTable.java index da1b620a40..121e34e9c4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Petition.java index cbed80441a..ff4816d7ef 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TempItem.java index fa918cfc55..db4b2f817f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TempItem.java @@ -28,7 +28,7 @@ public final class TempItem { private final int _itemId; private int _quantity; - private final int _referencePrice; + private final long _referencePrice; private final String _itemName; /** @@ -60,7 +60,7 @@ public final class TempItem _quantity = quantity; } - public int getReferencePrice() + public long getReferencePrice() { return _referencePrice; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java index 197f137df5..7d0fa18073 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/TradeList.java @@ -195,7 +195,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -209,13 +209,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -265,7 +265,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -312,7 +312,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -607,15 +607,15 @@ public class TradeList boolean success = false; // check weight and slots - if (!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()) || !partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())) + if ((!_owner.getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if (!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())) || !partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))) + else if ((!_owner.getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -624,7 +624,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -649,7 +649,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -705,7 +705,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 992034e9a3..7ce13bb716 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -212,7 +212,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -243,7 +243,7 @@ public class L2Attackable extends L2Npc addDamage(attacker, (int) value, skill); // Check Raidboss attack. Character will be petrified if attacking a raid that's more than 8 levels lower. In retail you deal damage to raid before curse. - if (isRaid() && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) + if (_isRaid && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) { if (attacker.getLevel() > (getLevel() + 8)) { @@ -390,7 +390,7 @@ public class L2Attackable extends L2Npc } // Calculate raidboss points - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final L2PcInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer(); broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); @@ -484,7 +484,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -493,8 +493,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -519,7 +519,7 @@ public class L2Attackable extends L2Npc } clan.addHuntingPoints(attacker, this, finalExp); } - attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, isRaid()), true, false); + attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp); } } @@ -596,7 +596,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -607,8 +607,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -988,7 +988,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -1030,7 +1030,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1040,7 +1040,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); sm.addString(getName()); @@ -1052,7 +1052,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) + if (Config.CHAMPION_ENABLE && _champion && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY); final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty); @@ -1234,7 +1234,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() != _spoilerObjectId) && !sweeper.isInLooterParty(_spoilerObjectId)) { if (sendMessage) { @@ -1438,7 +1438,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1512,7 +1512,7 @@ public class L2Attackable extends L2Npc if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (isMonster() && !getTemplate().isUndying() && !_isRaid && !_isRaidMinion && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -1737,7 +1737,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b8662c6e57..a5d7f51aa7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -499,13 +499,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public double getCollisionRadius() { - final double defaultCollisionRadius = getTemplate().getCollisionRadius(); + final double defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } public double getCollisionHeight() { - final double defaultCollisionHeight = getTemplate().getCollisionHeight(); + final double defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -530,7 +530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -550,9 +550,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Stop on creature see task and clear the data @@ -584,7 +584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -649,8 +649,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -703,8 +703,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // HP - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); - su.addUpdate(StatusUpdateType.CUR_HP, (int) getCurrentHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); + su.addUpdate(StatusUpdateType.CUR_HP, (int) _status.getCurrentHp()); // MP computeStatusUpdate(su, StatusUpdateType.MAX_MP); @@ -1053,7 +1053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe mpConsume = weaponItem.getReducedMpConsume(); } mpConsume = isAffected(EffectFlag.CHEAPSHOT) ? 0 : mpConsume; - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1065,7 +1065,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } } } @@ -1073,7 +1073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final WeaponType attackType = getAttackType(); final boolean isTwoHanded = (weaponItem != null) && (weaponItem.getBodyPart() == L2Item.SLOT_LR_HAND); - final int timeAtk = Formulas.calculateTimeBetweenAttacks(getPAtkSpd()); + final int timeAtk = Formulas.calculateTimeBetweenAttacks(_stat.getPAtkSpd()); final int timeToHit = Formulas.calculateTimeToHit(timeAtk, weaponType, isTwoHanded, false); _attackEndTime = System.nanoTime() + (TimeUnit.MILLISECONDS.toNanos(timeAtk)); @@ -1196,12 +1196,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackCountMax = (int) getStat().getValue(Stats.ATTACK_COUNT_MAX, 1); - if ((attackCountMax > 1) && !(getStat().getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) + int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1); + if ((attackCountMax > 1) && !(_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) { final double headingAngle = Util.convertHeadingToDegree(getHeading()); - final int maxRadius = getStat().getPhysicalAttackRadius(); - final int physicalAttackAngle = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRadius(); + final int physicalAttackAngle = _stat.getPhysicalAttackAngle(); for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius)) { // Skip main target. @@ -1251,7 +1251,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss) { shld = Formulas.calcShldUse(this, target); - crit = Formulas.calcCrit(getStat().getCriticalHit(), this, target, null); + crit = Formulas.calcCrit(_stat.getCriticalHit(), this, target, null); damage = (int) Formulas.calcAutoAttackDamage(this, target, shld, crit, shotConsumed); if (halfDamage) { @@ -1294,7 +1294,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Try casting the skill - final SkillCaster skillCaster = SkillCaster.castSkill(this, getTarget(), skill, item, castingType, ctrlPressed, shiftPressed); + final SkillCaster skillCaster = SkillCaster.castSkill(this, _target, skill, item, castingType, ctrlPressed, shiftPressed); if ((skillCaster == null) && isPlayer()) { // Skill casting failed, notify player. @@ -1612,7 +1612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); if (isMonster()) { @@ -1676,9 +1676,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Remove all effects, do not broadcast changes. @@ -1696,26 +1696,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -1855,7 +1855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; } public final boolean isConfused() @@ -1915,7 +1915,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return hasBlockActions() || isRooted() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting(); + return hasBlockActions() || isRooted() || _isOverloaded || _isImmobilized || isAlikeDead() || _isTeleporting; } public final boolean isOverloaded() @@ -1934,7 +1934,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2023,7 +2023,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2048,7 +2048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2379,7 +2379,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.STUN); + _effectList.stopEffects(AbnormalType.STUN); } if (!isPlayer()) @@ -2402,11 +2402,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.TRANSFORM); - getEffectList().stopEffects(AbnormalType.CHANGEBODY); + _effectList.stopEffects(AbnormalType.TRANSFORM); + _effectList.stopEffects(AbnormalType.CHANGEBODY); } - if (isTransformed()) + if (_transform.isPresent()) { untransform(); } @@ -2517,7 +2517,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet. - if (isMoving() && (getMoveSpeed() <= 0)) + if (isMoving() && (_stat.getMoveSpeed() <= 0)) { stopMove(null); } @@ -2585,7 +2585,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxCp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp()); } break; } @@ -2597,7 +2597,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); } break; } @@ -2609,7 +2609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxMp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp()); } break; } @@ -2682,7 +2682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2924,7 +2924,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided @@ -2940,7 +2940,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -3147,7 +3147,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -3174,7 +3174,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -3252,7 +3252,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -3381,7 +3381,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -3428,7 +3428,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -3623,7 +3623,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void onHitTimeNotDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3652,7 +3652,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onFirstHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime, int delayForSecondAttack) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3682,7 +3682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onSecondHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime1, int hitTime2, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3970,10 +3970,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Stop all effects of that skill if (oldSkill.isPassive()) { - getEffectList().stopSkillEffects(true, oldSkill); + _effectList.stopSkillEffects(true, oldSkill); } - getStat().recalculateStats(true); + _stat.recalculateStats(true); } if (newSkill.isPassive()) @@ -4008,7 +4008,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) { stopSkillEffects(true, oldSkill.getId()); - getStat().recalculateStats(true); + _stat.recalculateStats(true); } } @@ -4105,7 +4105,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - final int random = (int) getStat().getValue(Stats.RANDOM_DAMAGE); + final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE); return (1 + ((double) Rnd.get(-random, random) / 100)); } @@ -4127,193 +4127,193 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public int getMagicAccuracy() { - return getStat().getMagicAccuracy(); + return _stat.getMagicAccuracy(); } public int getMagicEvasionRate() { - return getStat().getMagicEvasionRate(); + return _stat.getMagicEvasionRate(); } public final double getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(int init) { - return getStat().getCriticalDmg(init); + return _stat.getCriticalDmg(init); } public int getCriticalHit() { - return getStat().getCriticalHit(); + return _stat.getCriticalHit(); } public int getEvasionRate() { - return getStat().getEvasionRate(); + return _stat.getEvasionRate(); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public int getMAtk() { - return getStat().getMAtk(); + return _stat.getMAtk(); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit() { - return getStat().getMCriticalHit(); + return _stat.getMCriticalHit(); } public int getMDef() { - return getStat().getMDef(); + return _stat.getMDef(); } public int getPAtk() { - return getStat().getPAtk(); + return _stat.getPAtk(); } public int getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public int getPDef() { - return getStat().getPDef(); + return _stat.getPDef(); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } public int getLUC() { - return getStat().getLUC(); + return _stat.getLUC(); } public int getCHA() { - return getStat().getCHA(); + return _stat.getCHA(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) @@ -4338,7 +4338,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // RearDamage effect bonus. if (isBehind(target)) { - damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1); } // Counterattacks happen before damage received. @@ -4383,27 +4383,27 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Absorb HP from the damage inflicted double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1); - if ((absorbPercent > 0) && (Rnd.nextDouble() < getStat().getValue(Stats.ABSORB_DAMAGE_CHANCE))) + if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE))) { - int absorbDamage = (int) Math.min(absorbPercent * damage, getMaxRecoverableHp() - getCurrentHp()); + int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp()); if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted. Unconfirmed for skill attacks. if (skill == null) { - absorbPercent = getStat().getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); + absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); if (absorbPercent > 0) { - int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, getMaxRecoverableMp() - getCurrentMp()); + int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp()); if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } } @@ -4448,7 +4448,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - final double damageCap = getStat().getValue(Stats.DAMAGE_LIMIT); + final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT); if (damageCap > 0) { value = Math.min(value, damageCap); @@ -4459,17 +4459,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + getStat().getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; } else { - value *= (100 + getStat().getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; } } if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } else if (isPlayer()) { @@ -4477,7 +4477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } if (attacker != null) @@ -4488,83 +4488,83 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final int getCurrentCpPercent() { - return (int) ((getCurrentCp() * 100) / getMaxCp()); + return (int) ((_status.getCurrentCp() * 100) / _stat.getMaxCp()); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final void setCurrentCp(double newCp, boolean broadcast) { - getStatus().setCurrentCp(newCp, broadcast); + _status.setCurrentCp(newCp, broadcast); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final int getCurrentHpPercent() { - return (int) ((getCurrentHp() * 100) / getMaxHp()); + return (int) ((_status.getCurrentHp() * 100) / _stat.getMaxHp()); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHp(double newHp, boolean broadcast) { - getStatus().setCurrentHp(newHp, broadcast); + _status.setCurrentHp(newHp, broadcast); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final int getCurrentMpPercent() { - return (int) ((getCurrentMp() * 100) / getMaxMp()); + return (int) ((_status.getCurrentMp() * 100) / _stat.getMaxMp()); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } public final void setCurrentMp(double newMp, boolean broadcast) { - getStatus().setCurrentMp(newMp, false); + _status.setCurrentMp(newMp, false); } /** @@ -4577,7 +4577,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); - return (int) getStat().getValue(Stats.WEIGHT_LIMIT, baseLoad); + return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad); } return 0; } @@ -4586,7 +4586,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (isPlayer() || isPet()) { - return (int) getStat().getValue(Stats.WEIGHT_PENALTY, 1); + return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1); } return 0; } @@ -4623,17 +4623,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public AttributeType getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(AttributeType attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(AttributeType defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -4852,8 +4852,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return weapon.getItemType(); } - final WeaponType defaultWeaponType = getTemplate().getBaseAttackType(); - return getTransformation().map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); + final WeaponType defaultWeaponType = _template.getBaseAttackType(); + return _transform.map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); } public final boolean isInCategory(CategoryType type) @@ -5001,7 +5001,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).collect(Collectors.toList()); + return _skillCasters.values().stream().filter(filter).collect(Collectors.toList()); } @SafeVarargs @@ -5012,7 +5012,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).findAny().orElse(null); + return _skillCasters.values().stream().filter(filter).findAny().orElse(null); } /** @@ -5098,7 +5098,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -5128,7 +5128,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override @@ -5200,7 +5200,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean hasAbnormalType(AbnormalType abnormalType) { - return getEffectList().hasAbnormalType(abnormalType); + return _effectList.hasAbnormalType(abnormalType); } public void addBlockActionsAllowedSkill(int skillId) @@ -5267,11 +5267,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public MoveType getMoveType() { - if (isMoving() && isRunning()) + if (isMoving() && _isRunning) { return MoveType.RUNNING; } - else if (isMoving() && !isRunning()) + else if (isMoving() && !_isRunning) { return MoveType.WALKING; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 079ee69cb1..b9d283653d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -372,7 +372,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -514,7 +514,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -745,7 +745,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -925,7 +925,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getReputation() >= 0)) @@ -999,10 +999,9 @@ public class L2Npc extends L2Character DecayTaskManager.getInstance().add(this); - final L2Spawn spawn = getSpawn(); - if (spawn != null) + if (_spawn != null) { - final NpcSpawnTemplate npcTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcTemplate = _spawn.getNpcSpawnTemplate(); if (npcTemplate != null) { npcTemplate.notifyNpcDeath(this, killer); @@ -1140,7 +1139,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1228,7 +1227,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1299,7 +1298,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1318,7 +1317,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1394,7 +1393,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic, boolean fish) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1474,7 +1473,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** @@ -1784,10 +1783,9 @@ public class L2Npc extends L2Character return _params; } - final L2Spawn spawn = getSpawn(); - if (spawn != null) // Minions doesn't have L2Spawn object bound + if (_spawn != null) // Minions doesn't have L2Spawn object bound { - final NpcSpawnTemplate npcSpawnTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { final StatsSet params = getTemplate().getParameters(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 7570bd494b..7249f1e9cc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -118,15 +118,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -196,7 +196,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if (player == getOwner()) + if (player == _owner) { player.sendPacket(new PetInfo(this, 1)); return; @@ -242,19 +242,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getReputation() { - return getOwner() != null ? getOwner().getReputation() : 0; + return _owner != null ? _owner.getReputation() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -313,8 +313,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -326,7 +325,7 @@ public abstract class L2Summon extends L2Playable final AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -392,7 +391,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); } @@ -434,12 +433,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } @@ -477,7 +476,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -546,7 +545,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, L2ItemInstance item, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -654,7 +653,7 @@ public abstract class L2Summon extends L2Playable if (skill.isBad()) { // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; @@ -673,7 +672,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -695,13 +694,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (crit) { @@ -715,14 +714,14 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } final SystemMessage sm; - if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF))) + if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF))) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } @@ -744,7 +743,7 @@ public abstract class L2Summon extends L2Playable { super.reduceCurrentHp(damage, attacker, skill); - if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) + if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -757,14 +756,13 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); - if ((skill.getTarget(this, false, false, false) == null) && !actingPlayer.getAccessLevel().allowPeaceAttack()) + if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance - actingPlayer.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + _owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // Send a Server->Client packet ActionFailed to the L2PcInstance - actingPlayer.sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -774,18 +772,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -796,10 +794,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } } @@ -807,7 +805,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -842,7 +840,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, isDead() ? 0 : 1)); if (isPet()) @@ -870,7 +868,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -904,7 +902,7 @@ public abstract class L2Summon extends L2Playable */ public void doAttack(L2Object target) { - if (getOwner() != null) + if (_owner != null) { if (target != null) { @@ -912,7 +910,7 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -926,12 +924,12 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(L2Object target, boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - if ((target == null) || (this == target) || (getOwner() == target)) + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -940,7 +938,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -960,28 +958,28 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -994,7 +992,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1014,18 +1012,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1041,14 +1039,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1059,7 +1057,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1071,14 +1069,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1086,13 +1084,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() @@ -1144,7 +1142,7 @@ public abstract class L2Summon extends L2Playable public void sendInventoryUpdate(InventoryUpdate iu) { - final L2PcInstance owner = getOwner(); + final L2PcInstance owner = _owner; if (owner != null) { owner.sendInventoryUpdate(iu); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index fe1f4c81cf..a03a262e08 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -74,7 +74,7 @@ public class PcAppearance { if (_visibleName == null) { - return getOwner().getName(); + return _owner.getName(); } return _visibleName; } @@ -94,7 +94,7 @@ public class PcAppearance { if (_visibleTitle == null) { - return getOwner().getTitle(); + return _owner.getTitle(); } return _visibleTitle; } @@ -220,27 +220,27 @@ public class PcAppearance public int getVisibleClanId() { - return _visibleClanId != -1 ? _visibleClanId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanId(); + return _visibleClanId != -1 ? _visibleClanId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanId(); } public int getVisibleClanCrestId() { - return _visibleClanCrestId != -1 ? _visibleClanCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestId(); + return _visibleClanCrestId != -1 ? _visibleClanCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestId(); } public int getVisibleClanLargeCrestId() { - return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestLargeId(); + return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestLargeId(); } public int getVisibleAllyId() { - return _visibleAllyId != -1 ? _visibleAllyId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyId(); + return _visibleAllyId != -1 ? _visibleAllyId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyId(); } public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 91548e2a10..7aae137ada 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -53,7 +53,7 @@ public class L2DecoyInstance extends L2Character _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; final int skilllevel = getTemplate().getDisplayId() - 13070; - _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); + _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -269,18 +269,18 @@ public class L2DecoyInstance extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index baab09b858..d82f30b44d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class L2DoorInstance extends L2Character { - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isInverted = false; private int _meshindex = 1; @@ -293,7 +293,7 @@ public final class L2DoorInstance extends L2Character { return false; } - else if (getIsAttackableDoor()) + else if (_isAttackableDoor) { return true; } @@ -369,13 +369,13 @@ public final class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - oe = new OnEventTrigger(getEmitter(), !isOpen()); + oe = new OnEventTrigger(getEmitter(), !_open); } else { - oe = new OnEventTrigger(getEmitter(), isOpen()); + oe = new OnEventTrigger(getEmitter(), _open); } } @@ -592,13 +592,13 @@ public final class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), !isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), !_open)); } else { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), _open)); } } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -649,7 +649,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -661,8 +661,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -671,7 +670,7 @@ public final class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 35cb265650..53df3b876a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -75,7 +75,7 @@ public class L2MonsterInstance extends L2Attackable } // Check if the L2MonsterInstance target is aggressive - if (Config.GUARD_ATTACK_AGGRO_MOB && isAggressive() && (attacker instanceof L2GuardInstance)) + if (Config.GUARD_ATTACK_AGGRO_MOB && getTemplate().isAggressive() && (attacker instanceof L2GuardInstance)) { return true; } @@ -108,11 +108,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -173,9 +173,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -229,7 +229,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -238,7 +238,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 26a7520e42..eed738e70c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -504,7 +504,7 @@ public final class L2PcInstance extends L2Playable private AdminTeleportType _teleportType = AdminTeleportType.NORMAL; private boolean _inCrystallize; - private boolean _inCraftMode; + private boolean _isCrafting; private long _offlineShopStart = 0; @@ -906,7 +906,7 @@ public final class L2PcInstance extends L2Playable public String getAccountName() { - return _client == null ? getAccountNamePlayer() : _client.getAccountName(); + return _client == null ? _accountName : _client.getAccountName(); } public String getAccountNamePlayer() @@ -923,7 +923,7 @@ public final class L2PcInstance extends L2Playable { int result = 0; - if (getClan() != null) + if (_clan != null) { result |= RelationChanged.RELATION_CLAN_MEMBER; if (getClan() == target.getClan()) @@ -942,9 +942,9 @@ public final class L2PcInstance extends L2Playable if ((getParty() != null) && (getParty() == target.getParty())) { result |= RelationChanged.RELATION_HAS_PARTY; - for (int i = 0; i < getParty().getMembers().size(); i++) + for (int i = 0; i < _party.getMembers().size(); i++) { - if (getParty().getMembers().get(i) != this) + if (_party.getMembers().get(i) != this) { continue; } @@ -998,7 +998,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getSiegeState() != 0) + if (_siegeState != 0) { result |= RelationChanged.RELATION_INSIEGE; if (getSiegeState() != target.getSiegeState()) @@ -1009,7 +1009,7 @@ public final class L2PcInstance extends L2Playable { result |= RelationChanged.RELATION_ALLY; } - if (getSiegeState() == 1) + if (_siegeState == 1) { result |= RelationChanged.RELATION_ATTACKER; } @@ -1025,7 +1025,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getBlockCheckerArena() != -1) + if (_handysBlockCheckerEventArena != -1) { result |= RelationChanged.RELATION_INSIEGE; final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); @@ -1225,17 +1225,17 @@ public final class L2PcInstance extends L2Playable public boolean isInStoreMode() { - return getPrivateStoreType() != PrivateStoreType.NONE; + return _privateStoreType != PrivateStoreType.NONE; } - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** @@ -1312,7 +1312,7 @@ public final class L2PcInstance extends L2Playable LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) { @@ -1445,13 +1445,13 @@ public final class L2PcInstance extends L2Playable return; } - final L2Npc target = getLastFolkNPC(); + final L2Npc target = _lastFolkNpc; if ((target != null) && isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false)) { quest.notifyEvent(event, target, this); } - else if (getLastQuestNpcObject() > 0) + else if (_questNpcObject > 0) { final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); @@ -1652,7 +1652,7 @@ public final class L2PcInstance extends L2Playable @Override public void updatePvPFlag(int value) { - if (getPvpFlag() == value) + if (_pvpFlag == value) { return; } @@ -1670,7 +1670,7 @@ public final class L2PcInstance extends L2Playable if (hasSummon()) { final RelationChanged rc = new RelationChanged(); - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, getRelation(this), false); @@ -1697,7 +1697,7 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, relation, isAutoAttackable(player)); @@ -2104,7 +2104,7 @@ public final class L2PcInstance extends L2Playable weaponPenalty = weaponPenalty - expertiseLevel - bonus; weaponPenalty = Math.min(Math.max(weaponPenalty, 0), 4); - if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) + if ((_expertiseWeaponPenalty != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) { _expertiseWeaponPenalty = weaponPenalty; if (_expertiseWeaponPenalty > 0) @@ -2122,7 +2122,7 @@ public final class L2PcInstance extends L2Playable armorPenalty = armorPenalty - expertiseLevel - bonus; armorPenalty = Math.min(Math.max(armorPenalty, 0), 4); - if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) + if ((_expertiseArmorPenalty != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) { _expertiseArmorPenalty = armorPenalty; if (_expertiseArmorPenalty > 0) @@ -2165,20 +2165,20 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - final int slot = getInventory().getSlotFromItem(item); + final int slot = _inventory.getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { - items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + items = _inventory.unEquipItemInSlotAndRecord(item.getLocationSlot()); } else { - items = getInventory().unEquipItemInBodySlotAndRecord(slot); + items = _inventory.unEquipItemInBodySlotAndRecord(slot); } } else { - items = getInventory().equipItemAndRecord(item); + items = _inventory.equipItemAndRecord(item); if (item.isEquipped()) { @@ -2290,7 +2290,7 @@ public final class L2PcInstance extends L2Playable */ public void increaseRaidbossPoints(int increasePoints) { - setRaidbossPoints(getRaidbossPoints() + increasePoints); + setRaidbossPoints(_raidbossPoints + increasePoints); } /** @@ -2316,17 +2316,17 @@ public final class L2PcInstance extends L2Playable { if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.THIRD)) { - if (getLvlJoinedAcademy() <= 16) + if (_lvlJoinedAcademy <= 16) { _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); } - else if (getLvlJoinedAcademy() >= 39) + else if (_lvlJoinedAcademy >= 39) { _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -2338,7 +2338,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES); // receive graduation gift - getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet + _inventory.addItem("Gift", 8181, 1, this, null); // give academy circlet } if (isSubClassActive()) { @@ -2359,12 +2359,12 @@ public final class L2PcInstance extends L2Playable // Update class icon in party and clan if (isInParty()) { - getParty().broadcastPacket(new PartySmallWindowUpdate(this, true)); + _party.broadcastPacket(new PartySmallWindowUpdate(this, true)); } - if (getClan() != null) + if (_clan != null) { - getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); + _clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); } sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED)); @@ -2513,33 +2513,32 @@ public final class L2PcInstance extends L2Playable } // Add Hero skills if hero - if (isHero()) + if (_hero) { setHero(true); } // Add clan skills - if (getClan() != null) + if (_clan != null) { - final L2Clan clan = getClan(); - clan.addSkillEffects(this); + _clan.addSkillEffects(this); - if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) + if ((_clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) { SiegeManager.getInstance().addSiegeSkills(this); } - if (getClan().getCastleId() > 0) + if (_clan.getCastleId() > 0) { CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this); } - if (getClan().getFortId() > 0) + if (_clan.getFortId() > 0) { FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this); } } // Reload passive skills from armors / jewels / weapons - getInventory().reloadEquippedItems(); + _inventory.reloadEquippedItems(); } /** @@ -2692,13 +2691,12 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info - if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) + if ((_clan != null) && (_clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -2836,7 +2834,7 @@ public final class L2PcInstance extends L2Playable */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().isSitForced()) + if (L2Event.isParticipant(this) && eventStatus.isSitForced()) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -2990,7 +2988,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAdena()) + if (count > _inventory.getAdena()) { if (sendMessage) { @@ -3040,7 +3038,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceBeautyTickets(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getBeautyTickets()) + if (count > _inventory.getBeautyTickets()) { if (sendMessage) { @@ -3134,7 +3132,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAncientAdena()) + if (count > _inventory.getAncientAdena()) { if (sendMessage) { @@ -3540,7 +3538,7 @@ public final class L2PcInstance extends L2Playable { return null; } - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3624,7 +3622,7 @@ public final class L2PcInstance extends L2Playable */ public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) { - final PcInventory inv = getInventory(); + final PcInventory inv = _inventory; if (!inv.validateCapacityByItemId(rewardId, count)) { if (sendMessage) @@ -3826,7 +3824,7 @@ public final class L2PcInstance extends L2Playable return null; } - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -3847,8 +3845,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return null; } @@ -4052,10 +4049,8 @@ public final class L2PcInstance extends L2Playable final boolean needHpUpdate = needHpUpdate(); final boolean needMpUpdate = needMpUpdate(); - final L2Party party = getParty(); - // Check if a party is in progress and party window update is usefull - if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) + if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) { final PartySmallWindowUpdate partyWindow = new PartySmallWindowUpdate(this, false); if (needCpUpdate) @@ -4073,10 +4068,10 @@ public final class L2PcInstance extends L2Playable partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP); partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP); } - party.broadcastToPartyMembers(this, partyWindow); + _party.broadcastToPartyMembers(this, partyWindow); } - if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) + if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) { final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); if ((game != null) && game.isBattleStarted()) @@ -4086,7 +4081,7 @@ public final class L2PcInstance extends L2Playable } // In duel MP updated only with CP or HP - if (isInDuel() && (needCpUpdate || needHpUpdate)) + if (_isInDuel && (needCpUpdate || needHpUpdate)) { DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this)); } @@ -4173,10 +4168,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4214,10 +4208,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4246,15 +4239,15 @@ public final class L2PcInstance extends L2Playable public int getAllyCrestId() { - if (getClanId() == 0) + if (_clanId == 0) { return 0; } - if (getClan().getAllyId() == 0) + if (_clan.getAllyId() == 0) { return 0; } - return getClan().getAllyCrestId(); + return _clan.getAllyCrestId(); } /** @@ -4293,22 +4286,21 @@ public final class L2PcInstance extends L2Playable { if (target instanceof L2PcInstance) { - final L2PcInstance temp = (L2PcInstance) target; + final L2PcInstance targetPlayer = (L2PcInstance) target; sendPacket(ActionFailed.STATIC_PACKET); - if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) + if ((targetPlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (targetPlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) { - sendPacket(new PrivateStoreListSell(this, temp)); + sendPacket(new PrivateStoreListSell(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.BUY) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.BUY) { - sendPacket(new PrivateStoreListBuy(this, temp)); + sendPacket(new PrivateStoreListBuy(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) { - sendPacket(new RecipeShopSellList(this, temp)); + sendPacket(new RecipeShopSellList(this, targetPlayer)); } - } else if (target != null) // _interactTarget=null should never happen but one never knows ^^; { @@ -4333,7 +4325,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) { - getParty().distributeItem(this, itemId, itemCount, false, target); + _party.distributeItem(this, itemId, itemCount, false, target); } else if (itemId == Inventory.ADENA_ID) { @@ -4413,7 +4405,7 @@ public final class L2PcInstance extends L2Playable return; } - if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) + if (((isInParty() && (_party.getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -4522,9 +4514,9 @@ public final class L2PcInstance extends L2Playable // Check if a Party is in progress if (isInParty()) { - getParty().distributeItem(this, target); + _party.distributeItem(this, target); } - else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) + else if ((target.getId() == Inventory.ADENA_ID) && (_inventory.getAdenaInstance() != null)) { addAdena("Pickup", target.getCount(), null, true); ItemTable.getInstance().destroyItem("Pickup", target, this, null); @@ -4533,7 +4525,7 @@ public final class L2PcInstance extends L2Playable { addItem("Pickup", target, null, true); // Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts. - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { final L2EtcItem etcItem = target.getEtcItem(); @@ -4582,13 +4574,13 @@ public final class L2PcInstance extends L2Playable } } - return !isSellingBuffs() && !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); + return !_isSellingBuffs && !isAlikeDead() && !_inOlympiadMode && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); } @Override public int getMinShopDistance() { - return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return _waitTypeSitting ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4596,13 +4588,13 @@ public final class L2PcInstance extends L2Playable // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death) if (canOpenPrivateStore()) { - if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) + if ((_privateStoreType == PrivateStoreType.BUY) || (_privateStoreType == PrivateStoreType.BUY_MANAGE)) { setPrivateStoreType(PrivateStoreType.NONE); } - if (getPrivateStoreType() == PrivateStoreType.NONE) + if (_privateStoreType == PrivateStoreType.NONE) { - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -4644,7 +4636,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -4729,7 +4721,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getActiveWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); } /** @@ -4741,7 +4733,7 @@ public final class L2PcInstance extends L2Playable final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { - return getFistsWeaponItem(); + return _fistsWeaponItem; } return (L2Weapon) weapon.getItem(); @@ -4749,12 +4741,12 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance getChestArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); } public L2ItemInstance getLegsArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LEGS); } public L2Armor getActiveChestArmorItem() @@ -4795,7 +4787,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) { return true; } @@ -4817,7 +4809,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) { return true; } @@ -4839,7 +4831,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) { return true; } @@ -4853,7 +4845,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getSecondaryWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); } /** @@ -4863,7 +4855,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -4903,12 +4895,12 @@ public final class L2PcInstance extends L2Playable !(Config.DISABLE_REWARDS_IN_PVP_ZONES && isInsideZone(ZoneId.PVP))) { // pvp - if (Config.REWARD_PVP_ITEM && (getPvpFlag() != 0)) + if (Config.REWARD_PVP_ITEM && (_pvpFlag != 0)) { pk.addItem("PvP Item Reward", Config.REWARD_PVP_ITEM_ID, Config.REWARD_PVP_ITEM_AMOUNT, this, Config.REWARD_PVP_ITEM_MESSAGE); } // pk - if (Config.REWARD_PK_ITEM && (getPvpFlag() == 0)) + if (Config.REWARD_PK_ITEM && (_pvpFlag == 0)) { pk.addItem("PK Item Reward", Config.REWARD_PK_ITEM_ID, Config.REWARD_PK_ITEM_AMOUNT, this, Config.REWARD_PK_ITEM_MESSAGE); } @@ -4919,7 +4911,7 @@ public final class L2PcInstance extends L2Playable if (Config.ANNOUNCE_PK_PVP && (((pk != null) && !pk.isGM()) || fpcKill)) { String msg = ""; - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4933,7 +4925,7 @@ public final class L2PcInstance extends L2Playable Broadcast.toAllOnlinePlayers(msg, false); } } - else if (getPvpFlag() != 0) + else if (_pvpFlag != 0) { msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4949,7 +4941,7 @@ public final class L2PcInstance extends L2Playable } } - if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (getPvpFlag() == 0) && (getReputation() >= 0)) + if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (_pvpFlag == 0) && (getReputation() >= 0)) { killer.setReputation(killer.getReputation() - 150); } @@ -4959,6 +4951,9 @@ public final class L2PcInstance extends L2Playable // Clear resurrect xp calculation setExpBeforeDeath(0); + // Calculate Shilen's Breath debuff level. It must happen right before death, because buffs aren't applied on dead characters. + calculateShilensBreathDebuffLevel(killer); + // Kill the L2PcInstance if (!super.doDie(killer)) { @@ -4970,7 +4965,7 @@ public final class L2PcInstance extends L2Playable { CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer); } - else if (isCombatFlagEquipped()) + else if (_combatFlagEquippedId) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -4979,9 +4974,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } else @@ -4994,7 +4989,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && (pk != null)) { final L2Clan pkClan = pk.getClan(); - if ((pkClan != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pkClan != null) && (_clan != null) && !isAcademyMember() && !(pk.isAcademyMember())) { final ClanWar clanWar = _clan.getWarWith(pkClan.getId()); if ((clanWar != null) && AntiFeedManager.getInstance().check(killer, this)) @@ -5012,9 +5007,6 @@ public final class L2PcInstance extends L2Playable } } - // calculate Shilen's Breath debuff level - calculateShilensBreathDebuffLevel(killer); - if (isMounted()) { stopFeed(); @@ -5039,7 +5031,7 @@ public final class L2PcInstance extends L2Playable getSkillChannelized().abortChannelization(); } - if (getAgathionId() != 0) + if (_agathionId != 0) { setAgathionId(0); } @@ -5067,8 +5059,8 @@ public final class L2PcInstance extends L2Playable } final L2PcInstance pk = killer.getActingPlayer(); - if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) - // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) + if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) + // || _clan.isAtWarWith(((L2PcInstance)killer).getClanId()) )) { return; @@ -5085,7 +5077,7 @@ public final class L2PcInstance extends L2Playable int dropLimit = 0; int dropPercent = 0; - if ((getReputation() < 0) && (getPkKills() >= pkLimit)) + if ((getReputation() < 0) && (_pkKills >= pkLimit)) { isKarmaDrop = true; dropPercent = Config.KARMA_RATE_DROP; @@ -5107,16 +5099,15 @@ public final class L2PcInstance extends L2Playable { int dropCount = 0; int itemDropPercent = 0; - final L2Summon pet = getPet(); - for (L2ItemInstance itemDrop : getInventory().getItems()) + for (L2ItemInstance itemDrop : _inventory.getItems()) { // Don't drop if (itemDrop.isShadowItem() || // Dont drop Shadow Items itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items !itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena (itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items - ((pet != null) && (pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet + ((_pet != null) && (_pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list )) @@ -5128,7 +5119,7 @@ public final class L2PcInstance extends L2Playable { // Set proper chance according to Item type of equipped Item itemDropPercent = itemDrop.getItem().getType2() == L2Item.TYPE2_WEAPON ? dropEquipWeapon : dropEquip; - getInventory().unEquipItemInSlot(itemDrop.getLocationSlot()); + _inventory.unEquipItemInSlot(itemDrop.getLocationSlot()); } else { @@ -5161,80 +5152,78 @@ public final class L2PcInstance extends L2Playable public void onPlayerKill(L2Playable killedPlayable) { - final L2PcInstance player = getActingPlayer(); final L2PcInstance killedPlayer = killedPlayable.getActingPlayer(); // Avoid nulls && check if player != killedPlayer - if ((player == null) || (killedPlayer == null) || (player == killedPlayer)) + if ((killedPlayer == null) || (this == killedPlayer)) { return; } // Cursed weapons progress - if (player.isCursedWeaponEquipped() && killedPlayer.isPlayer()) + if (isCursedWeaponEquipped() && killedPlayer.isPlayer()) { CursedWeaponsManager.getInstance().increaseKills(getCursedWeaponEquippedId()); return; } // Duel support - if (player.isInDuel() && killedPlayer.getActingPlayer().isInDuel()) + if (isInDuel() && killedPlayer.isInDuel()) { return; } // Do nothing if both players are in PVP zone - if (player.isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) + if (isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) { return; } // If both players are in SIEGE zone just increase siege kills/deaths - if (player.isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) + if (isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) { - if ((player.getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (player.getSiegeState() != killedPlayer.getSiegeState())) + if ((getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (getSiegeState() != killedPlayer.getSiegeState())) { - final L2Clan killerClan = player.getClan(); final L2Clan targetClan = killedPlayer.getClan(); - if ((killerClan != null) && (targetClan != null)) + if ((_clan != null) && (targetClan != null)) { - killerClan.addSiegeKill(); + _clan.addSiegeKill(); targetClan.addSiegeDeath(); } } return; } - if (player.checkIfPvP(killedPlayer)) + if (checkIfPvP(killedPlayer)) { // Check if player should get + rep if (killedPlayer.getReputation() < 0) { - final int levelDiff = killedPlayer.getLevel() - player.getLevel(); - if ((player.getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours + final int levelDiff = killedPlayer.getLevel() - getLevel(); + if ((getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours { - player.setReputation(player.getReputation() + Config.REPUTATION_INCREASE); + setReputation(getReputation() + Config.REPUTATION_INCREASE); } } - player.setPvpKills(player.getPvpKills() + 1); + setPvpKills(_pvpKills + 1); } - else if ((getReputation() > 0) && (getPkKills() == 0)) + else if ((getReputation() > 0) && (_pkKills == 0)) { - player.setReputation(0); - player.setPkKills(player.getPkKills() + 1); + setReputation(0); + setPkKills(getPkKills() + 1); } else { // Calculate new karma and increase pk count - player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killedPlayable.isSummon())); - player.setPkKills(player.getPkKills() + 1); + setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); + setPkKills(getPkKills() + 1); } final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); - player.sendPacket(ui); - player.checkItemRestriction(); + sendPacket(ui); + checkItemRestriction(); } public void updatePvPStatus() @@ -5245,7 +5234,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5269,7 +5258,7 @@ public final class L2PcInstance extends L2Playable return; } - if (isInDuel() && (player_target.getDuelId() == getDuelId())) + if (_isInDuel && (player_target.getDuelId() == getDuelId())) { return; } @@ -5283,7 +5272,7 @@ public final class L2PcInstance extends L2Playable { setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5304,10 +5293,10 @@ public final class L2PcInstance extends L2Playable */ public void restoreExp(double restorePercent) { - if (getExpBeforeDeath() > 0) + if (_expBeforeDeath > 0) { // Restore the specified % of lost experience. - getStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100)); + getStat().addExp(Math.round(((_expBeforeDeath - getExp()) * restorePercent) / 100)); setExpBeforeDeath(0); } } @@ -5425,10 +5414,9 @@ public final class L2PcInstance extends L2Playable final List summons = new ArrayList<>(); summons.addAll(getServitors().values()); - final L2PetInstance pet = getPet(); - if (pet != null) + if (_pet != null) { - summons.add(pet); + summons.add(_pet); } return summons; @@ -5825,11 +5813,11 @@ public final class L2PcInstance extends L2Playable */ public boolean isClanLeader() { - if (getClan() == null) + if (_clan == null) { return false; } - return getObjectId() == getClan().getLeaderId(); + return getObjectId() == _clan.getLeaderId(); } /** @@ -5839,22 +5827,22 @@ public final class L2PcInstance extends L2Playable @Override protected boolean checkAndEquipAmmunition(EtcItemType type) { - L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + L2ItemInstance arrows = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (arrows == null) { final L2Weapon weapon = getActiveWeaponItem(); if (type == EtcItemType.ARROW) { - arrows = getInventory().findArrowForBow(weapon); + arrows = _inventory.findArrowForBow(weapon); } else if (type == EtcItemType.BOLT) { - arrows = getInventory().findBoltForCrossBow(weapon); + arrows = _inventory.findBoltForCrossBow(weapon); } if (arrows != null) { // Equip arrows needed in left hand - getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); + _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); sendItemList(false); return true; } @@ -5873,7 +5861,7 @@ public final class L2PcInstance extends L2Playable public boolean disarmWeapons() { // If there is no weapon to disarm then return true. - final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance wpn = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (wpn == null) { return true; @@ -5886,7 +5874,7 @@ public final class L2PcInstance extends L2Playable } // Don't allow disarming a Combat Flag or Territory Ward. - if (isCombatFlagEquipped()) + if (_combatFlagEquippedId) { return false; } @@ -5897,7 +5885,7 @@ public final class L2PcInstance extends L2Playable return false; } - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -5934,10 +5922,10 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -6045,7 +6033,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE); return false; } - else if (isSitting()) + else if (_waitTypeSitting) { // A strider can be ridden only when standing sendPacket(ActionFailed.STATIC_PACKET); @@ -6065,7 +6053,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); return false; } - else if (getInventory().getItemByItemId(9819) != null) + else if (_inventory.getItemByItemId(9819) != null) { sendPacket(ActionFailed.STATIC_PACKET); // FIXME: Wrong Message @@ -6095,7 +6083,7 @@ public final class L2PcInstance extends L2Playable } else if (isMounted()) { - if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) + if ((_mountType == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION); @@ -6244,12 +6232,12 @@ public final class L2PcInstance extends L2Playable public boolean isInCommandChannel() { - return isInParty() && getParty().isInCommandChannel(); + return isInParty() && _party.isInCommandChannel(); } public L2CommandChannel getCommandChannel() { - return (isInCommandChannel()) ? getParty().getCommandChannel() : null; + return (isInCommandChannel()) ? _party.getCommandChannel() : null; } /** @@ -6258,7 +6246,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isGM() { - return getAccessLevel().isGm(); + return _accessLevel.isGm(); } /** @@ -6289,8 +6277,8 @@ public final class L2PcInstance extends L2Playable _accessLevel = accessLevel; - getAppearance().setNameColor(_accessLevel.getNameColor()); - getAppearance().setTitleColor(_accessLevel.getTitleColor()); + _appearance.setNameColor(_accessLevel.getNameColor()); + _appearance.setTitleColor(_accessLevel.getTitleColor()); if (broadcast) { broadcastUserInfo(); @@ -6378,10 +6366,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -6451,32 +6438,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(8, getCurrentCp()); statement.setInt(9, getMaxMp()); statement.setDouble(10, getCurrentMp()); - statement.setInt(11, getAppearance().getFace()); - statement.setInt(12, getAppearance().getHairStyle()); - statement.setInt(13, getAppearance().getHairColor()); - statement.setInt(14, getAppearance().getSex() ? 1 : 0); + statement.setInt(11, _appearance.getFace()); + statement.setInt(12, _appearance.getHairStyle()); + statement.setInt(13, _appearance.getHairColor()); + statement.setInt(14, _appearance.getSex() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); - statement.setInt(18, getFame()); - statement.setInt(19, getRaidbossPoints()); - statement.setInt(20, getPvpKills()); - statement.setInt(21, getPkKills()); - statement.setInt(22, getClanId()); + statement.setInt(18, _fame); + statement.setInt(19, _raidbossPoints); + statement.setInt(20, _pvpKills); + statement.setInt(21, _pkKills); + statement.setInt(22, _clanId); statement.setInt(23, getRace().ordinal()); statement.setInt(24, getClassId().getId()); - statement.setLong(25, getDeleteTimer()); + statement.setLong(25, _deleteTimer); statement.setInt(26, hasDwarvenCraft() ? 1 : 0); statement.setString(27, getTitle()); - statement.setInt(28, getAppearance().getTitleColor()); + statement.setInt(28, _appearance.getTitleColor()); statement.setInt(29, isOnlineInt()); - statement.setInt(30, getClanPrivileges().getBitmask()); - statement.setInt(31, getWantsPeace()); - statement.setInt(32, getBaseClass()); + statement.setInt(30, _clanPrivileges.getBitmask()); + statement.setInt(31, _wantsPeace); + statement.setInt(32, _baseClass); statement.setInt(33, isNoble() ? 1 : 0); statement.setLong(34, 0); statement.setInt(35, PcStat.MIN_VITALITY_POINTS); - statement.setDate(36, new Date(getCreateDate().getTimeInMillis())); + statement.setDate(36, new Date(_createDate.getTimeInMillis())); statement.executeUpdate(); } catch (Exception e) @@ -7110,32 +7097,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(5, getCurrentCp()); statement.setInt(6, getMaxMp()); statement.setDouble(7, getCurrentMp()); - statement.setInt(8, getAppearance().getFace()); - statement.setInt(9, getAppearance().getHairStyle()); - statement.setInt(10, getAppearance().getHairColor()); - statement.setInt(11, getAppearance().getSex() ? 1 : 0); + statement.setInt(8, _appearance.getFace()); + statement.setInt(9, _appearance.getHairStyle()); + statement.setInt(10, _appearance.getHairColor()); + statement.setInt(11, _appearance.getSex() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); statement.setInt(15, _lastLoc != null ? _lastLoc.getZ() : getZ()); statement.setLong(16, exp); - statement.setLong(17, getExpBeforeDeath()); + statement.setLong(17, _expBeforeDeath); statement.setLong(18, sp); statement.setInt(19, getReputation()); - statement.setInt(20, getFame()); - statement.setInt(21, getRaidbossPoints()); - statement.setInt(22, getPvpKills()); - statement.setInt(23, getPkKills()); - statement.setInt(24, getClanId()); + statement.setInt(20, _fame); + statement.setInt(21, _raidbossPoints); + statement.setInt(22, _pvpKills); + statement.setInt(23, _pkKills); + statement.setInt(24, _clanId); statement.setInt(25, getRace().ordinal()); statement.setInt(26, getClassId().getId()); - statement.setLong(27, getDeleteTimer()); + statement.setLong(27, _deleteTimer); statement.setString(28, getTitle()); - statement.setInt(29, getAppearance().getTitleColor()); + statement.setInt(29, _appearance.getTitleColor()); statement.setInt(30, isOnlineInt()); - statement.setInt(31, getClanPrivileges().getBitmask()); - statement.setInt(32, getWantsPeace()); - statement.setInt(33, getBaseClass()); + statement.setInt(31, _clanPrivileges.getBitmask()); + statement.setInt(32, _wantsPeace); + statement.setInt(33, _baseClass); long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) @@ -7145,29 +7132,29 @@ public final class L2PcInstance extends L2Playable statement.setLong(34, totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); - statement.setInt(36, getPowerGrade()); - statement.setInt(37, getPledgeType()); - statement.setInt(38, getLvlJoinedAcademy()); - statement.setLong(39, getApprentice()); - statement.setLong(40, getSponsor()); - statement.setLong(41, getClanJoinExpiryTime()); - statement.setLong(42, getClanCreateExpiryTime()); + statement.setInt(36, _powerGrade); + statement.setInt(37, _pledgeType); + statement.setInt(38, _lvlJoinedAcademy); + statement.setLong(39, _apprentice); + statement.setLong(40, _sponsor); + statement.setLong(41, _clanJoinExpiryTime); + statement.setLong(42, _clanCreateExpiryTime); statement.setString(43, getName()); - statement.setInt(44, getBookMarkSlot()); + statement.setInt(44, _bookmarkslot); statement.setInt(45, getStat().getBaseVitalityPoints()); - statement.setString(46, getLang()); + statement.setString(46, _lang); int factionId = 0; - if (isGood()) + if (_isGood) { factionId = 1; } - if (isEvil()) + if (_isEvil) { factionId = 2; } statement.setInt(47, factionId); - statement.setInt(48, getPcCafePoints()); + statement.setInt(48, _pcCafePoints); statement.setInt(49, getObjectId()); statement.execute(); @@ -7222,7 +7209,7 @@ public final class L2PcInstance extends L2Playable { // Delete all current stored effects for char to avoid dupe delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.execute(); int buff_index = 0; @@ -7288,7 +7275,7 @@ public final class L2PcInstance extends L2Playable statement.setDouble(7, (t != null) && t.hasNotPassed() ? t.getStamp() : 0); statement.setInt(8, 0); // Store type 0, active buffs/debuffs. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7320,7 +7307,7 @@ public final class L2PcInstance extends L2Playable statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); statement.setInt(8, 1); // Restore type 1, skill reuse. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7459,7 +7446,7 @@ public final class L2PcInstance extends L2Playable // Remove or update a L2PcInstance skill from the character_skills table of the database statement.setInt(1, oldSkill.getId()); statement.setInt(2, getObjectId()); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7475,7 +7462,7 @@ public final class L2PcInstance extends L2Playable if (skill != null) { - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) { @@ -7578,7 +7565,7 @@ public final class L2PcInstance extends L2Playable { // Retrieve all skills of this L2PcInstance from the database statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7629,7 +7616,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_SKILL_SAVE)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7667,7 +7654,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement delete = con.prepareStatement(DELETE_SKILL_SAVE)) { delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.executeUpdate(); } } @@ -7705,7 +7692,7 @@ public final class L2PcInstance extends L2Playable isInInventory = true; // Using item Id - L2ItemInstance item = getInventory().getItemByItemId(itemId); + L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { item = getWarehouse().getItemByItemId(itemId); @@ -7757,7 +7744,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_HENNAS)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { int slot; @@ -7866,7 +7853,7 @@ public final class L2PcInstance extends L2Playable { statement.setInt(1, getObjectId()); statement.setInt(2, slot); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7896,7 +7883,7 @@ public final class L2PcInstance extends L2Playable } if (henna.getCancelCount() > 0) { - getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); + _inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(henna.getDyeItemId()); sm.addLong(henna.getCancelCount()); @@ -7965,7 +7952,7 @@ public final class L2PcInstance extends L2Playable statement.setInt(1, getObjectId()); statement.setInt(2, henna.getDyeId()); statement.setInt(3, i); - statement.setInt(4, getClassIndex()); + statement.setInt(4, _classIndex); statement.execute(); } catch (Exception e) @@ -8111,7 +8098,7 @@ public final class L2PcInstance extends L2Playable if (Config.UPDATE_ITEMS_ON_CHAR_STORE) { - getInventory().updateDatabase(); + _inventory.updateDatabase(); getWarehouse().updateDatabase(); } } @@ -8162,7 +8149,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker isn't the L2PcInstance Pet - if ((attacker == this) || (attacker == getPet()) || attacker.hasServitor(attacker.getObjectId())) + if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { return false; } @@ -8180,13 +8167,13 @@ public final class L2PcInstance extends L2Playable } // is AutoAttackable if both players are in the same duel and the duel is still going on - if (attacker.isPlayable() && (getDuelState() == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) + if (attacker.isPlayable() && (_duelState == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { return true; } // Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. - if (isInParty() && getParty().getMembers().contains(attacker)) + if (isInParty() && _party.getMembers().contains(attacker)) { return false; } @@ -8194,14 +8181,14 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) + if (_inOlympiadMode && _OlympiadStart && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) { return true; } return false; } - if (isOnCustomEvent() && (getTeam() == attacker.getTeam())) + if (_isOnCustomEvent && (getTeam() == attacker.getTeam())) { return false; } @@ -8223,7 +8210,7 @@ public final class L2PcInstance extends L2Playable // Get L2PcInstance final L2PcInstance attackerPlayer = attacker.getActingPlayer(); - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) @@ -8256,7 +8243,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker is not in the same clan - if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) + if ((_clan != null) && _clan.isMember(attacker.getObjectId())) { return false; } @@ -8281,10 +8268,10 @@ public final class L2PcInstance extends L2Playable if (attacker instanceof L2DefenderInstance) { - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return ((siege != null) && siege.checkIsAttacker(_clan)); } } @@ -8294,7 +8281,7 @@ public final class L2PcInstance extends L2Playable } // Check if the L2PcInstance has Karma - if ((getReputation() < 0) || (getPvpFlag() > 0)) + if ((getReputation() < 0) || (_pvpFlag > 0)) { return true; } @@ -8388,7 +8375,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (inObserverMode()) + if (_observerMode) { sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(ActionFailed.STATIC_PACKET); @@ -8436,7 +8423,7 @@ public final class L2PcInstance extends L2Playable } // Check if the caster is sitting - if (isSitting()) + if (_waitTypeSitting) { sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING); sendPacket(ActionFailed.STATIC_PACKET); @@ -8472,7 +8459,7 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill final L2Object target = skill.getTarget(this, forceUse, dontMove, true); - final Location worldPosition = getCurrentSkillWorldPosition(); + final Location worldPosition = _currentSkillWorldPosition; if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { @@ -8528,7 +8515,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (getQueuedSkill() != null) + if (_queuedSkill != null) { setQueuedSkill(null, null, false, false); } @@ -8543,14 +8530,14 @@ public final class L2PcInstance extends L2Playable final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel - if (isInParty() && getParty().isInCommandChannel() && (looter != null)) + if (isInParty() && _party.isInCommandChannel() && (looter != null)) { - return getParty().getCommandChannel().getMembers().contains(looter); + return _party.getCommandChannel().getMembers().contains(looter); } if (isInParty() && (looter != null)) { - return getParty().getMembers().contains(looter); + return _party.getMembers().contains(looter); } return false; @@ -8793,7 +8780,7 @@ public final class L2PcInstance extends L2Playable { for (int itemId : _activeSoulShots) { - final L2ItemInstance item = getInventory().getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { removeAutoSoulShot(itemId); @@ -8887,23 +8874,23 @@ public final class L2PcInstance extends L2Playable public void updateActiveBroochJewel() { // Update active Ruby jewel. - if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV1); } @@ -8912,23 +8899,23 @@ public final class L2PcInstance extends L2Playable setActiveRubyJewel(null); } // Update active Sapphire jewel. - if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1); } @@ -9055,10 +9042,9 @@ public final class L2PcInstance extends L2Playable public void enterOlympiadObserverMode(Location loc, int id) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.unSummon(this); + _pet.unSummon(this); } if (hasServitors()) @@ -9076,13 +9062,13 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoCubic(this)); } - if (getParty() != null) + if (_party != null) { - getParty().removePartyMember(this, MessageType.EXPELLED); + _party.removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -9404,12 +9390,12 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; return false; } - if (isInDuel()) + if (_isInDuel) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL; return false; } - if (isInOlympiadMode() || isOnEvent(CeremonyOfChaosEvent.class)) + if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class)) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS; return false; @@ -9424,7 +9410,7 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE; return false; } - if (getPrivateStoreType() != PrivateStoreType.NONE) + if (_privateStoreType != PrivateStoreType.NONE) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE; return false; @@ -9491,10 +9477,9 @@ public final class L2PcInstance extends L2Playable { super.setTeam(team); broadcastUserInfo(); - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.broadcastStatusUpdate(); + _pet.broadcastStatusUpdate(); } if (hasServitors()) { @@ -9531,9 +9516,9 @@ public final class L2PcInstance extends L2Playable for (Skill s : getSkillList()) { - if (getClan() != null) + if (_clan != null) { - isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0); + isDisabled = s.isClanSkill() && (_clan.getReputationScore() < 0); } sl.addSkill(s.getDisplayId(), s.getReuseDelayGroup(), s.getDisplayLevel(), s.getSubLevel(), s.isPassive(), isDisabled, s.isEnchantable()); @@ -9844,7 +9829,7 @@ public final class L2PcInstance extends L2Playable // Remove active item skills before saving char to database // because next time when choosing this class, weared items can // be different - for (L2ItemInstance item : getInventory().getPaperdollItems(L2ItemInstance::isAugmented)) + for (L2ItemInstance item : _inventory.getPaperdollItems(L2ItemInstance::isAugmented)) { if ((item != null) && item.isEquipped()) { @@ -9882,7 +9867,7 @@ public final class L2PcInstance extends L2Playable if (classIndex == 0) { - setClassTemplate(getBaseClass()); + setClassTemplate(_baseClass); } else { @@ -9900,7 +9885,7 @@ public final class L2PcInstance extends L2Playable if (isInParty()) { - getParty().recalculatePartyLevel(); + _party.recalculatePartyLevel(); } // Update the character's change in class status. @@ -10006,7 +9991,7 @@ public final class L2PcInstance extends L2Playable if (_taskRentPet != null) { // if the rent of a wyvern expires while over a flying zone, tp to down before unmounting - if (checkLandingState() && (getMountType() == MountType.WYVERN)) + if (checkLandingState() && (_mountType == MountType.WYVERN)) { teleToLocation(TeleportWhereType.TOWN); } @@ -10095,7 +10080,7 @@ public final class L2PcInstance extends L2Playable { sendMessage("Entering world in Invisible mode."); } - if (isSilenceMode()) + if (_silenceMode) { sendMessage("Entering world in Silence mode."); } @@ -10201,7 +10186,7 @@ public final class L2PcInstance extends L2Playable restoreExp(revivePower); } - public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int power) + public void reviveRequest(L2PcInstance reviver, Skill skill, boolean isPet, int power) { if (isResurrectionBlocked()) { @@ -10210,11 +10195,11 @@ public final class L2PcInstance extends L2Playable if (_reviveRequested == 1) { - if (_revivePet == Pet) + if (_revivePet == isPet) { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } - else if (Pet) + else if (isPet) { reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. } @@ -10224,12 +10209,11 @@ public final class L2PcInstance extends L2Playable } return; } - final L2Summon pet = getPet(); - if ((Pet && (pet != null) && pet.isDead()) || (!Pet && isDead())) + if ((isPet && (_pet != null) && _pet.isDead()) || (!isPet && isDead())) { _reviveRequested = 1; _revivePower = Formulas.calculateSkillResurrectRestorePercent(power, reviver); - _revivePet = Pet; + _revivePet = isPet; if (hasCharmOfCourage()) { @@ -10239,7 +10223,7 @@ public final class L2PcInstance extends L2Playable return; } - final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); + final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100); final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); @@ -10250,8 +10234,7 @@ public final class L2PcInstance extends L2Playable public void reviveAnswer(int answer) { - final L2Summon pet = getPet(); - if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (pet != null) && !pet.isDead())) + if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (_pet != null) && !_pet.isDead())) { return; } @@ -10269,15 +10252,15 @@ public final class L2PcInstance extends L2Playable doRevive(); } } - else if (pet != null) + else if (_pet != null) { if (_revivePower != 0) { - pet.doRevive(_revivePower); + _pet.doRevive(_revivePower); } else { - pet.doRevive(); + _pet.doRevive(); } } } @@ -10346,7 +10329,7 @@ public final class L2PcInstance extends L2Playable @Override public void teleToLocation(ILocational loc, boolean allowRandomOffset) { - if ((getVehicle() != null) && !getVehicle().isTeleporting()) + if ((_vehicle != null) && !_vehicle.isTeleporting()) { setVehicle(null); } @@ -10377,31 +10360,30 @@ public final class L2PcInstance extends L2Playable checkItemRestriction(); - if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !isInOlympiadMode()) + if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !_inOlympiadMode) { setTeleportProtection(true); } // Trained beast is lost after teleport - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.deleteMe(); } - getTrainedBeasts().clear(); + _tamedBeast.clear(); } // Modify the position of the pet if necessary - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.setFollowStatus(false); - pet.teleToLocation(getLocation(), false); - ((L2SummonAI) pet.getAI()).setStartFollowController(true); - pet.setFollowStatus(true); - pet.setInstance(getInstanceWorld()); - pet.updateAndBroadcastStatus(0); + _pet.setFollowStatus(false); + _pet.teleToLocation(getLocation(), false); + ((L2SummonAI) _pet.getAI()).setStartFollowController(true); + _pet.setFollowStatus(true); + _pet.setInstance(getInstanceWorld()); + _pet.updateAndBroadcastStatus(0); } getServitors().values().forEach(s -> @@ -10491,9 +10473,9 @@ public final class L2PcInstance extends L2Playable super.reduceCurrentHp(value, attacker, skill, isDOT, directlyToHp, critical, reflect); // notify the tamed beast of attacks - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.onOwnerGotAttacked(attacker); } @@ -10626,7 +10608,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -10635,8 +10617,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return false; } @@ -10778,7 +10759,7 @@ public final class L2PcInstance extends L2Playable // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) try { - if (!isOnline()) + if (!_isOnline) { LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } @@ -10791,7 +10772,7 @@ public final class L2PcInstance extends L2Playable try { - if (Config.ENABLE_BLOCK_CHECKER_EVENT && (getBlockCheckerArena() != -1)) + if (Config.ENABLE_BLOCK_CHECKER_EVENT && (_handysBlockCheckerEventArena != -1)) { HandysBlockCheckerManager.getInstance().onDisconnect(this); } @@ -10816,7 +10797,7 @@ public final class L2PcInstance extends L2Playable // remove combat flag try { - if (getInventory().getItemByItemId(9819) != null) + if (_inventory.getItemByItemId(9819) != null) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -10825,9 +10806,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } } @@ -10953,13 +10934,13 @@ public final class L2PcInstance extends L2Playable { try { - L2Summon pet = getPet(); + L2Summon pet = _pet; if (pet != null) { pet.setRestoreSummon(true); pet.unSummon(this); // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) - pet = getPet(); + pet = _pet; if (pet != null) { pet.broadcastNpcInfo(0); @@ -10978,12 +10959,12 @@ public final class L2PcInstance extends L2Playable } // returns pet to control item } - if (getClan() != null) + if (_clan != null) { // set the status for pledge member list to OFFLINE try { - final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = _clan.getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -11020,14 +11001,14 @@ public final class L2PcInstance extends L2Playable { // Check if the L2PcInstance is in observer mode to set its position to its position // before entering in observer mode - if (inObserverMode()) + if (_observerMode) { setLocationInvisible(_lastLoc); } - if (getVehicle() != null) + if (_vehicle != null) { - getVehicle().oustPlayer(this); + _vehicle.oustPlayer(this); } } catch (Exception e) @@ -11061,7 +11042,7 @@ public final class L2PcInstance extends L2Playable // Update database with items in its inventory and remove them from the world try { - getInventory().deleteMe(); + _inventory.deleteMe(); } catch (Exception e) { @@ -11084,7 +11065,7 @@ public final class L2PcInstance extends L2Playable try { - getFreight().deleteMe(); + _freight.deleteMe(); } catch (Exception e) { @@ -11112,10 +11093,10 @@ public final class L2PcInstance extends L2Playable } } - if (getClanId() > 0) + if (_clanId > 0) { - getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); - getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan())); + _clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); + _clan.broadcastToOnlineMembers(new ExPledgeCount(_clan)); // ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); } @@ -11149,7 +11130,7 @@ public final class L2PcInstance extends L2Playable try { notifyFriends(L2FriendStatus.MODE_OFFLINE); - getBlockList().playerLogout(); + _blockList.playerLogout(); } catch (Exception e) { @@ -11415,12 +11396,12 @@ public final class L2PcInstance extends L2Playable { _souls -= count; - if (getChargedSouls() < 0) + if (_souls < 0) { _souls = 0; } - if (getChargedSouls() == 0) + if (_souls == 0) { stopSoulTask(); } @@ -11666,10 +11647,10 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = _inventory.getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { - getInventory().unEquipItemInSlot(i); + _inventory.unEquipItemInSlot(i); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); @@ -11819,10 +11800,9 @@ public final class L2PcInstance extends L2Playable } if (hasPet()) { - final L2Summon pet = getPet(); - setCurrentFeed(((L2PetInstance) pet).getCurrentFed()); - _controlItemId = pet.getControlObjectId(); - sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); + setCurrentFeed(_pet.getCurrentFed()); + _controlItemId = _pet.getControlObjectId(); + sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); if (!isDead()) { _mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000); @@ -11831,7 +11811,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -11891,7 +11871,7 @@ public final class L2PcInstance extends L2Playable { final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -11907,7 +11887,7 @@ public final class L2PcInstance extends L2Playable public boolean isHungry() { - return hasPet() && _canFeed && (getCurrentFeed() < ((getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())); + return hasPet() && _canFeed && (_curFeed < ((getPetData(_mountNpcId).getHungryLimit() / 100f) * getPetLevelData(_mountNpcId).getPetMaxFeed())); } public void enteredNoLanding(int delay) @@ -11933,7 +11913,7 @@ public final class L2PcInstance extends L2Playable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(req)) { - statement.setInt(1, getCurrentFeed()); + statement.setInt(1, _curFeed); statement.setInt(2, _controlItemId); statement.executeUpdate(); _controlItemId = 0; @@ -12102,7 +12082,7 @@ public final class L2PcInstance extends L2Playable { return; } - if (getInventory().getInventoryItemCount(13016, 0) == 0) + if (_inventory.getInventoryItemCount(13016, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; @@ -12114,7 +12094,7 @@ public final class L2PcInstance extends L2Playable final TeleportBookmark bookmark = _tpbookmarks.get(id); if (bookmark != null) { - destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(13016).getObjectId(), 1, null, false); teleToLocation(bookmark, false); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12127,12 +12107,12 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE); return false; } - else if (isInSiege() || (getSiegeState() != 0)) + else if (_isInSiege || (_siegeState != 0)) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_A_LARGE_SCALE_BATTLE_SUCH_AS_A_CASTLE_SIEGE_FORTRESS_SIEGE_OR_CLAN_HALL_SIEGE); return false; } - else if (isInDuel()) + else if (_isInDuel) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL); return false; @@ -12142,7 +12122,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING); return false; } - else if (isInOlympiadMode()) + else if (_inOlympiadMode) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH); return false; @@ -12201,7 +12181,7 @@ public final class L2PcInstance extends L2Playable return; } - if (getInventory().getInventoryItemCount(20033, 0) == 0) + if (_inventory.getInventoryItemCount(20033, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG); return; @@ -12217,7 +12197,7 @@ public final class L2PcInstance extends L2Playable } _tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name)); - destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); @@ -12271,7 +12251,7 @@ public final class L2PcInstance extends L2Playable setXYZ(getBoat().getLocation()); activeChar.sendPacket(new CharInfo(this, isInvisible() && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS))); - activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition())); + activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); } else if (isInAirShip()) { @@ -12289,10 +12269,9 @@ public final class L2PcInstance extends L2Playable rc1.addRelation(this, relation1, isAutoAttackable(activeChar)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc1.addRelation(pet, relation1, isAutoAttackable(activeChar)); + rc1.addRelation(_pet, relation1, isAutoAttackable(activeChar)); } if (hasServitors()) { @@ -12306,10 +12285,9 @@ public final class L2PcInstance extends L2Playable rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this)); if (activeChar.hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this)); + rc2.addRelation(_pet, relation2, activeChar.isAutoAttackable(this)); } if (hasServitors()) { @@ -12318,7 +12296,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(rc2); - switch (getPrivateStoreType()) + switch (_privateStoreType) { case SELL: { @@ -12345,7 +12323,7 @@ public final class L2PcInstance extends L2Playable public void playMovie(MovieHolder holder) { - if (getMovieHolder() != null) + if (_movieHolder != null) { return; } @@ -12361,7 +12339,7 @@ public final class L2PcInstance extends L2Playable public void stopMovie() { - sendPacket(new ExStopScenePlayer(getMovieHolder().getMovie())); + sendPacket(new ExStopScenePlayer(_movieHolder.getMovie())); setMovieHolder(null); } @@ -12439,7 +12417,7 @@ public final class L2PcInstance extends L2Playable public int getBirthdays() { - long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12608,24 +12586,24 @@ public final class L2PcInstance extends L2Playable @Override public double getCollisionRadius() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override public double getCollisionHeight() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -12767,7 +12745,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || (getMovieHolder() != null) || _fishing.isFishing(); + return super.isMovementDisabled() || (_movieHolder != null) || _fishing.isFishing(); } public String getHtmlPrefix() @@ -12877,7 +12855,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return ((_privateStoreType == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); } public void setMultiSocialAction(int id, int targetId) @@ -12977,7 +12955,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); } /** @@ -12987,7 +12965,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder80(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); } public boolean havePetInvItems() @@ -13073,8 +13051,8 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("REPLACE INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?)")) { ps.setInt(1, getObjectId()); - ps.setInt(2, getRecomHave()); - ps.setInt(3, getRecomLeft()); + ps.setInt(2, _recomHave); + ps.setInt(3, _recomLeft); ps.setLong(4, 0); ps.execute(); } @@ -13500,7 +13478,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHair() { - return getVariables().getInt("visualHairId", getAppearance().getHairStyle()); + return getVariables().getInt("visualHairId", _appearance.getHairStyle()); } /** @@ -13508,7 +13486,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHairColor() { - return getVariables().getInt("visualHairColorId", getAppearance().getHairColor()); + return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); } /** @@ -13516,7 +13494,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualFace() { - return getVariables().getInt("visualFaceId", getAppearance().getFace()); + return getVariables().getInt("visualFaceId", _appearance.getFace()); } /** @@ -13615,7 +13593,7 @@ public final class L2PcInstance extends L2Playable */ public CastleSide getPlayerSide() { - if ((getClan() == null) || (getClan().getCastleId() == 0)) + if ((_clan == null) || (_clan.getCastleId() == 0)) { return CastleSide.NEUTRAL; } @@ -13960,7 +13938,7 @@ public final class L2PcInstance extends L2Playable @Override public MoveType getMoveType() { - if (isSitting()) + if (_waitTypeSitting) { return MoveType.SITTING; } @@ -13979,10 +13957,9 @@ public final class L2PcInstance extends L2Playable private void updateOnlineTime() { - final L2Clan clan = getClan(); - if (clan != null) + if (_clan != null) { - clan.addMemberOnlineTime(this); + _clan.addMemberOnlineTime(this); } } @@ -13997,7 +13974,7 @@ public final class L2PcInstance extends L2Playable public GroupType getGroupType() { - return isInParty() ? (getParty().isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; + return isInParty() ? (_party.isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; } public boolean isTrueHero() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 10429b5b5b..f1112eee76 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -83,8 +83,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,skill_sub_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -140,9 +140,9 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - else if (getCurrentFed() > getFeedConsume()) + else if (_curFed > getFeedConsume()) { - setCurrentFed(getCurrentFed() - getFeedConsume()); + setCurrentFed(_curFed - getFeedConsume()); } else { @@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -333,9 +333,9 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - if (getInventory() != null) + if (_inventory != null) { - return getInventory().getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); + return _inventory.getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); } return null; } @@ -622,8 +622,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -639,7 +639,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -702,9 +702,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -756,11 +756,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - statement.setInt(1, getControlObjectId()); + statement.setInt(1, _controlObjectId); statement.execute(); } catch (Exception e) @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -817,7 +817,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -921,7 +921,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -933,7 +933,7 @@ public class L2PetInstance extends L2Summon } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -951,10 +951,10 @@ public class L2PetInstance extends L2Summon statement.setDouble(4, getStatus().getCurrentMp()); statement.setLong(5, getStat().getExp()); statement.setLong(6, getStat().getSp()); - statement.setInt(7, getCurrentFed()); + statement.setInt(7, _curFed); statement.setInt(8, getOwner().getObjectId()); statement.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - statement.setInt(10, getControlObjectId()); + statement.setInt(10, _controlObjectId); statement.executeUpdate(); _respawned = true; @@ -997,7 +997,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1045,7 +1045,7 @@ public class L2PetInstance extends L2Summon continue; } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, skill.getSubLevel()); @@ -1073,7 +1073,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rset = ps1.executeQuery()) { while (rset.next()) @@ -1094,7 +1094,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1147,9 +1147,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1340,13 +1340,13 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1357,7 +1357,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1367,7 +1367,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 42bd49e7f9..8ed3a9f1d3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -240,7 +240,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable final Map> servitorEffects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()); if (servitorEffects != null) { - final List effects = servitorEffects.get(getReferenceSkill()); + final List effects = servitorEffects.get(_referenceSkill); if ((effects != null) && !effects.isEmpty()) { for (SummonEffect effect : effects) @@ -294,7 +294,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.execute(); int buff_index = 0; @@ -348,7 +348,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -397,7 +397,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -437,7 +437,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -554,12 +554,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -573,7 +573,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); // Using same task to check if owner is in visible range if (calculateDistance(getOwner(), true, false) > 2000) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java index 285b9af507..aa681dd5f3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java @@ -51,7 +51,7 @@ public class L2ShuttleInstance extends L2Vehicle public void closeDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { @@ -63,7 +63,7 @@ public class L2ShuttleInstance extends L2Vehicle public void openDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index e5e5d055c4..32f94719bb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index a7276d30f8..f1d5b120e9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -72,7 +72,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -136,7 +136,7 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - final L2Character activeChar = getActiveChar(); + final L2Character activeChar = _activeChar; if (activeChar.isDead()) { return; @@ -169,14 +169,14 @@ public class CharStatus } if (Formulas.calcRealTargetBreak()) { - getActiveChar().getEffectList().stopEffects(AbnormalType.REAL_TARGET); + _activeChar.getEffectList().stopEffects(AbnormalType.REAL_TARGET); } } if (value > 0) { - final double oldHp = getCurrentHp(); - final double newHp = Math.max(getCurrentHp() - value, activeChar.isUndying() ? 1 : 0); + final double oldHp = _currentHp; + final double newHp = Math.max(_currentHp - value, activeChar.isUndying() ? 1 : 0); setCurrentHp(newHp); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureHpChange(activeChar, oldHp, newHp), activeChar); } @@ -189,7 +189,7 @@ public class CharStatus public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -202,10 +202,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -269,12 +269,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getStat().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getStat().getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -324,7 +324,7 @@ public class CharStatus if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -337,7 +337,7 @@ public class CharStatus hpOrMpWasChanged |= setCurrentMp(newMp, false); if (hpOrMpWasChanged) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -360,12 +360,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getStat().getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -398,7 +398,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -407,10 +407,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE); - final double newMp = getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE); + final double newHp = _currentHp + _activeChar.getStat().getValue(Stats.REGENERATE_HP_RATE); + final double newMp = _currentMp + _activeChar.getStat().getValue(Stats.REGENERATE_MP_RATE); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 4d221ab370..813634b659 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -48,9 +48,9 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -78,7 +78,7 @@ public class PcStatus extends PlayableStatus } // If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken. - if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) + if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isCrafting() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) { return; } @@ -100,7 +100,7 @@ public class PcStatus extends PlayableStatus getActiveChar().stopEffectsOnDamage(); } // Attacked players in craft/shops stand up. - if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) + if (getActiveChar().isCrafting() || getActiveChar().isInStoreMode()) { getActiveChar().setPrivateStoreType(PrivateStoreType.NONE); getActiveChar().standUp(); @@ -238,14 +238,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -337,7 +337,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -388,9 +388,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); + setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 80a80f6018..1d84f3da14 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -279,7 +279,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 1ce3ab05ca..6ee4d7e704 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -262,13 +262,13 @@ public final class Transform implements IIdentifiable if (creature.isPlayer()) { - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } if (addSkills) @@ -374,11 +374,11 @@ public final class Transform implements IIdentifiable final L2PcInstance player = creature.getActingPlayer(); final boolean hasTransformSkills = player.hasTransformSkills(); - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index ebee3cd82c..1adc7b039f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setInt(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setInt(6, _repeat); st.execute(); try (ResultSet rset = st.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setLong(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setLong(6, _repeat); st.setLong(7, getId()); st.execute(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/base/SubClass.java index 0e65764560..e318f331ee 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -140,7 +140,7 @@ public final class SubClass public void incLevel() { - if (!_dualClass && (getLevel() == _maxLevel)) + if (!_dualClass && (_level == _maxLevel)) { return; } @@ -151,7 +151,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java index 03b1a51b6b..8360f7712c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -69,7 +69,7 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() @@ -124,7 +124,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(this::restock, getRestockDelay()); + _restockTask = ThreadPool.schedule(this::restock, _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -133,7 +133,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -151,7 +151,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -161,7 +161,7 @@ public final class Product PreparedStatement statement = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { statement.setInt(1, _buyListId); - statement.setInt(2, getItemId()); + statement.setInt(2, _item.getId()); statement.setLong(3, getCount()); statement.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index ce7a68dcc7..4e95946a36 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -538,9 +538,9 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - getHolder().broadCastPacketToTeam(changePoints); + _holder.broadCastPacketToTeam(changePoints); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java index 4fa38d85d4..9b249a9069 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -72,7 +72,7 @@ public final class Castle extends AbstractResidence private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -96,12 +96,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -158,7 +158,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -185,29 +185,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -223,11 +223,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -244,7 +244,7 @@ public final class Castle extends AbstractResidence initResidenceZone(); initFunctions(); spawnSideNpcs(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -287,7 +287,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -338,7 +338,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -380,7 +380,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -460,7 +460,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -481,7 +481,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, String doorName, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -516,7 +516,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -877,7 +877,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -897,12 +897,12 @@ public final class Castle extends AbstractResidence public final L2DoorInstance getDoor(int doorId) { - return getDoors().stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); } public final L2DoorInstance getDoor(String doorName) { - return getDoors().stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); } public final List getDoors() @@ -957,7 +957,7 @@ public final class Castle extends AbstractResidence public final int getTaxPercent(TaxType type) { final int taxPercent; - switch (getSide()) + switch (_castleSide) { case LIGHT: { @@ -1036,7 +1036,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -1156,7 +1156,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); + final Skill skill = _castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); player.addSkill(skill); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index d41afdb68a..6fc9b45046 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -58,7 +58,7 @@ public final class ClanHall extends AbstractResidence private final ClanHallGrade _grade; private final ClanHallType _type; private final int _minBid; - private final int _lease; + final int _lease; private final int _deposit; private final List _npcs; private final List _doors; @@ -66,8 +66,8 @@ public final class ClanHall extends AbstractResidence private final Location _ownerLocation; private final Location _banishLocation; // Dynamic parameters - private L2Clan _owner = null; - private long _paidUntil = 0; + L2Clan _owner = null; + long _paidUntil = 0; protected ScheduledFuture _checkPaymentTask = null; // Other private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; @@ -137,7 +137,7 @@ public final class ClanHall extends AbstractResidence PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) { statement.setInt(1, getOwnerId()); - statement.setLong(2, getPaidUntil()); + statement.setLong(2, _paidUntil); statement.setInt(3, getResidenceId()); statement.execute(); } @@ -159,7 +159,7 @@ public final class ClanHall extends AbstractResidence public int getCostFailDay() { - final Duration failDay = Duration.between(Instant.ofEpochMilli(getPaidUntil()), Instant.now()); + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); return failDay.isNegative() ? 0 : (int) failDay.toDays(); } @@ -256,13 +256,13 @@ public final class ClanHall extends AbstractResidence _owner = clan; clan.setHideoutId(getResidenceId()); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (getPaidUntil() == 0) + if (_paidUntil == 0) { setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); } final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : getPaidUntil(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else @@ -351,29 +351,28 @@ public final class ClanHall extends AbstractResidence @Override public void run() { - final L2Clan clan = getOwner(); - if (clan != null) + if (_owner != null) { - if (clan.getWarehouse().getAdena() < getLease()) + if (_owner.getWarehouse().getAdena() < _lease) { if (getCostFailDay() > 8) { setOwner(null); - clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + _owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); } else { _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); - clan.broadcastToOnlineMembers(sm); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); } } else { - clan.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, getLease(), null, null); - setPaidUntil(Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), getPaidUntil() - System.currentTimeMillis()); + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java index 826a7beece..a4b57818fa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -75,7 +75,7 @@ public class Duel private boolean _finished = false; private final Map _playerConditions = new ConcurrentHashMap<>(); - private Instance _duelInstance; + Instance _duelInstance; public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId) { @@ -213,9 +213,9 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPool.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - if (getDueldInstance() != null) + if (_duelInstance != null) { - getDueldInstance().destroy(); + _duelInstance.destroy(); } break; } @@ -674,7 +674,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -695,7 +695,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java index 3d030d3183..2433d41209 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -237,7 +237,7 @@ public final class Fort extends AbstractResidence super(fortId); load(); loadFlagPoles(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -506,7 +506,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -781,7 +781,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -873,7 +873,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1001,8 +1001,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1068,7 +1068,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 75de2719fc..c7a8bd6dfa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -70,7 +70,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -101,7 +101,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -115,7 +115,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -184,7 +184,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -205,7 +205,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -228,7 +228,7 @@ public class FortSiege implements Siegable // Fort setting protected Set _commanders = ConcurrentHashMap.newKeySet(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private final Collection _siegeGuards = new LinkedList<>(); ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -248,7 +248,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { _isInProgress = false; // Flag so that siege instance can be started removeFlags(); // Removes all flags. Note: Remove flag before teleporting players @@ -257,22 +257,22 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); int ownerId = -1; - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - ownerId = getFort().getOwnerClan().getId(); + ownerId = _fort.getOwnerClan().getId(); } - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -306,16 +306,16 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -326,24 +326,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -358,7 +358,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -369,7 +369,7 @@ public class FortSiege implements Siegable } } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -391,7 +391,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -411,7 +411,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -421,7 +421,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -441,7 +441,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -470,7 +470,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return (_isInProgress && (_fort.checkIfInZone(x, y, z))); // Fort zone during siege } /** @@ -490,7 +490,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - if ((clan != null) && (getFort().getOwnerClan() == clan)) + if ((clan != null) && (_fort.getOwnerClan() == clan)) { return true; } @@ -504,22 +504,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -540,7 +540,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -550,7 +550,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -583,10 +583,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -614,7 +614,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if ((getFort() != null) && (!_commanders.isEmpty())) + if ((_fort != null) && (!_commanders.isEmpty())) { final L2Spawn spawn = instance.getSpawn(); if (spawn != null) @@ -657,14 +657,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -674,22 +674,22 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } // schedule restoring doors/commanders respawn else if (_siegeRestore == null) { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); } } else { - LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } } @@ -705,7 +705,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -734,7 +734,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player don't have enough adena to register } @@ -754,7 +754,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -788,7 +788,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(query)) { - statement.setInt(1, getFort().getResidenceId()); + statement.setInt(1, _fort.getResidenceId()); if (clanId != 0) { statement.setInt(2, clanId); @@ -796,9 +796,9 @@ public class FortSiege implements Siegable statement.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -843,7 +843,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -896,9 +896,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -927,7 +927,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -948,7 +948,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -991,18 +991,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1038,7 +1038,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1060,8 +1060,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, _fort.getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1085,7 +1085,7 @@ public class FortSiege implements Siegable PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getFort().getResidenceId()); + statement.setInt(2, _fort.getResidenceId()); statement.execute(); addAttacker(clan.getId()); @@ -1151,7 +1151,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1235,7 +1235,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1265,7 +1265,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1288,7 +1288,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public Set getCommanders() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java index 3ae2737da0..ba55f3b40d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -92,7 +92,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -160,14 +160,14 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } try { - if (!getIsTimeRegistrationOver()) + if (!_castle.getIsTimeRegistrationOver()) { final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) @@ -186,7 +186,7 @@ public class Siege implements Siegable else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; clearSiegeWaitingClan(); @@ -228,8 +228,8 @@ public class Siege implements Siegable // Castle setting private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); - private final Castle _castle; - private boolean _isInProgress = false; + final Castle _castle; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,18 +246,18 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); if (clan.getId() == _firstOwnerClanId) @@ -267,7 +267,7 @@ public class Siege implements Siegable } else { - getCastle().setTicketBuyCount(0); + _castle.setTicketBuyCount(0); for (L2ClanMember member : clan.getMembers()) { if (member != null) @@ -284,7 +284,7 @@ public class Siege implements Siegable else { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); } @@ -322,7 +322,7 @@ public class Siege implements Siegable clan.clearSiegeDeaths(); } - getCastle().updateClansReputation(); + _castle.updateClansReputation(); removeFlags(); // Removes all flags. Note: Remove flag before teleporting players teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town _isInProgress = false; // Flag so that siege instance can be started @@ -331,14 +331,14 @@ public class Siege implements Siegable clearSiegeClan(); // Clear siege clan from db removeTowers(); // Remove all towers from this castle SiegeGuardManager.getInstance().unspawnSiegeGuard(getCastle()); // Remove all spawned siege guard from this castle - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); } - getCastle().spawnDoor(); // Respawn door to castle - getCastle().getZone().setIsActive(false); - getCastle().getZone().updateZoneStatusForCharactersInside(); - getCastle().getZone().setSiegeInstance(null); + _castle.spawnDoor(); // Respawn door to castle + _castle.getZone().setIsActive(false); + _castle.getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(null); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeFinish(this), getCastle()); @@ -387,9 +387,9 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); // Remove all merc entry from db } @@ -398,13 +398,13 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); return; } - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) @@ -426,7 +426,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -444,7 +444,7 @@ public class Siege implements Siegable } } - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -462,8 +462,8 @@ public class Siege implements Siegable teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town removeDefenderFlags(); // Removes defenders' flags - getCastle().removeUpgrade(); // Remove all castle upgrade - getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) + _castle.removeUpgrade(); // Remove all castle upgrade + _castle.spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) removeTowers(); // Remove all towers from this castle _controlTowerCount = 0; // Each new siege midvictory CT are completely respawned. spawnControlTower(); @@ -483,9 +483,9 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { - _firstOwnerClanId = getCastle().getOwnerId(); + _firstOwnerClanId = _castle.getOwnerId(); if (getAttackerClans().isEmpty()) { @@ -500,7 +500,7 @@ public class Siege implements Siegable final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId); ownerClan.increaseBloodAllianceCount(); } - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); saveCastleSiege(); return; @@ -515,20 +515,20 @@ public class Siege implements Siegable _controlTowerCount = 0; spawnControlTower(); // Spawn control tower spawnFlameTower(); // Spawn control tower - getCastle().spawnDoor(); // Spawn door + _castle.spawnDoor(); // Spawn door spawnSiegeGuard(); // Spawn siege guard SiegeGuardManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground - getCastle().getZone().setSiegeInstance(this); - getCastle().getZone().setIsActive(true); - getCastle().getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(this); + _castle.getZone().setIsActive(true); + _castle.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEndDate = Calendar.getInstance(); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); - ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task + ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); // Notify to scripts. @@ -589,7 +589,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -649,7 +649,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -723,7 +723,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return (_isInProgress && (_castle.checkIfInZone(x, y, z))); // Castle zone during siege } /** @@ -763,21 +763,21 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) { - delete.setInt(1, getCastle().getOwnerId()); + delete.setInt(1, _castle.getOwnerId()); delete.execute(); } } getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -791,10 +791,10 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -821,7 +821,7 @@ public class Siege implements Siegable */ public List getPlayersInZone() { - return getCastle().getZone().getPlayersInside(); + return _castle.getZone().getPlayersInside(); } /** @@ -845,7 +845,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - return getCastle().getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); + return _castle.getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); } /** @@ -872,7 +872,7 @@ public class Siege implements Siegable */ public void listRegisterClan(L2PcInstance player) { - player.sendPacket(new SiegeInfo(getCastle(), player)); + player.sendPacket(new SiegeInfo(_castle, player)); } /** @@ -892,7 +892,7 @@ public class Siege implements Siegable return; } int allyId = 0; - if (getCastle().getOwnerId() != 0) + if (_castle.getOwnerId() != 0) { allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); } @@ -935,9 +935,9 @@ public class Siege implements Siegable public void registerDefender(L2PcInstance player, boolean force) { - if (getCastle().getOwnerId() <= 0) + if (_castle.getOwnerId() <= 0) { - player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC."); + player.sendMessage("You cannot register as a defender because " + _castle.getName() + " is owned by NPC."); return; } @@ -975,7 +975,7 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.setInt(2, clanId); statement.execute(); @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _castle.getName() + ": " + _castle.getSiegeDate().getTime()); loadSiegeClan(); @@ -1028,7 +1028,7 @@ public class Siege implements Siegable { _scheduledStartSiegeTask.cancel(false); } - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } /** @@ -1048,12 +1048,12 @@ public class Siege implements Siegable } case NotOwner: { - players = getPlayersInZone(); + players = _castle.getZone().getPlayersInside(); final Iterator it = players.iterator(); while (it.hasNext()) { final L2PcInstance player = it.next(); - if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId()))) + if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == _castle.getOwnerId()))) { it.remove(); } @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1149,7 +1149,7 @@ public class Siege implements Siegable { player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_5_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE); } - else if (player.getClan().getId() == getCastle().getOwnerId()) + else if (player.getClan().getId() == _castle.getOwnerId()) { player.sendPacket(SystemMessageId.CASTLE_OWNING_CLANS_ARE_AUTOMATICALLY_REGISTERED_ON_THE_DEFENDING_SIDE); } @@ -1243,15 +1243,15 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { - addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER); + addDefender(_castle.getOwnerId(), SiegeClanType.OWNER); } - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); try (ResultSet rs = statement.executeQuery()) { int typeId; @@ -1333,8 +1333,8 @@ public class Siege implements Siegable setNextSiegeDate(); // Set the next set date for 2 weeks from now // Schedule Time registration end getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); - getCastle().setIsTimeRegistrationOver(false); + _castle.getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); + _castle.setIsTimeRegistrationOver(false); saveSiegeDate(); // Save the new date startAutoTask(); // Prepare auto start siege and end registration @@ -1346,16 +1346,16 @@ public class Siege implements Siegable if (_scheduledStartSiegeTask != null) { _scheduledStartSiegeTask.cancel(true); - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ? WHERE id = ?")) { - statement.setLong(1, getSiegeDate().getTimeInMillis()); - statement.setLong(2, getTimeRegistrationOverDate().getTimeInMillis()); - statement.setString(3, String.valueOf(getIsTimeRegistrationOver())); - statement.setInt(4, getCastle().getResidenceId()); + statement.setLong(1, _castle.getSiegeDate().getTimeInMillis()); + statement.setLong(2, _castle.getTimeRegistrationOverDate().getTimeInMillis()); + statement.setString(3, String.valueOf(_castle.getIsTimeRegistrationOver())); + statement.setInt(4, _castle.getResidenceId()); statement.execute(); } catch (Exception e) @@ -1397,7 +1397,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, typeId); statement.execute(); } @@ -1407,7 +1407,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) { statement.setInt(1, typeId); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, clan.getId()); statement.execute(); } @@ -1435,7 +1435,7 @@ public class Siege implements Siegable /** Set the date for the next siege. */ private void setNextSiegeDate() { - final Calendar cal = getCastle().getSiegeDate(); + final Calendar cal = _castle.getSiegeDate(); if (cal.getTimeInMillis() < System.currentTimeMillis()) { cal.setTimeInMillis(System.currentTimeMillis()); @@ -1460,7 +1460,7 @@ public class Siege implements Siegable } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = false; // Allow registration for next siege @@ -1645,7 +1645,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1672,23 +1672,23 @@ public class Siege implements Siegable public final boolean getIsTimeRegistrationOver() { - return getCastle().getIsTimeRegistrationOver(); + return _castle.getIsTimeRegistrationOver(); } @Override public final Calendar getSiegeDate() { - return getCastle().getSiegeDate(); + return _castle.getSiegeDate(); } public final Calendar getTimeRegistrationOverDate() { - return getCastle().getTimeRegistrationOverDate(); + return _castle.getTimeRegistrationOverDate(); } public void endTimeRegistration(boolean automatic) { - getCastle().setIsTimeRegistrationOver(true); + _castle.setIsTimeRegistrationOver(true); if (!automatic) { saveSiegeDate(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java index f09be6765f..ac490ba86d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -129,7 +129,7 @@ public class EventScheduler run(); updateLastRun(); - if (isRepeating()) + if (_repeat) { ThreadPool.schedule(this::startScheduler, 1000); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index eae25b08f7..1d42731b7a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() @@ -46,16 +46,16 @@ public final class MovieHolder public void playerEscapeVote(L2PcInstance player) { - if (getVotedPlayers().contains(player) || !getPlayers().contains(player) || !getMovie().isEscapable()) + if (_votedPlayers.contains(player) || !_players.contains(player) || !_movie.isEscapable()) { return; } - getVotedPlayers().add(player); + _votedPlayers.add(player); - if (((getVotedPlayers().size() * 100) / getPlayers().size()) >= 50) + if (((_votedPlayers.size() * 100) / _players.size()) >= 50) { - getPlayers().forEach(L2PcInstance::stopMovie); + _players.forEach(L2PcInstance::stopMovie); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index a4fde8355e..4bc6353cfa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -487,7 +487,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return Collections.emptyList(); } @@ -502,7 +502,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } return npcs; } @@ -516,7 +516,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return; } @@ -526,7 +526,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } } @@ -810,7 +810,7 @@ public final class Instance implements IIdentifiable, INamable public void setReenterTime(long time) { // Cannot store reenter data for instance without template id. - if ((getTemplateId() == -1) && (time > 0)) + if ((_template.getId() == -1) && (time > 0)) { return; } @@ -824,7 +824,7 @@ public final class Instance implements IIdentifiable, INamable if (player != null) { ps.setInt(1, player.getObjectId()); - ps.setInt(2, getTemplateId()); + ps.setInt(2, _template.getId()); ps.setLong(3, time); ps.addBatch(); } @@ -835,11 +835,11 @@ public final class Instance implements IIdentifiable, INamable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null) { - msg.addInstanceName(getTemplateId()); + msg.addInstanceName(_template.getId()); } else { - msg.addString(getName()); + msg.addString(_template.getName()); } _allowed.forEach(player -> { @@ -995,7 +995,7 @@ public final class Instance implements IIdentifiable, INamable removePlayer(player); if (Config.RESTORE_PLAYER_INSTANCE) { - player.getVariables().set("INSTANCE_RESTORE", getId()); + player.getVariables().set("INSTANCE_RESTORE", _id); } else { @@ -1161,6 +1161,6 @@ public final class Instance implements IIdentifiable, INamable @Override public String toString() { - return getName() + "(" + getId() + ")"; + return _template.getName() + "(" + _id + ")"; } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 409678ea5a..ba6f5482ad 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -788,6 +788,6 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl @Override public String toString() { - return "ID: " + getId() + " Name: " + getName(); + return "ID: " + _templateId + " Name: " + _name; } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 4ebae030de..24c473792a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -181,12 +181,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -250,7 +250,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -340,7 +340,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5bb5770412..9e94b591e8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -115,9 +115,9 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - statement.setInt(1, getOwnerId()); + statement.setInt(1, _ownerId); statement.setString(2, getBaseLocation().name()); - statement.setInt(3, getMessageId()); + statement.setInt(3, _messageId); try (ResultSet inv = statement.executeQuery()) { while (inv.next()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 3dbb712a6b..c01533e2c8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -150,7 +150,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -211,7 +211,7 @@ public class PcInventory extends Inventory { return getItems(i -> { - if (!i.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) + if (!i.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) { return false; } @@ -232,7 +232,7 @@ public class PcInventory extends Inventory { //@formatter:off return _items.values().stream() - .filter(i -> i.isAvailable(getOwner(), false, false)) + .filter(i -> i.isAvailable(_owner, false, false)) .map(tradeList::adjustAvailableItem) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -689,12 +689,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (getOwner().isProcessingItem(item.getObjectId())) + if (_owner.isProcessingItem(item.getObjectId())) { - getOwner().removeRequestsThatProcessesItem(item.getObjectId()); + _owner.removeRequestsThatProcessesItem(item.getObjectId()); } if (item.getId() == ADENA_ID) @@ -720,7 +720,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(true); + _owner.refreshOverloaded(true); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 87c35d5d82..fa6332fb1f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -120,7 +120,7 @@ public class PetInventory extends Inventory { if (item.isEquipped()) { - if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (!item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 4c8db6b288..dbba43acd0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -73,6 +73,6 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index a04975542f..8d988d61be 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -89,7 +89,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java index c86ec8ca9b..5089b53c7f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -411,11 +411,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -430,11 +430,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -528,7 +528,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -585,7 +585,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -776,7 +776,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) { if (isEquipable()) { @@ -789,7 +789,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return false; } - if (isCocRestrictedItem() && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_is_coc_restricted && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 1db19c172a..a0ee0a7895 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -119,7 +119,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 0f9a69fec3..d9baca8329 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -274,7 +274,7 @@ public class AppearanceStone return false; } - switch (getType()) + switch (_type) { case RESTORE: { @@ -383,15 +383,15 @@ public class AppearanceStone return false; } - if (getWeaponType() != WeaponType.NONE) + if (_weaponType != WeaponType.NONE) { - if (!targetItem.isWeapon() || (targetItem.getItemType() != getWeaponType())) + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); return false; } - switch (getHandType()) + switch (_handType) { case ONE_HANDED: { @@ -413,7 +413,7 @@ public class AppearanceStone } } - switch (getMagicType()) + switch (_magicType) { case MAGICAL: { @@ -435,9 +435,9 @@ public class AppearanceStone } } - if (getArmorType() != ArmorType.NONE) + if (_armorType != ArmorType.NONE) { - switch (getArmorType()) + switch (_armorType) { case SHIELD: { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 7cee2440b5..2a22942d41 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -321,14 +321,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -337,7 +337,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -359,7 +359,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -475,7 +475,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -497,12 +497,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -512,7 +512,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -535,7 +535,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -552,9 +552,9 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isEnchantable(); + return _item.isEnchantable(); } return 0; } @@ -649,7 +649,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -723,7 +723,7 @@ public final class L2ItemInstance extends L2Object /** * @return the reference price of the item. */ - public int getReferencePrice() + public long getReferencePrice() { return _item.getReferencePrice(); } @@ -873,7 +873,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -887,12 +887,12 @@ public final class L2ItemInstance extends L2Object final L2Summon pet = player.getPet(); return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -956,7 +956,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1132,9 +1132,9 @@ public final class L2ItemInstance extends L2Object { if (isWeapon()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - return getItem().getAttributes().stream().findFirst().orElse(null); + return _item.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1160,9 +1160,9 @@ public final class L2ItemInstance extends L2Object { if (isArmor()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - final AttributeHolder attribute = getItem().getAttribute(element); + final AttributeHolder attribute = _item.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1404,7 +1404,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1426,7 +1426,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1608,11 +1608,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1644,12 +1644,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1827,7 +1827,7 @@ public final class L2ItemInstance extends L2Object player.sendInventoryUpdate(iu); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1841,7 +1841,7 @@ public final class L2ItemInstance extends L2Object { player.getWarehouse().destroyItem("L2ItemInstance", this, player, null); } - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(getId())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId)); } } @@ -1938,32 +1938,32 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isElementable(); + return _item.isElementable(); } return false; } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -1980,7 +1980,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && (getItem().getSkills(ItemSkillType.NORMAL) != null); + return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -1993,7 +1993,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2014,7 +2014,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2228,7 +2228,15 @@ public final class L2ItemInstance extends L2Object iu.addModifiedItem(this); player.broadcastUserInfo(UserInfoType.APPAREANCE); player.sendInventoryUpdate(iu); - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + + if (isEnchanted()) + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this)); + } + else + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + } } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 4858feb6a9..9a7dbcac0d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/options/Options.java index 813ec8f6db..630038eb77 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/options/Options.java @@ -189,14 +189,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { addSkill(player, holder.getSkill()); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { addSkill(player, holder.getSkill()); } @@ -227,14 +227,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { player.removeSkill(holder.getSkill(), false, false); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { player.removeSkill(holder.getSkill(), false, true); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java index 02004e3c1a..1419b638f0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2737,7 +2737,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2750,9 +2749,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); @@ -2940,7 +2939,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if (activeChar.getQuestState(getName()) != null) { - final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList packet = new ExQuestNpcLogList(_questId); getNpcLogList(activeChar).forEach(packet::add); activeChar.sendPacket(packet); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 40aa1878fd..5e0a66a375 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + _questName + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -755,7 +755,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 4013de0733..1cf9e26073 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,13 +53,13 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; - private final ScheduledFuture _schedular; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; + private final ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) { @@ -68,7 +68,7 @@ public class QuestTimer _player = player; _npc = npc; _isRepeating = repeating; - _schedular = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); + _scheduler = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); } public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) @@ -87,9 +87,9 @@ public class QuestTimer public void cancel() { _isActive = false; - if (_schedular != null) + if (_scheduler != null) { - _schedular.cancel(false); + _scheduler.cancel(false); } } @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java index 73f5ed97a8..81ec17cf73 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -132,7 +132,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -152,7 +152,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + _residenceId, e); } } @@ -173,7 +173,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN ps.setInt(1, func.getId()); ps.setInt(2, func.getLevel()); ps.setLong(3, func.getExpiration()); - ps.setInt(4, getResidenceId()); + ps.setInt(4, _residenceId); ps.setInt(5, func.getLevel()); ps.setLong(6, func.getExpiration()); @@ -181,7 +181,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + _residenceId, e); } finally { @@ -202,13 +202,13 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ? and id = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.setInt(2, func.getId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + _residenceId, e); } finally { @@ -225,12 +225,12 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + _residenceId, e); } finally { @@ -313,6 +313,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + " (" + getResidenceId() + ")"; + return _name + " (" + _residenceId + ")"; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index ab2394ed74..cac8ecf953 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -333,7 +333,7 @@ public final class BuffInfo } // Call on start. - effect.onStart(getEffector(), getEffected(), getSkill()); + effect.onStart(_effector, _effected, _skill); // If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it. if (effect.getTicks() > 0) @@ -360,7 +360,7 @@ public final class BuffInfo if (_isInUse) { // Callback for on action time event. - continueForever = effect.onActionTime(getEffector(), getEffected(), getSkill()); + continueForever = effect.onActionTime(_effector, _effected, _skill); } if (!continueForever && _skill.isToggle()) @@ -369,7 +369,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -391,7 +391,7 @@ public final class BuffInfo // Instant effects shouldn't call onExit(..). if (!effect.isInstant()) { - effect.onExit(getEffector(), getEffected(), getSkill()); + effect.onExit(_effector, _effected, _skill); } } @@ -403,7 +403,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java index 19a1a61b20..1cea15b228 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -240,15 +240,15 @@ public final class Skill implements IIdentifiable _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -441,7 +441,7 @@ public final class Skill implements IIdentifiable } _magicCriticalRate = set.getDouble("magicCriticalRate", 0); - _buffType = isTriggeredSkill() ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : isDebuff() ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; + _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); } @@ -1054,7 +1054,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getMaxSoulConsumeCount() @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable public boolean isStayAfterDeath() { - return _stayAfterDeath || isIrreplacableBuff() || isNecessaryToggle(); + return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle; } public boolean isBad() @@ -1333,7 +1333,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isIgnoringSkillEffects(getId(), getLevel())) + if (effected.isIgnoringSkillEffects(_id, _level)) { return; } @@ -1357,7 +1357,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1368,19 +1368,19 @@ public final class Skill implements IIdentifiable } // Check for mesmerizing debuffs and increase resist level. - if (isDebuff() && (getBasicProperty() != BasicProperty.NONE) && effected.hasBasicPropertyResist()) + if (_isDebuff && (_basicProperty != BasicProperty.NONE) && effected.hasBasicPropertyResist()) { - final BasicPropertyResist resist = effected.getBasicPropertyResist(getBasicProperty()); + final BasicPropertyResist resist = effected.getBasicPropertyResist(_basicProperty); resist.increaseResistLevel(); } } // Support for buff sharing feature including healing herbs. - if (isSharedWithSummon() && effected.isPlayer() && effected.hasServitors() && !isTransformation()) + if (_isSharedWithSummon && effected.isPlayer() && effected.hasServitors() && !isTransformation()) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - effected.getServitors().values().forEach(s -> applyEffects(effector, s, isRecoveryHerb(), 0)); + effected.getServitors().values().forEach(s -> applyEffects(effector, s, _isRecoveryHerb, 0)); } } } @@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1413,7 +1413,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && isSharedWithSummon() && info.getEffected().isPlayer() && isContinuous() && !isDebuff() && info.getEffected().hasServitors()) + if (addContinuousEffects && _isSharedWithSummon && info.getEffected().isPlayer() && isContinuous() && !_isDebuff && info.getEffected().hasServitors()) { info.getEffected().getServitors().values().forEach(s -> applyEffects(effector, s, false, 0)); } @@ -1498,9 +1498,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0, item); } @@ -1517,7 +1517,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1571,7 +1571,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isIrreplacableBuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispelled(); + return !isPassive() && !isToggle() && !_isDebuff && !_irreplacableBuff && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispelled; } public boolean isClanSkill() @@ -1733,20 +1733,20 @@ public final class Skill implements IIdentifiable public Skill getAttachedSkill(L2Character activeChar) { // If character is double casting, return double cast skill. - if ((getDoubleCastSkill() > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) + if ((_doubleCastSkill > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) { return SkillData.getInstance().getSkill(getDoubleCastSkill(), getLevel(), getSubLevel()); } // Default toggle group ID, assume nothing attached. - if ((getAttachToggleGroupId() <= 0) || (getAttachSkills() == null)) + if ((_attachToggleGroupId <= 0) || (_attachSkills == null)) { return null; } //@formatter:off final int toggleSkillId = activeChar.getEffectList().getEffects().stream() - .filter(info -> info.getSkill().getToggleGroupId() == getAttachToggleGroupId()) + .filter(info -> info.getSkill().getToggleGroupId() == _attachToggleGroupId) .mapToInt(info -> info.getSkill().getId()) .findAny().orElse(0); //@formatter:on @@ -1757,7 +1757,7 @@ public final class Skill implements IIdentifiable return null; } - final AttachSkillHolder attachedSkill = getAttachSkills().stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); + final AttachSkillHolder attachedSkill = _attachSkills.stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); // No attached skills for this toggle found. if (attachedSkill == null) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 8e607be078..f5da8aed03 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -99,7 +99,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -160,7 +160,7 @@ public class SkillChannelizer implements Runnable if (o.isCharacter()) { targetList.add((L2Character) o); - ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), _channelizer); } }); } @@ -198,13 +198,13 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer()) + if (character.isPlayable() && _channelizer.isPlayer()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } // Be warned, this method has the possibility to call doDie->abortCast->stopChanneling method. Variable cache above try"+ +" is used in this case to avoid NPEs. - channeledSkill.applyEffects(getChannelizer(), character); + channeledSkill.applyEffects(_channelizer, character); // Reduce shots. if (skill.useSpiritShot()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index f8dfd518a6..30203b6450 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -145,7 +145,7 @@ public final class TeleportHolder // Build html final StringBuilder sb = new StringBuilder(); final StringBuilder sb_f = new StringBuilder(); - for (TeleportLocation loc : getLocations()) + for (TeleportLocation loc : _teleportData) { String finalName = loc.getName(); String confirmDesc = loc.getName(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 66f0ce1b9f..69519245dc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -205,7 +205,7 @@ public abstract class L2ZoneType extends ListenersContainer final Instance world = character.getInstanceWorld(); if (world != null) { - if (world.getTemplateId() != getInstanceTemplateId()) + if (world.getTemplateId() != _instanceTemplateId) { return false; } @@ -214,7 +214,7 @@ public abstract class L2ZoneType extends ListenersContainer return false; } } - else if (getInstanceTemplateId() > 0) + else if (_instanceTemplateId > 0) { return false; } @@ -402,12 +402,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -572,7 +572,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) @@ -605,10 +605,10 @@ public abstract class L2ZoneType extends ListenersContainer { if (_enabledInInstance != null) { - return _enabledInInstance.getOrDefault(instanceId, isEnabled()); + return _enabledInInstance.getOrDefault(instanceId, _enabled); } - return isEnabled(); + return _enabled; } public void oustAllPlayers() @@ -633,7 +633,7 @@ public abstract class L2ZoneType extends ListenersContainer return; } - for (L2Character character : getCharactersInside()) + for (L2Character character : _characterList.values()) { if ((character != null) && character.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 33d3bb8723..6a7479f3af 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public final class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -257,7 +257,7 @@ public final class L2EffectZone extends L2ZoneType { getCharactersInside().forEach(character -> { - if ((character != null) && !character.isDead() && (Rnd.get(100) < getChance())) + if ((character != null) && !character.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index a1a99b7051..95223b63a9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9b786f0b7d..f1e975876e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -252,7 +252,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -533,7 +533,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -603,11 +603,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 8aa642c02a..1c02d43810 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -56,7 +56,7 @@ public final class RequestRecipeItemMakeSelf implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index ba40366a3e..fda43da41c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -79,7 +79,7 @@ public final class RequestRecipeShopMakeItem implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index dad7c7aefa..86324a84a0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -120,7 +120,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket return; } - final int price = itemInstance.getReferencePrice(); + final long price = itemInstance.getReferencePrice(); if (itemInstance.getReferencePrice() == 0) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_COMBINED); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index b3f8a823c8..ad3f971eda 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -59,7 +59,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); return; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 4fe4ef7d8c..75c44c649d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -54,7 +54,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 97d035b0f3..1d6ef78348 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -62,7 +62,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExShapeShiftingResult.CLOSE); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 77f3e3b00b..5e0c42c02a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -429,7 +429,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java index 1a16f0bd49..934a748fa3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 17f3f7f21b..bda9f2f3e5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -68,7 +68,7 @@ public final class OfflineTradeUtil } default: { - canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isInCraftMode(); + canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isCrafting(); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 4911f2826c..e5388f4596 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -240,7 +240,7 @@ public class TaskExecutor */ public void pause() throws UnsupportedOperationException { - if (!canBePaused()) + if (!task.canBePaused()) { throw new UnsupportedOperationException("Pause not supported"); } @@ -276,7 +276,7 @@ public class TaskExecutor */ public void stop() throws UnsupportedOperationException { - if (!canBeStopped()) + if (!task.canBeStopped()) { throw new UnsupportedOperationException("Stop not supported"); } @@ -346,7 +346,7 @@ public class TaskExecutor */ public String getStatusMessage() throws UnsupportedOperationException { - if (!supportsStatusTracking()) + if (!task.supportsStatusTracking()) { throw new UnsupportedOperationException("Status tracking not supported"); } @@ -360,7 +360,7 @@ public class TaskExecutor */ public double getCompleteness() throws UnsupportedOperationException { - if (!supportsCompletenessTracking()) + if (!task.supportsCompletenessTracking()) { throw new UnsupportedOperationException("Completeness tracking not supported"); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java index 85dbd2a34a..7d9ec1824b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java index da20164f21..068a5f1773 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 859128de7b..c90c8127a6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -286,7 +286,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -314,10 +314,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -376,59 +376,59 @@ public abstract class BaseGameServerRegister if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.printf(getBundle().getString("checkingIdInUse") + Config.EOL, _id); + System.out.printf(_bundle.getString("checkingIdInUse") + Config.EOL, _id); if (GameServerTable.getInstance().hasRegisteredGameServerOnId(_id)) { - System.out.println(getBundle().getString("yes")); + System.out.println(_bundle.getString("yes")); if (_force) { - System.out.printf(getBundle().getString("forcingRegistration") + Config.EOL, _id); + System.out.printf(_bundle.getString("forcingRegistration") + Config.EOL, _id); unregisterGameServer(_id); registerGameServer(_id, _outDir); - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, _id); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, _id); } else if (_fallback) { - System.out.println(getBundle().getString("fallingBack")); + System.out.println(_bundle.getString("fallingBack")); final int registeredId = registerFirstAvailable(_outDir); if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.println(getBundle().getString("noAction")); + System.out.println(_bundle.getString("noAction")); } } else { - System.out.println(getBundle().getString("no")); + System.out.println(_bundle.getString("no")); registerGameServer(_id, _outDir); } } } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } catch (IOException e) { - showError(getBundle().getString("ioErrorRegister"), e); + showError(_bundle.getString("ioErrorRegister"), e); } } } @@ -453,14 +453,14 @@ public abstract class BaseGameServerRegister @Override public void run() { - System.out.printf(getBundle().getString("removingGsId") + Config.EOL, _id); + System.out.printf(_bundle.getString("removingGsId") + Config.EOL, _id); try { unregisterGameServer(_id); } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } } } @@ -479,7 +479,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 59ca8fcc83..6251faab77 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -40,7 +40,7 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING); return false; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/SocialAction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/SocialAction.java index f7db8c36f7..fde530a2b4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/SocialAction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/SocialAction.java @@ -149,7 +149,7 @@ public final class SocialAction implements IPlayerActionHandler } SystemMessage sm; - if (player.isInStoreMode() || player.isInCraftMode()) + if (player.isInStoreMode() || player.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(player); @@ -228,7 +228,7 @@ public final class SocialAction implements IPlayerActionHandler // Checks for partner. final L2PcInstance partner = target.getActingPlayer(); - if (partner.isInStoreMode() || partner.isInCraftMode()) + if (partner.isInStoreMode() || partner.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(partner); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 881d3eb70b..135edbc233 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -530,7 +530,7 @@ public class Q00663_SeductiveWhispers extends Quest @Override public String toString() { - return getSide() == Side.MOON ? "" + getSide().getName() + ": " + getNumber() + "" : "" + getSide().getName() + ": " + getNumber() + ""; + return _side == Side.MOON ? "" + _side.getName() + ": " + _number + "" : "" + _side.getName() + ": " + _number + ""; } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/PacketReader.java index ea90113f43..bdf5c76ac8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/RecipeController.java index 5bf504afb5..ef52c215f3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/RecipeController.java @@ -199,7 +199,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -291,7 +291,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -438,7 +438,7 @@ public class RecipeController // update load and mana bar of craft window updateCurMp(); _activeMakers.remove(_player.getObjectId()); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendItemList(false); } @@ -654,7 +654,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player.getObjectId()); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java index cad4fb54da..717f999c27 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -608,7 +608,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -648,7 +648,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -680,7 +680,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player)) + if (_actor.isVisibleFor(player)) { if (_clientMoving) { @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (getTarget() instanceof L2Character) && (getIntention() == AI_INTENTION_FOLLOW); + return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); } /** @@ -737,7 +737,7 @@ public abstract class AbstractAI implements Ctrl return; } - final L2Object followTarget = getTarget(); // copy to prevent NPE + final L2Object followTarget = _target; // copy to prevent NPE if (followTarget == null) { if (_actor.isSummon()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8826f4e507..3880807630 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -166,7 +166,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, max_range); } @@ -216,7 +216,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -256,7 +256,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 4f3a018802..0052f4791d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -224,7 +224,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtAttacked(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } @@ -239,7 +239,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtEvaded(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java index 3127c4156e..265a5a6758 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -66,7 +66,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index 316e1ed757..dd22855ae4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index a60a111c2d..77aa1fb5fb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -133,7 +133,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -345,7 +345,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index ff236652e3..c60afbd78a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -48,9 +48,9 @@ public class AttendanceRewardData implements IGameXmlReader { if (Config.ENABLE_ATTENDANCE_REWARDS) { - getRewards().clear(); + _rewards.clear(); parseDatapackFile("data/AttendanceRewards.xml"); - _rewardsCount = getRewards().size(); + _rewardsCount = _rewards.size(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _rewardsCount + " rewards."); } else @@ -73,7 +73,7 @@ public class AttendanceRewardData implements IGameXmlReader } else { - getRewards().add(new ItemHolder(itemId, itemCount)); + _rewards.add(new ItemHolder(itemId, itemCount)); } })); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java index 712d1febdd..6618dcdf1d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java @@ -108,7 +108,7 @@ public final class CastleData implements IGameXmlReader guards.add(new SiegeGuardHolder(castleId, itemId, type, stationary, npcId, npcMaxAmount)); } } - getSiegeGuards().put(castleId, guards); + _siegeGuards.put(castleId, guards); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b0b755ac92..db7fdf9fa6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -258,7 +258,7 @@ public class RecipeData implements IGameXmlReader if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage("No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java index ac3c07c3c9..d5266c07ef 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/enums/AttributeType.java @@ -63,7 +63,7 @@ public enum AttributeType */ public AttributeType getOpposite() { - return ATTRIBUTE_TYPES[((getClientId() % 2) == 0) ? (getClientId() + 1) : (getClientId() - 1)]; + return ATTRIBUTE_TYPES[((_clientId % 2) == 0) ? (_clientId + 1) : (_clientId - 1)]; } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2615be0ddf..f0275d4660 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 792edf3cba..afc836f427 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -68,7 +68,7 @@ public final class CastleManager implements InstanceListManager if (nearestCastle == null) { double distance; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { distance = castle.getDistance(obj); if (maxDistance > distance) @@ -88,7 +88,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastleByOwner(L2Clan clan) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getOwnerId() == clan.getId()) { @@ -100,7 +100,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(String name) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getName().equalsIgnoreCase(name.trim())) { @@ -112,7 +112,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(int x, int y, int z) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.checkIfInZone(x, y, z)) { @@ -135,7 +135,7 @@ public final class CastleManager implements InstanceListManager public boolean hasOwnedCastle() { boolean hasOwnedCastle = false; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { if (castle.getOwnerId() > 0) { @@ -224,7 +224,7 @@ public final class CastleManager implements InstanceListManager final int castleId = rs.getInt("id"); _castles.put(castleId, new Castle(castleId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCastles().size() + " castles."); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.values().size() + " castles."); } catch (Exception e) { @@ -240,7 +240,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { castle.activateInstance(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index dc63278e16..37f7cd0a21 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -47,7 +47,7 @@ public final class FortManager implements InstanceListManager Fort nearestFort = getFort(obj); if (nearestFort == null) { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { final double distance = fort.getDistance(obj); if (maxDistance > distance) @@ -62,7 +62,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getResidenceId() == fortId) { @@ -74,7 +74,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getOwnerClan() == clan) { @@ -86,7 +86,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -98,7 +98,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.checkIfInZone(x, y, z)) { @@ -131,8 +131,8 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); - for (Fort fort : getForts()) + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.values().size() + " fortress"); + for (Fort fort : _forts.values()) { fort.getSiege().loadSiegeGuard(); } @@ -151,7 +151,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { fort.activateInstance(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 58b75f592d..0b4c7601cb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -102,7 +102,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -115,7 +115,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -128,7 +128,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -141,7 +141,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -159,7 +159,7 @@ public final class MailManager public int getMailsInProgress(int objectId) { int count = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getMailType() == MailType.REGULAR)) { @@ -179,7 +179,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 41216a0555..30581681f4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -244,7 +244,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return (currPetition.getState() == PetitionState.IN_PROCESS); } @@ -252,7 +252,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -283,7 +283,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -302,7 +302,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -312,7 +312,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -330,7 +330,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -363,12 +363,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("

There are no currently pending petitions.
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -379,7 +379,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -419,7 +419,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -440,7 +440,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 964757069c..20b6c07319 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -171,7 +171,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java index 1b0e62c021..83b903b671 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -277,7 +277,7 @@ public final class CharEffectList */ public int getBuffCount() { - return _actives != null ? (_buffCount.intValue() - _hiddenBuffs.get()) : 0; + return _actives != null ? (_buffCount.get() - _hiddenBuffs.get()) : 0; } /** @@ -287,7 +287,7 @@ public final class CharEffectList */ public int getDanceCount() { - return _danceCount.intValue(); + return _danceCount.get(); } /** @@ -297,7 +297,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return _triggerBuffCount.intValue(); + return _triggerBuffCount.get(); } /** @@ -307,7 +307,7 @@ public final class CharEffectList */ public int getToggleCount() { - return _toggleCount.intValue(); + return _toggleCount.get(); } /** @@ -317,7 +317,7 @@ public final class CharEffectList */ public int getDebuffCount() { - return _debuffCount.intValue(); + return _debuffCount.get(); } /** @@ -352,7 +352,7 @@ public final class CharEffectList */ public void stopAllToggles() { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { // Ignore necessary toggles. stopEffects(b -> b.getSkill().isToggle() && !b.getSkill().isNecessaryToggle() && !b.getSkill().isIrreplacableBuff(), true, true); @@ -361,7 +361,7 @@ public final class CharEffectList public void stopAllTogglesOfGroup(int toggleGroup) { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { stopEffects(b -> b.getSkill().isToggle() && (b.getSkill().getToggleGroupId() == toggleGroup), true, true); } @@ -508,7 +508,7 @@ public final class CharEffectList */ public void stopEffectsOnAction() { - if (_hasBuffsRemovedOnAnyAction.intValue() > 0) + if (_hasBuffsRemovedOnAnyAction.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnAnyActionExceptMove(), true, true); } @@ -516,7 +516,7 @@ public final class CharEffectList public void stopEffectsOnDamage() { - if (_hasBuffsRemovedOnDamage.intValue() > 0) + if (_hasBuffsRemovedOnDamage.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnDamage(), true, true); } @@ -535,16 +535,16 @@ public final class CharEffectList { case TRIGGER: { - return (getTriggeredBuffCount() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); + return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); } case DANCE: { - return (getDanceCount() > Config.DANCES_MAX_AMOUNT); + return (_danceCount.get() > Config.DANCES_MAX_AMOUNT); } // case TOGGLE: Do toggles have limit? case DEBUFF: { - return (getDebuffCount() > 24); + return (_debuffCount.get() > 24); } case BUFF: { @@ -1106,7 +1106,7 @@ public final class CharEffectList final Skill skill = info.getSkill(); // Handle hidden buffs. Check if there was such abnormal before so we can continue. - if ((getHiddenBuffsCount() > 0) && _stackedEffects.contains(skill.getAbnormalType())) + if ((_hiddenBuffs.get() > 0) && _stackedEffects.contains(skill.getAbnormalType())) { // If incoming buff isnt hidden, remove any hidden buffs with its abnormal type. if (info.isInUse()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 8de8a2fb0e..2265d6876c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -71,7 +71,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java index 56b6c3e94a..d7045c8769 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java @@ -110,7 +110,7 @@ public class Fishing public synchronized void startFishing() { - if (isFishing()) + if (_isFishing) { return; } @@ -132,7 +132,7 @@ public class Fishing if (!canFish()) { - if (isFishing()) + if (_isFishing) { _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); } @@ -182,7 +182,7 @@ public class Fishing return; } - if (_player.isInCraftMode() || _player.isInStoreMode()) + if (_player.isCrafting() || _player.isInStoreMode()) { _player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -201,7 +201,7 @@ public class Fishing _baitLocation = calculateBaitLocation(); if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null)) { - if (isFishing()) + if (_isFishing) { // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -262,7 +262,7 @@ public class Fishing private void reelIn(FishingEndReason reason, boolean consumeBait) { - if (!isFishing()) + if (!_isFishing) { return; } @@ -326,7 +326,7 @@ public class Fishing public synchronized void stopFishing(FishingEndType endType) { - if (isFishing()) + if (_isFishing) { reelIn(FishingEndReason.STOP, false); _isFishing = false; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index ec834bcb34..c05e0915be 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -177,7 +177,7 @@ public final class L2ArmorSet public int getLowestSetEnchant(L2PcInstance player) { // Player don't have full set - if (getPiecesCount(player, L2ItemInstance::getId) < getMinimumPieces()) + if (getPiecesCount(player, L2ItemInstance::getId) < _minimumPieces) { return 0; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java index 46a329c1a0..091545ed6f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -170,7 +170,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); final ClanRewardBonus availableOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(this); if ((_lastMembersOnlineBonus == null) && (availableOnlineBonus != null)) @@ -242,7 +242,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -278,7 +278,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - LOGGER.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + _name + " without clan leader!"); return ""; } return _leader.getName(); @@ -570,7 +570,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -608,7 +608,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -628,7 +628,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -882,8 +882,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -926,8 +926,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -942,8 +942,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -978,15 +978,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1015,19 +1015,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1071,7 +1071,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1084,12 +1084,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1109,7 +1109,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1146,7 +1146,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1177,7 +1177,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1237,7 +1237,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1364,7 +1364,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1372,7 +1372,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1612,7 +1612,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1765,7 +1765,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1855,7 +1855,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); return null; @@ -1864,7 +1864,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1879,11 +1879,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1949,7 +1949,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1965,7 +1965,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2014,7 +2014,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2026,7 +2026,7 @@ public class L2Clan implements IIdentifiable, INamable LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } - for (L2ClanMember cm : getMembers()) + for (L2ClanMember cm : _members.values()) { if (cm.isOnline()) { @@ -2050,7 +2050,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2090,12 +2090,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2169,7 +2169,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2206,7 +2206,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2238,7 +2238,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2390,22 +2390,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2426,7 +2426,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2439,12 +2439,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2483,7 +2483,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2491,7 +2491,7 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; - switch (getLevel()) + switch (_level) { case 0: { @@ -2589,9 +2589,9 @@ public class L2Clan implements IIdentifiable, INamable case 5: { // Upgrade to 6 - if ((getReputationScore() >= Config.CLAN_LEVEL_6_COST) && (getMembersCount() >= Config.CLAN_LEVEL_6_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_6_COST) && (_members.size() >= Config.CLAN_LEVEL_6_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_6_COST); player.sendPacket(cr); @@ -2602,9 +2602,9 @@ public class L2Clan implements IIdentifiable, INamable case 6: { // Upgrade to 7 - if ((getReputationScore() >= Config.CLAN_LEVEL_7_COST) && (getMembersCount() >= Config.CLAN_LEVEL_7_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_7_COST) && (_members.size() >= Config.CLAN_LEVEL_7_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_7_COST); player.sendPacket(cr); @@ -2615,9 +2615,9 @@ public class L2Clan implements IIdentifiable, INamable case 7: { // Upgrade to 8 - if ((getReputationScore() >= Config.CLAN_LEVEL_8_COST) && (getMembersCount() >= Config.CLAN_LEVEL_8_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_8_COST) && (_members.size() >= Config.CLAN_LEVEL_8_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_8_COST); player.sendPacket(cr); @@ -2628,12 +2628,12 @@ public class L2Clan implements IIdentifiable, INamable case 8: { // Upgrade to 9 - if ((getReputationScore() >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (getMembersCount() >= Config.CLAN_LEVEL_9_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT)) { // itemId 9910 == Blood Oath if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_9_COST); player.sendPacket(cr); @@ -2649,12 +2649,12 @@ public class L2Clan implements IIdentifiable, INamable case 9: { // Upgrade to 10 - if ((getReputationScore() >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (getMembersCount() >= Config.CLAN_LEVEL_10_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (_members.size() >= Config.CLAN_LEVEL_10_REQUIREMENT)) { // itemId 9911 == Blood Alliance if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_10_COST); player.sendPacket(cr); @@ -2670,9 +2670,9 @@ public class L2Clan implements IIdentifiable, INamable case 10: { // Upgrade to 11 - if ((getReputationScore() >= Config.CLAN_LEVEL_11_COST) && (getMembersCount() >= Config.CLAN_LEVEL_11_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_11_COST) && (_members.size() >= Config.CLAN_LEVEL_11_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_11_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_11_COST); player.sendPacket(cr); @@ -2699,7 +2699,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendItemList(false); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2712,7 +2712,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2722,9 +2722,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2747,7 +2747,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2758,12 +2758,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2780,15 +2780,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2830,7 +2830,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2841,12 +2841,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -3116,7 +3116,7 @@ public class L2Clan implements IIdentifiable, INamable getVariables().set("PREVIOUS_HUNTING_POINTS", getHuntingPoints()); // Reset - getMembers().forEach(L2ClanMember::resetBonus); + _members.values().forEach(L2ClanMember::resetBonus); getVariables().remove("HUNTING_POINTS"); // force store @@ -3134,7 +3134,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_vars == null) { - _vars = new ClanVariables(getId()); + _vars = new ClanVariables(_clanId); if (Config.CLAN_VARIABLES_STORE_INTERVAL > 0) { ThreadPool.scheduleAtFixedRate(this::storeVariables, Config.CLAN_VARIABLES_STORE_INTERVAL, Config.CLAN_VARIABLES_STORE_INTERVAL); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ClanMember.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ClanMember.java index 139c302ce9..1ae5225355 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ClanMember.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2ClanMember.java @@ -855,7 +855,6 @@ public class L2ClanMember private PlayerVariables getVariables() { - final L2PcInstance player = getPlayerInstance(); - return player != null ? player.getVariables() : new PlayerVariables(_objectId); + return _player != null ? _player.getVariables() : new PlayerVariables(_objectId); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index d91e7e0554..df5da1b8ba 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Crest.java index dc3c3497a3..24eedf1679 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,42 +94,41 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - final byte[] data = getData(); - if (data != null) + if (_data != null) { for (int i = 0; i <= 4; i++) { if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); - activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); + System.arraycopy(_data, (14336 * i), fullChunk, 0, 14336); + activeChar.sendPacket(new ExPledgeEmblem(_id, fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); - activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); + System.arraycopy(_data, (14336 * i), lastChunk, 0, 8320); + activeChar.sendPacket(new ExPledgeEmblem(_id, lastChunk, 0, i)); } } } - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java index a1eb3d2480..5c086b9d83 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -52,7 +52,7 @@ public class L2Mentee try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT char_name, level, base_class FROM characters WHERE charId = ?")) { - statement.setInt(1, getObjectId()); + statement.setInt(1, _objectId); try (ResultSet rset = statement.executeQuery()) { if (rset.next()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java index 171ad1e543..70a2a9e6e2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Object.java @@ -148,15 +148,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -180,7 +175,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -242,7 +237,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -632,7 +627,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get()); } /** @@ -680,13 +675,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -781,7 +775,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -806,7 +800,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -880,19 +874,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -904,6 +897,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java index 9636853228..d01a52009e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java @@ -168,7 +168,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -195,7 +195,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -260,7 +260,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -279,7 +279,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -294,7 +294,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -305,14 +305,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if (pMember != null) { @@ -333,7 +333,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -357,7 +357,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -439,7 +439,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(target, tacticalSignId)); m.sendPacket(sm); @@ -450,7 +450,7 @@ public class L2Party extends AbstractPlayerGroup // Sign already assigned // If the sign is applied on the same target, remove it _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); + _members.forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); } else { @@ -462,7 +462,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); @@ -502,19 +502,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isInDuel()) @@ -573,25 +573,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(ExCloseMPCC.STATIC_PACKET); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -653,7 +653,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -663,9 +663,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -800,7 +800,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -930,11 +930,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2SiegeClan.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2SiegeClan.java index 2ba2a8a219..57266247c3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2SiegeClan.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2SiegeClan.java @@ -53,12 +53,12 @@ public class L2SiegeClan flag.deleteMe(); - return getFlag().remove(flag); + return _flags.remove(flag); } public void removeFlags() { - for (L2Npc flag : getFlag()) + for (L2Npc flag : _flags) { removeFlag(flag); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java index 1b7cb26b50..f36fed74eb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -511,7 +511,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocz = loc.getZ(); setLocation(loc); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -519,9 +519,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -539,16 +539,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } // Set custom Npc server side name and title @@ -670,7 +670,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } public final boolean getRandomWalking() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 97608b326d..4a88a92311 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java index 4b5e290517..3794527a37 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Location.java @@ -190,6 +190,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java index 4eb38cf27b..ef36048457 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -136,16 +136,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -200,12 +200,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + int choice = Rnd.nextInt(getMobs().size()); for (L2ControllableMobInstance mob : getMobs()) { if (--choice == 0) @@ -220,7 +220,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroupTable.java index da1b620a40..121e34e9c4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Petition.java index cbed80441a..ff4816d7ef 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TempItem.java index fa918cfc55..db4b2f817f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TempItem.java @@ -28,7 +28,7 @@ public final class TempItem { private final int _itemId; private int _quantity; - private final int _referencePrice; + private final long _referencePrice; private final String _itemName; /** @@ -60,7 +60,7 @@ public final class TempItem _quantity = quantity; } - public int getReferencePrice() + public long getReferencePrice() { return _referencePrice; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java index 197f137df5..7d0fa18073 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/TradeList.java @@ -195,7 +195,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -209,13 +209,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -265,7 +265,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -312,7 +312,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -607,15 +607,15 @@ public class TradeList boolean success = false; // check weight and slots - if (!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()) || !partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())) + if ((!_owner.getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if (!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())) || !partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))) + else if ((!_owner.getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -624,7 +624,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -649,7 +649,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -705,7 +705,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 5a9fc58f63..2787a91e5f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -208,7 +208,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -239,7 +239,7 @@ public class L2Attackable extends L2Npc addDamage(attacker, (int) value, skill); // Check Raidboss attack. Character will be petrified if attacking a raid that's more than 8 levels lower. In retail you deal damage to raid before curse. - if (isRaid() && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) + if (_isRaid && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) { if (attacker.getLevel() > (getLevel() + 8)) { @@ -386,7 +386,7 @@ public class L2Attackable extends L2Npc } // Calculate raidboss points - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final L2PcInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer(); broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); @@ -480,7 +480,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -489,8 +489,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -515,7 +515,7 @@ public class L2Attackable extends L2Npc } clan.addHuntingPoints(attacker, this, finalExp); } - attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, isRaid()), true, false); + attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp); } } @@ -592,7 +592,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -603,8 +603,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -984,7 +984,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1036,7 +1036,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); sm.addString(getName()); @@ -1048,7 +1048,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) + if (Config.CHAMPION_ENABLE && _champion && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY); final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty); @@ -1230,7 +1230,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() != _spoilerObjectId) && !sweeper.isInLooterParty(_spoilerObjectId)) { if (sendMessage) { @@ -1384,7 +1384,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1458,7 +1458,7 @@ public class L2Attackable extends L2Npc if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (isMonster() && !getTemplate().isUndying() && !_isRaid && !_isRaidMinion && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -1683,7 +1683,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b8662c6e57..a5d7f51aa7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -499,13 +499,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public double getCollisionRadius() { - final double defaultCollisionRadius = getTemplate().getCollisionRadius(); + final double defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } public double getCollisionHeight() { - final double defaultCollisionHeight = getTemplate().getCollisionHeight(); + final double defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -530,7 +530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -550,9 +550,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Stop on creature see task and clear the data @@ -584,7 +584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -649,8 +649,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -703,8 +703,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // HP - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); - su.addUpdate(StatusUpdateType.CUR_HP, (int) getCurrentHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); + su.addUpdate(StatusUpdateType.CUR_HP, (int) _status.getCurrentHp()); // MP computeStatusUpdate(su, StatusUpdateType.MAX_MP); @@ -1053,7 +1053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe mpConsume = weaponItem.getReducedMpConsume(); } mpConsume = isAffected(EffectFlag.CHEAPSHOT) ? 0 : mpConsume; - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1065,7 +1065,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } } } @@ -1073,7 +1073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final WeaponType attackType = getAttackType(); final boolean isTwoHanded = (weaponItem != null) && (weaponItem.getBodyPart() == L2Item.SLOT_LR_HAND); - final int timeAtk = Formulas.calculateTimeBetweenAttacks(getPAtkSpd()); + final int timeAtk = Formulas.calculateTimeBetweenAttacks(_stat.getPAtkSpd()); final int timeToHit = Formulas.calculateTimeToHit(timeAtk, weaponType, isTwoHanded, false); _attackEndTime = System.nanoTime() + (TimeUnit.MILLISECONDS.toNanos(timeAtk)); @@ -1196,12 +1196,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackCountMax = (int) getStat().getValue(Stats.ATTACK_COUNT_MAX, 1); - if ((attackCountMax > 1) && !(getStat().getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) + int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1); + if ((attackCountMax > 1) && !(_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) { final double headingAngle = Util.convertHeadingToDegree(getHeading()); - final int maxRadius = getStat().getPhysicalAttackRadius(); - final int physicalAttackAngle = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRadius(); + final int physicalAttackAngle = _stat.getPhysicalAttackAngle(); for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius)) { // Skip main target. @@ -1251,7 +1251,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss) { shld = Formulas.calcShldUse(this, target); - crit = Formulas.calcCrit(getStat().getCriticalHit(), this, target, null); + crit = Formulas.calcCrit(_stat.getCriticalHit(), this, target, null); damage = (int) Formulas.calcAutoAttackDamage(this, target, shld, crit, shotConsumed); if (halfDamage) { @@ -1294,7 +1294,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Try casting the skill - final SkillCaster skillCaster = SkillCaster.castSkill(this, getTarget(), skill, item, castingType, ctrlPressed, shiftPressed); + final SkillCaster skillCaster = SkillCaster.castSkill(this, _target, skill, item, castingType, ctrlPressed, shiftPressed); if ((skillCaster == null) && isPlayer()) { // Skill casting failed, notify player. @@ -1612,7 +1612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); if (isMonster()) { @@ -1676,9 +1676,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Remove all effects, do not broadcast changes. @@ -1696,26 +1696,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -1855,7 +1855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; } public final boolean isConfused() @@ -1915,7 +1915,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return hasBlockActions() || isRooted() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting(); + return hasBlockActions() || isRooted() || _isOverloaded || _isImmobilized || isAlikeDead() || _isTeleporting; } public final boolean isOverloaded() @@ -1934,7 +1934,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2023,7 +2023,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2048,7 +2048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2379,7 +2379,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.STUN); + _effectList.stopEffects(AbnormalType.STUN); } if (!isPlayer()) @@ -2402,11 +2402,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.TRANSFORM); - getEffectList().stopEffects(AbnormalType.CHANGEBODY); + _effectList.stopEffects(AbnormalType.TRANSFORM); + _effectList.stopEffects(AbnormalType.CHANGEBODY); } - if (isTransformed()) + if (_transform.isPresent()) { untransform(); } @@ -2517,7 +2517,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet. - if (isMoving() && (getMoveSpeed() <= 0)) + if (isMoving() && (_stat.getMoveSpeed() <= 0)) { stopMove(null); } @@ -2585,7 +2585,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxCp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp()); } break; } @@ -2597,7 +2597,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); } break; } @@ -2609,7 +2609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxMp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp()); } break; } @@ -2682,7 +2682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2924,7 +2924,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided @@ -2940,7 +2940,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -3147,7 +3147,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -3174,7 +3174,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -3252,7 +3252,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -3381,7 +3381,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -3428,7 +3428,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -3623,7 +3623,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void onHitTimeNotDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3652,7 +3652,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onFirstHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime, int delayForSecondAttack) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3682,7 +3682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onSecondHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime1, int hitTime2, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3970,10 +3970,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Stop all effects of that skill if (oldSkill.isPassive()) { - getEffectList().stopSkillEffects(true, oldSkill); + _effectList.stopSkillEffects(true, oldSkill); } - getStat().recalculateStats(true); + _stat.recalculateStats(true); } if (newSkill.isPassive()) @@ -4008,7 +4008,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) { stopSkillEffects(true, oldSkill.getId()); - getStat().recalculateStats(true); + _stat.recalculateStats(true); } } @@ -4105,7 +4105,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - final int random = (int) getStat().getValue(Stats.RANDOM_DAMAGE); + final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE); return (1 + ((double) Rnd.get(-random, random) / 100)); } @@ -4127,193 +4127,193 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public int getMagicAccuracy() { - return getStat().getMagicAccuracy(); + return _stat.getMagicAccuracy(); } public int getMagicEvasionRate() { - return getStat().getMagicEvasionRate(); + return _stat.getMagicEvasionRate(); } public final double getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(int init) { - return getStat().getCriticalDmg(init); + return _stat.getCriticalDmg(init); } public int getCriticalHit() { - return getStat().getCriticalHit(); + return _stat.getCriticalHit(); } public int getEvasionRate() { - return getStat().getEvasionRate(); + return _stat.getEvasionRate(); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public int getMAtk() { - return getStat().getMAtk(); + return _stat.getMAtk(); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit() { - return getStat().getMCriticalHit(); + return _stat.getMCriticalHit(); } public int getMDef() { - return getStat().getMDef(); + return _stat.getMDef(); } public int getPAtk() { - return getStat().getPAtk(); + return _stat.getPAtk(); } public int getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public int getPDef() { - return getStat().getPDef(); + return _stat.getPDef(); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } public int getLUC() { - return getStat().getLUC(); + return _stat.getLUC(); } public int getCHA() { - return getStat().getCHA(); + return _stat.getCHA(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) @@ -4338,7 +4338,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // RearDamage effect bonus. if (isBehind(target)) { - damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1); } // Counterattacks happen before damage received. @@ -4383,27 +4383,27 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Absorb HP from the damage inflicted double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1); - if ((absorbPercent > 0) && (Rnd.nextDouble() < getStat().getValue(Stats.ABSORB_DAMAGE_CHANCE))) + if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE))) { - int absorbDamage = (int) Math.min(absorbPercent * damage, getMaxRecoverableHp() - getCurrentHp()); + int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp()); if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted. Unconfirmed for skill attacks. if (skill == null) { - absorbPercent = getStat().getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); + absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); if (absorbPercent > 0) { - int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, getMaxRecoverableMp() - getCurrentMp()); + int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp()); if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } } @@ -4448,7 +4448,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - final double damageCap = getStat().getValue(Stats.DAMAGE_LIMIT); + final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT); if (damageCap > 0) { value = Math.min(value, damageCap); @@ -4459,17 +4459,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + getStat().getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; } else { - value *= (100 + getStat().getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; } } if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } else if (isPlayer()) { @@ -4477,7 +4477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } if (attacker != null) @@ -4488,83 +4488,83 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final int getCurrentCpPercent() { - return (int) ((getCurrentCp() * 100) / getMaxCp()); + return (int) ((_status.getCurrentCp() * 100) / _stat.getMaxCp()); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final void setCurrentCp(double newCp, boolean broadcast) { - getStatus().setCurrentCp(newCp, broadcast); + _status.setCurrentCp(newCp, broadcast); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final int getCurrentHpPercent() { - return (int) ((getCurrentHp() * 100) / getMaxHp()); + return (int) ((_status.getCurrentHp() * 100) / _stat.getMaxHp()); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHp(double newHp, boolean broadcast) { - getStatus().setCurrentHp(newHp, broadcast); + _status.setCurrentHp(newHp, broadcast); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final int getCurrentMpPercent() { - return (int) ((getCurrentMp() * 100) / getMaxMp()); + return (int) ((_status.getCurrentMp() * 100) / _stat.getMaxMp()); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } public final void setCurrentMp(double newMp, boolean broadcast) { - getStatus().setCurrentMp(newMp, false); + _status.setCurrentMp(newMp, false); } /** @@ -4577,7 +4577,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); - return (int) getStat().getValue(Stats.WEIGHT_LIMIT, baseLoad); + return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad); } return 0; } @@ -4586,7 +4586,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (isPlayer() || isPet()) { - return (int) getStat().getValue(Stats.WEIGHT_PENALTY, 1); + return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1); } return 0; } @@ -4623,17 +4623,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public AttributeType getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(AttributeType attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(AttributeType defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -4852,8 +4852,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return weapon.getItemType(); } - final WeaponType defaultWeaponType = getTemplate().getBaseAttackType(); - return getTransformation().map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); + final WeaponType defaultWeaponType = _template.getBaseAttackType(); + return _transform.map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); } public final boolean isInCategory(CategoryType type) @@ -5001,7 +5001,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).collect(Collectors.toList()); + return _skillCasters.values().stream().filter(filter).collect(Collectors.toList()); } @SafeVarargs @@ -5012,7 +5012,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).findAny().orElse(null); + return _skillCasters.values().stream().filter(filter).findAny().orElse(null); } /** @@ -5098,7 +5098,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -5128,7 +5128,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override @@ -5200,7 +5200,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean hasAbnormalType(AbnormalType abnormalType) { - return getEffectList().hasAbnormalType(abnormalType); + return _effectList.hasAbnormalType(abnormalType); } public void addBlockActionsAllowedSkill(int skillId) @@ -5267,11 +5267,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public MoveType getMoveType() { - if (isMoving() && isRunning()) + if (isMoving() && _isRunning) { return MoveType.RUNNING; } - else if (isMoving() && !isRunning()) + else if (isMoving() && !_isRunning) { return MoveType.WALKING; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 71cc537769..433cfdd815 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -372,7 +372,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -514,7 +514,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -745,7 +745,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -925,7 +925,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getReputation() >= 0)) @@ -999,10 +999,9 @@ public class L2Npc extends L2Character DecayTaskManager.getInstance().add(this); - final L2Spawn spawn = getSpawn(); - if (spawn != null) + if (_spawn != null) { - final NpcSpawnTemplate npcTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcTemplate = _spawn.getNpcSpawnTemplate(); if (npcTemplate != null) { npcTemplate.notifyNpcDeath(this, killer); @@ -1140,7 +1139,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1228,7 +1227,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1299,7 +1298,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1318,7 +1317,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1394,7 +1393,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic, boolean fish) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1474,7 +1473,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** @@ -1784,10 +1783,9 @@ public class L2Npc extends L2Character return _params; } - final L2Spawn spawn = getSpawn(); - if (spawn != null) // Minions doesn't have L2Spawn object bound + if (_spawn != null) // Minions doesn't have L2Spawn object bound { - final NpcSpawnTemplate npcSpawnTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { final StatsSet params = getTemplate().getParameters(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 7570bd494b..7249f1e9cc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -118,15 +118,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -196,7 +196,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if (player == getOwner()) + if (player == _owner) { player.sendPacket(new PetInfo(this, 1)); return; @@ -242,19 +242,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getReputation() { - return getOwner() != null ? getOwner().getReputation() : 0; + return _owner != null ? _owner.getReputation() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -313,8 +313,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -326,7 +325,7 @@ public abstract class L2Summon extends L2Playable final AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -392,7 +391,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); } @@ -434,12 +433,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } @@ -477,7 +476,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -546,7 +545,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, L2ItemInstance item, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -654,7 +653,7 @@ public abstract class L2Summon extends L2Playable if (skill.isBad()) { // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; @@ -673,7 +672,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -695,13 +694,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (crit) { @@ -715,14 +714,14 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } final SystemMessage sm; - if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF))) + if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF))) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } @@ -744,7 +743,7 @@ public abstract class L2Summon extends L2Playable { super.reduceCurrentHp(damage, attacker, skill); - if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) + if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -757,14 +756,13 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); - if ((skill.getTarget(this, false, false, false) == null) && !actingPlayer.getAccessLevel().allowPeaceAttack()) + if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance - actingPlayer.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + _owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // Send a Server->Client packet ActionFailed to the L2PcInstance - actingPlayer.sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -774,18 +772,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -796,10 +794,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } } @@ -807,7 +805,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -842,7 +840,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, isDead() ? 0 : 1)); if (isPet()) @@ -870,7 +868,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -904,7 +902,7 @@ public abstract class L2Summon extends L2Playable */ public void doAttack(L2Object target) { - if (getOwner() != null) + if (_owner != null) { if (target != null) { @@ -912,7 +910,7 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -926,12 +924,12 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(L2Object target, boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - if ((target == null) || (this == target) || (getOwner() == target)) + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -940,7 +938,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -960,28 +958,28 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -994,7 +992,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1014,18 +1012,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1041,14 +1039,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1059,7 +1057,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1071,14 +1069,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1086,13 +1084,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() @@ -1144,7 +1142,7 @@ public abstract class L2Summon extends L2Playable public void sendInventoryUpdate(InventoryUpdate iu) { - final L2PcInstance owner = getOwner(); + final L2PcInstance owner = _owner; if (owner != null) { owner.sendInventoryUpdate(iu); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index fe1f4c81cf..a03a262e08 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -74,7 +74,7 @@ public class PcAppearance { if (_visibleName == null) { - return getOwner().getName(); + return _owner.getName(); } return _visibleName; } @@ -94,7 +94,7 @@ public class PcAppearance { if (_visibleTitle == null) { - return getOwner().getTitle(); + return _owner.getTitle(); } return _visibleTitle; } @@ -220,27 +220,27 @@ public class PcAppearance public int getVisibleClanId() { - return _visibleClanId != -1 ? _visibleClanId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanId(); + return _visibleClanId != -1 ? _visibleClanId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanId(); } public int getVisibleClanCrestId() { - return _visibleClanCrestId != -1 ? _visibleClanCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestId(); + return _visibleClanCrestId != -1 ? _visibleClanCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestId(); } public int getVisibleClanLargeCrestId() { - return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestLargeId(); + return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestLargeId(); } public int getVisibleAllyId() { - return _visibleAllyId != -1 ? _visibleAllyId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyId(); + return _visibleAllyId != -1 ? _visibleAllyId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyId(); } public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 91548e2a10..7aae137ada 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -53,7 +53,7 @@ public class L2DecoyInstance extends L2Character _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; final int skilllevel = getTemplate().getDisplayId() - 13070; - _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); + _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -269,18 +269,18 @@ public class L2DecoyInstance extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index baab09b858..d82f30b44d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class L2DoorInstance extends L2Character { - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isInverted = false; private int _meshindex = 1; @@ -293,7 +293,7 @@ public final class L2DoorInstance extends L2Character { return false; } - else if (getIsAttackableDoor()) + else if (_isAttackableDoor) { return true; } @@ -369,13 +369,13 @@ public final class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - oe = new OnEventTrigger(getEmitter(), !isOpen()); + oe = new OnEventTrigger(getEmitter(), !_open); } else { - oe = new OnEventTrigger(getEmitter(), isOpen()); + oe = new OnEventTrigger(getEmitter(), _open); } } @@ -592,13 +592,13 @@ public final class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), !isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), !_open)); } else { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), _open)); } } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -649,7 +649,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -661,8 +661,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -671,7 +670,7 @@ public final class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 35cb265650..53df3b876a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -75,7 +75,7 @@ public class L2MonsterInstance extends L2Attackable } // Check if the L2MonsterInstance target is aggressive - if (Config.GUARD_ATTACK_AGGRO_MOB && isAggressive() && (attacker instanceof L2GuardInstance)) + if (Config.GUARD_ATTACK_AGGRO_MOB && getTemplate().isAggressive() && (attacker instanceof L2GuardInstance)) { return true; } @@ -108,11 +108,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -173,9 +173,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -229,7 +229,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -238,7 +238,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 33e0770441..cc7cba5458 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -506,7 +506,7 @@ public final class L2PcInstance extends L2Playable private AdminTeleportType _teleportType = AdminTeleportType.NORMAL; private boolean _inCrystallize; - private boolean _inCraftMode; + private boolean _isCrafting; private long _offlineShopStart = 0; @@ -912,7 +912,7 @@ public final class L2PcInstance extends L2Playable public String getAccountName() { - return _client == null ? getAccountNamePlayer() : _client.getAccountName(); + return _client == null ? _accountName : _client.getAccountName(); } public String getAccountNamePlayer() @@ -929,7 +929,7 @@ public final class L2PcInstance extends L2Playable { int result = 0; - if (getClan() != null) + if (_clan != null) { result |= RelationChanged.RELATION_CLAN_MEMBER; if (getClan() == target.getClan()) @@ -948,9 +948,9 @@ public final class L2PcInstance extends L2Playable if ((getParty() != null) && (getParty() == target.getParty())) { result |= RelationChanged.RELATION_HAS_PARTY; - for (int i = 0; i < getParty().getMembers().size(); i++) + for (int i = 0; i < _party.getMembers().size(); i++) { - if (getParty().getMembers().get(i) != this) + if (_party.getMembers().get(i) != this) { continue; } @@ -1004,7 +1004,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getSiegeState() != 0) + if (_siegeState != 0) { result |= RelationChanged.RELATION_INSIEGE; if (getSiegeState() != target.getSiegeState()) @@ -1015,7 +1015,7 @@ public final class L2PcInstance extends L2Playable { result |= RelationChanged.RELATION_ALLY; } - if (getSiegeState() == 1) + if (_siegeState == 1) { result |= RelationChanged.RELATION_ATTACKER; } @@ -1031,7 +1031,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getBlockCheckerArena() != -1) + if (_handysBlockCheckerEventArena != -1) { result |= RelationChanged.RELATION_INSIEGE; final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); @@ -1231,17 +1231,17 @@ public final class L2PcInstance extends L2Playable public boolean isInStoreMode() { - return getPrivateStoreType() != PrivateStoreType.NONE; + return _privateStoreType != PrivateStoreType.NONE; } - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** @@ -1318,7 +1318,7 @@ public final class L2PcInstance extends L2Playable LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) { @@ -1451,13 +1451,13 @@ public final class L2PcInstance extends L2Playable return; } - final L2Npc target = getLastFolkNPC(); + final L2Npc target = _lastFolkNpc; if ((target != null) && isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false)) { quest.notifyEvent(event, target, this); } - else if (getLastQuestNpcObject() > 0) + else if (_questNpcObject > 0) { final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); @@ -1658,7 +1658,7 @@ public final class L2PcInstance extends L2Playable @Override public void updatePvPFlag(int value) { - if (getPvpFlag() == value) + if (_pvpFlag == value) { return; } @@ -1676,7 +1676,7 @@ public final class L2PcInstance extends L2Playable if (hasSummon()) { final RelationChanged rc = new RelationChanged(); - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, getRelation(this), false); @@ -1703,7 +1703,7 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, relation, isAutoAttackable(player)); @@ -2110,7 +2110,7 @@ public final class L2PcInstance extends L2Playable weaponPenalty = weaponPenalty - expertiseLevel - bonus; weaponPenalty = Math.min(Math.max(weaponPenalty, 0), 4); - if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) + if ((_expertiseWeaponPenalty != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) { _expertiseWeaponPenalty = weaponPenalty; if (_expertiseWeaponPenalty > 0) @@ -2128,7 +2128,7 @@ public final class L2PcInstance extends L2Playable armorPenalty = armorPenalty - expertiseLevel - bonus; armorPenalty = Math.min(Math.max(armorPenalty, 0), 4); - if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) + if ((_expertiseArmorPenalty != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) { _expertiseArmorPenalty = armorPenalty; if (_expertiseArmorPenalty > 0) @@ -2171,20 +2171,20 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - final int slot = getInventory().getSlotFromItem(item); + final int slot = _inventory.getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { - items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + items = _inventory.unEquipItemInSlotAndRecord(item.getLocationSlot()); } else { - items = getInventory().unEquipItemInBodySlotAndRecord(slot); + items = _inventory.unEquipItemInBodySlotAndRecord(slot); } } else { - items = getInventory().equipItemAndRecord(item); + items = _inventory.equipItemAndRecord(item); if (item.isEquipped()) { @@ -2296,7 +2296,7 @@ public final class L2PcInstance extends L2Playable */ public void increaseRaidbossPoints(int increasePoints) { - setRaidbossPoints(getRaidbossPoints() + increasePoints); + setRaidbossPoints(_raidbossPoints + increasePoints); } /** @@ -2322,17 +2322,17 @@ public final class L2PcInstance extends L2Playable { if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.THIRD)) { - if (getLvlJoinedAcademy() <= 16) + if (_lvlJoinedAcademy <= 16) { _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); } - else if (getLvlJoinedAcademy() >= 39) + else if (_lvlJoinedAcademy >= 39) { _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -2344,7 +2344,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES); // receive graduation gift - getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet + _inventory.addItem("Gift", 8181, 1, this, null); // give academy circlet } if (isSubClassActive()) { @@ -2365,12 +2365,12 @@ public final class L2PcInstance extends L2Playable // Update class icon in party and clan if (isInParty()) { - getParty().broadcastPacket(new PartySmallWindowUpdate(this, true)); + _party.broadcastPacket(new PartySmallWindowUpdate(this, true)); } - if (getClan() != null) + if (_clan != null) { - getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); + _clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); } sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED)); @@ -2519,33 +2519,32 @@ public final class L2PcInstance extends L2Playable } // Add Hero skills if hero - if (isHero()) + if (_hero) { setHero(true); } // Add clan skills - if (getClan() != null) + if (_clan != null) { - final L2Clan clan = getClan(); - clan.addSkillEffects(this); + _clan.addSkillEffects(this); - if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) + if ((_clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) { SiegeManager.getInstance().addSiegeSkills(this); } - if (getClan().getCastleId() > 0) + if (_clan.getCastleId() > 0) { CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this); } - if (getClan().getFortId() > 0) + if (_clan.getFortId() > 0) { FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this); } } // Reload passive skills from armors / jewels / weapons - getInventory().reloadEquippedItems(); + _inventory.reloadEquippedItems(); } /** @@ -2698,13 +2697,12 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info - if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) + if ((_clan != null) && (_clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -2842,7 +2840,7 @@ public final class L2PcInstance extends L2Playable */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().isSitForced()) + if (L2Event.isParticipant(this) && eventStatus.isSitForced()) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -2996,7 +2994,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAdena()) + if (count > _inventory.getAdena()) { if (sendMessage) { @@ -3046,7 +3044,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceBeautyTickets(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getBeautyTickets()) + if (count > _inventory.getBeautyTickets()) { if (sendMessage) { @@ -3140,7 +3138,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAncientAdena()) + if (count > _inventory.getAncientAdena()) { if (sendMessage) { @@ -3546,7 +3544,7 @@ public final class L2PcInstance extends L2Playable { return null; } - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3630,7 +3628,7 @@ public final class L2PcInstance extends L2Playable */ public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) { - final PcInventory inv = getInventory(); + final PcInventory inv = _inventory; if (!inv.validateCapacityByItemId(rewardId, count)) { if (sendMessage) @@ -3832,7 +3830,7 @@ public final class L2PcInstance extends L2Playable return null; } - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -3853,8 +3851,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return null; } @@ -4058,10 +4055,8 @@ public final class L2PcInstance extends L2Playable final boolean needHpUpdate = needHpUpdate(); final boolean needMpUpdate = needMpUpdate(); - final L2Party party = getParty(); - // Check if a party is in progress and party window update is usefull - if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) + if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) { final PartySmallWindowUpdate partyWindow = new PartySmallWindowUpdate(this, false); if (needCpUpdate) @@ -4079,10 +4074,10 @@ public final class L2PcInstance extends L2Playable partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP); partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP); } - party.broadcastToPartyMembers(this, partyWindow); + _party.broadcastToPartyMembers(this, partyWindow); } - if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) + if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) { final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); if ((game != null) && game.isBattleStarted()) @@ -4092,7 +4087,7 @@ public final class L2PcInstance extends L2Playable } // In duel MP updated only with CP or HP - if (isInDuel() && (needCpUpdate || needHpUpdate)) + if (_isInDuel && (needCpUpdate || needHpUpdate)) { DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this)); } @@ -4179,10 +4174,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4220,10 +4214,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4252,15 +4245,15 @@ public final class L2PcInstance extends L2Playable public int getAllyCrestId() { - if (getClanId() == 0) + if (_clanId == 0) { return 0; } - if (getClan().getAllyId() == 0) + if (_clan.getAllyId() == 0) { return 0; } - return getClan().getAllyCrestId(); + return _clan.getAllyCrestId(); } /** @@ -4299,22 +4292,21 @@ public final class L2PcInstance extends L2Playable { if (target instanceof L2PcInstance) { - final L2PcInstance temp = (L2PcInstance) target; + final L2PcInstance targetPlayer = (L2PcInstance) target; sendPacket(ActionFailed.STATIC_PACKET); - if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) + if ((targetPlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (targetPlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) { - sendPacket(new PrivateStoreListSell(this, temp)); + sendPacket(new PrivateStoreListSell(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.BUY) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.BUY) { - sendPacket(new PrivateStoreListBuy(this, temp)); + sendPacket(new PrivateStoreListBuy(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) { - sendPacket(new RecipeShopSellList(this, temp)); + sendPacket(new RecipeShopSellList(this, targetPlayer)); } - } else if (target != null) // _interactTarget=null should never happen but one never knows ^^; { @@ -4339,7 +4331,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) { - getParty().distributeItem(this, itemId, itemCount, false, target); + _party.distributeItem(this, itemId, itemCount, false, target); } else if (itemId == Inventory.ADENA_ID) { @@ -4419,7 +4411,7 @@ public final class L2PcInstance extends L2Playable return; } - if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) + if (((isInParty() && (_party.getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -4528,9 +4520,9 @@ public final class L2PcInstance extends L2Playable // Check if a Party is in progress if (isInParty()) { - getParty().distributeItem(this, target); + _party.distributeItem(this, target); } - else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) + else if ((target.getId() == Inventory.ADENA_ID) && (_inventory.getAdenaInstance() != null)) { addAdena("Pickup", target.getCount(), null, true); ItemTable.getInstance().destroyItem("Pickup", target, this, null); @@ -4539,7 +4531,7 @@ public final class L2PcInstance extends L2Playable { addItem("Pickup", target, null, true); // Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts. - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { final L2EtcItem etcItem = target.getEtcItem(); @@ -4588,13 +4580,13 @@ public final class L2PcInstance extends L2Playable } } - return !isSellingBuffs() && !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); + return !_isSellingBuffs && !isAlikeDead() && !_inOlympiadMode && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); } @Override public int getMinShopDistance() { - return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return _waitTypeSitting ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4602,13 +4594,13 @@ public final class L2PcInstance extends L2Playable // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death) if (canOpenPrivateStore()) { - if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) + if ((_privateStoreType == PrivateStoreType.BUY) || (_privateStoreType == PrivateStoreType.BUY_MANAGE)) { setPrivateStoreType(PrivateStoreType.NONE); } - if (getPrivateStoreType() == PrivateStoreType.NONE) + if (_privateStoreType == PrivateStoreType.NONE) { - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -4650,7 +4642,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -4735,7 +4727,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getActiveWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); } /** @@ -4747,7 +4739,7 @@ public final class L2PcInstance extends L2Playable final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { - return getFistsWeaponItem(); + return _fistsWeaponItem; } return (L2Weapon) weapon.getItem(); @@ -4755,12 +4747,12 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance getChestArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); } public L2ItemInstance getLegsArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LEGS); } public L2Armor getActiveChestArmorItem() @@ -4801,7 +4793,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) { return true; } @@ -4823,7 +4815,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) { return true; } @@ -4845,7 +4837,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) { return true; } @@ -4859,7 +4851,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getSecondaryWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); } /** @@ -4869,7 +4861,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -4909,12 +4901,12 @@ public final class L2PcInstance extends L2Playable !(Config.DISABLE_REWARDS_IN_PVP_ZONES && isInsideZone(ZoneId.PVP))) { // pvp - if (Config.REWARD_PVP_ITEM && (getPvpFlag() != 0)) + if (Config.REWARD_PVP_ITEM && (_pvpFlag != 0)) { pk.addItem("PvP Item Reward", Config.REWARD_PVP_ITEM_ID, Config.REWARD_PVP_ITEM_AMOUNT, this, Config.REWARD_PVP_ITEM_MESSAGE); } // pk - if (Config.REWARD_PK_ITEM && (getPvpFlag() == 0)) + if (Config.REWARD_PK_ITEM && (_pvpFlag == 0)) { pk.addItem("PK Item Reward", Config.REWARD_PK_ITEM_ID, Config.REWARD_PK_ITEM_AMOUNT, this, Config.REWARD_PK_ITEM_MESSAGE); } @@ -4925,7 +4917,7 @@ public final class L2PcInstance extends L2Playable if (Config.ANNOUNCE_PK_PVP && (((pk != null) && !pk.isGM()) || fpcKill)) { String msg = ""; - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4939,7 +4931,7 @@ public final class L2PcInstance extends L2Playable Broadcast.toAllOnlinePlayers(msg, false); } } - else if (getPvpFlag() != 0) + else if (_pvpFlag != 0) { msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4955,7 +4947,7 @@ public final class L2PcInstance extends L2Playable } } - if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (getPvpFlag() == 0) && (getReputation() >= 0)) + if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (_pvpFlag == 0) && (getReputation() >= 0)) { killer.setReputation(killer.getReputation() - 150); } @@ -4965,6 +4957,9 @@ public final class L2PcInstance extends L2Playable // Clear resurrect xp calculation setExpBeforeDeath(0); + // Calculate Shilen's Breath debuff level. It must happen right before death, because buffs aren't applied on dead characters. + calculateShilensBreathDebuffLevel(killer); + // Kill the L2PcInstance if (!super.doDie(killer)) { @@ -4976,7 +4971,7 @@ public final class L2PcInstance extends L2Playable { CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer); } - else if (isCombatFlagEquipped()) + else if (_combatFlagEquippedId) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -4985,9 +4980,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } else @@ -5000,7 +4995,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && (pk != null)) { final L2Clan pkClan = pk.getClan(); - if ((pkClan != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pkClan != null) && (_clan != null) && !isAcademyMember() && !(pk.isAcademyMember())) { final ClanWar clanWar = _clan.getWarWith(pkClan.getId()); if ((clanWar != null) && AntiFeedManager.getInstance().check(killer, this)) @@ -5018,9 +5013,6 @@ public final class L2PcInstance extends L2Playable } } - // calculate Shilen's Breath debuff level - calculateShilensBreathDebuffLevel(killer); - if (isMounted()) { stopFeed(); @@ -5045,7 +5037,7 @@ public final class L2PcInstance extends L2Playable getSkillChannelized().abortChannelization(); } - if (getAgathionId() != 0) + if (_agathionId != 0) { setAgathionId(0); } @@ -5073,8 +5065,8 @@ public final class L2PcInstance extends L2Playable } final L2PcInstance pk = killer.getActingPlayer(); - if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) - // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) + if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) + // || _clan.isAtWarWith(((L2PcInstance)killer).getClanId()) )) { return; @@ -5091,7 +5083,7 @@ public final class L2PcInstance extends L2Playable int dropLimit = 0; int dropPercent = 0; - if ((getReputation() < 0) && (getPkKills() >= pkLimit)) + if ((getReputation() < 0) && (_pkKills >= pkLimit)) { isKarmaDrop = true; dropPercent = Config.KARMA_RATE_DROP; @@ -5113,16 +5105,15 @@ public final class L2PcInstance extends L2Playable { int dropCount = 0; int itemDropPercent = 0; - final L2Summon pet = getPet(); - for (L2ItemInstance itemDrop : getInventory().getItems()) + for (L2ItemInstance itemDrop : _inventory.getItems()) { // Don't drop if (itemDrop.isShadowItem() || // Dont drop Shadow Items itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items !itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena (itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items - ((pet != null) && (pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet + ((_pet != null) && (_pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list )) @@ -5134,7 +5125,7 @@ public final class L2PcInstance extends L2Playable { // Set proper chance according to Item type of equipped Item itemDropPercent = itemDrop.getItem().getType2() == L2Item.TYPE2_WEAPON ? dropEquipWeapon : dropEquip; - getInventory().unEquipItemInSlot(itemDrop.getLocationSlot()); + _inventory.unEquipItemInSlot(itemDrop.getLocationSlot()); } else { @@ -5167,80 +5158,78 @@ public final class L2PcInstance extends L2Playable public void onPlayerKill(L2Playable killedPlayable) { - final L2PcInstance player = getActingPlayer(); final L2PcInstance killedPlayer = killedPlayable.getActingPlayer(); // Avoid nulls && check if player != killedPlayer - if ((player == null) || (killedPlayer == null) || (player == killedPlayer)) + if ((killedPlayer == null) || (this == killedPlayer)) { return; } // Cursed weapons progress - if (player.isCursedWeaponEquipped() && killedPlayer.isPlayer()) + if (isCursedWeaponEquipped() && killedPlayer.isPlayer()) { CursedWeaponsManager.getInstance().increaseKills(getCursedWeaponEquippedId()); return; } // Duel support - if (player.isInDuel() && killedPlayer.getActingPlayer().isInDuel()) + if (isInDuel() && killedPlayer.isInDuel()) { return; } // Do nothing if both players are in PVP zone - if (player.isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) + if (isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) { return; } // If both players are in SIEGE zone just increase siege kills/deaths - if (player.isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) + if (isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) { - if ((player.getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (player.getSiegeState() != killedPlayer.getSiegeState())) + if ((getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (getSiegeState() != killedPlayer.getSiegeState())) { - final L2Clan killerClan = player.getClan(); final L2Clan targetClan = killedPlayer.getClan(); - if ((killerClan != null) && (targetClan != null)) + if ((_clan != null) && (targetClan != null)) { - killerClan.addSiegeKill(); + _clan.addSiegeKill(); targetClan.addSiegeDeath(); } } return; } - if (player.checkIfPvP(killedPlayer)) + if (checkIfPvP(killedPlayer)) { // Check if player should get + rep if (killedPlayer.getReputation() < 0) { - final int levelDiff = killedPlayer.getLevel() - player.getLevel(); - if ((player.getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours + final int levelDiff = killedPlayer.getLevel() - getLevel(); + if ((getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours { - player.setReputation(player.getReputation() + Config.REPUTATION_INCREASE); + setReputation(getReputation() + Config.REPUTATION_INCREASE); } } - player.setPvpKills(player.getPvpKills() + 1); + setPvpKills(_pvpKills + 1); } - else if ((getReputation() > 0) && (getPkKills() == 0)) + else if ((getReputation() > 0) && (_pkKills == 0)) { - player.setReputation(0); - player.setPkKills(player.getPkKills() + 1); + setReputation(0); + setPkKills(getPkKills() + 1); } else { // Calculate new karma and increase pk count - player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killedPlayable.isSummon())); - player.setPkKills(player.getPkKills() + 1); + setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); + setPkKills(getPkKills() + 1); } final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); - player.sendPacket(ui); - player.checkItemRestriction(); + sendPacket(ui); + checkItemRestriction(); } public void updatePvPStatus() @@ -5251,7 +5240,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5275,7 +5264,7 @@ public final class L2PcInstance extends L2Playable return; } - if (isInDuel() && (player_target.getDuelId() == getDuelId())) + if (_isInDuel && (player_target.getDuelId() == getDuelId())) { return; } @@ -5289,7 +5278,7 @@ public final class L2PcInstance extends L2Playable { setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5310,10 +5299,10 @@ public final class L2PcInstance extends L2Playable */ public void restoreExp(double restorePercent) { - if (getExpBeforeDeath() > 0) + if (_expBeforeDeath > 0) { // Restore the specified % of lost experience. - getStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100)); + getStat().addExp(Math.round(((_expBeforeDeath - getExp()) * restorePercent) / 100)); setExpBeforeDeath(0); } } @@ -5431,10 +5420,9 @@ public final class L2PcInstance extends L2Playable final List summons = new ArrayList<>(); summons.addAll(getServitors().values()); - final L2PetInstance pet = getPet(); - if (pet != null) + if (_pet != null) { - summons.add(pet); + summons.add(_pet); } return summons; @@ -5831,11 +5819,11 @@ public final class L2PcInstance extends L2Playable */ public boolean isClanLeader() { - if (getClan() == null) + if (_clan == null) { return false; } - return getObjectId() == getClan().getLeaderId(); + return getObjectId() == _clan.getLeaderId(); } /** @@ -5845,22 +5833,22 @@ public final class L2PcInstance extends L2Playable @Override protected boolean checkAndEquipAmmunition(EtcItemType type) { - L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + L2ItemInstance arrows = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (arrows == null) { final L2Weapon weapon = getActiveWeaponItem(); if (type == EtcItemType.ARROW) { - arrows = getInventory().findArrowForBow(weapon); + arrows = _inventory.findArrowForBow(weapon); } else if (type == EtcItemType.BOLT) { - arrows = getInventory().findBoltForCrossBow(weapon); + arrows = _inventory.findBoltForCrossBow(weapon); } if (arrows != null) { // Equip arrows needed in left hand - getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); + _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); sendItemList(false); return true; } @@ -5879,7 +5867,7 @@ public final class L2PcInstance extends L2Playable public boolean disarmWeapons() { // If there is no weapon to disarm then return true. - final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance wpn = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (wpn == null) { return true; @@ -5892,7 +5880,7 @@ public final class L2PcInstance extends L2Playable } // Don't allow disarming a Combat Flag or Territory Ward. - if (isCombatFlagEquipped()) + if (_combatFlagEquippedId) { return false; } @@ -5903,7 +5891,7 @@ public final class L2PcInstance extends L2Playable return false; } - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -5940,10 +5928,10 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -6051,7 +6039,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE); return false; } - else if (isSitting()) + else if (_waitTypeSitting) { // A strider can be ridden only when standing sendPacket(ActionFailed.STATIC_PACKET); @@ -6071,7 +6059,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); return false; } - else if (getInventory().getItemByItemId(9819) != null) + else if (_inventory.getItemByItemId(9819) != null) { sendPacket(ActionFailed.STATIC_PACKET); // FIXME: Wrong Message @@ -6101,7 +6089,7 @@ public final class L2PcInstance extends L2Playable } else if (isMounted()) { - if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) + if ((_mountType == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION); @@ -6250,12 +6238,12 @@ public final class L2PcInstance extends L2Playable public boolean isInCommandChannel() { - return isInParty() && getParty().isInCommandChannel(); + return isInParty() && _party.isInCommandChannel(); } public L2CommandChannel getCommandChannel() { - return (isInCommandChannel()) ? getParty().getCommandChannel() : null; + return (isInCommandChannel()) ? _party.getCommandChannel() : null; } /** @@ -6264,7 +6252,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isGM() { - return getAccessLevel().isGm(); + return _accessLevel.isGm(); } /** @@ -6295,8 +6283,8 @@ public final class L2PcInstance extends L2Playable _accessLevel = accessLevel; - getAppearance().setNameColor(_accessLevel.getNameColor()); - getAppearance().setTitleColor(_accessLevel.getTitleColor()); + _appearance.setNameColor(_accessLevel.getNameColor()); + _appearance.setTitleColor(_accessLevel.getTitleColor()); if (broadcast) { broadcastUserInfo(); @@ -6384,10 +6372,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -6457,32 +6444,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(8, getCurrentCp()); statement.setInt(9, getMaxMp()); statement.setDouble(10, getCurrentMp()); - statement.setInt(11, getAppearance().getFace()); - statement.setInt(12, getAppearance().getHairStyle()); - statement.setInt(13, getAppearance().getHairColor()); - statement.setInt(14, getAppearance().getSex() ? 1 : 0); + statement.setInt(11, _appearance.getFace()); + statement.setInt(12, _appearance.getHairStyle()); + statement.setInt(13, _appearance.getHairColor()); + statement.setInt(14, _appearance.getSex() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); - statement.setInt(18, getFame()); - statement.setInt(19, getRaidbossPoints()); - statement.setInt(20, getPvpKills()); - statement.setInt(21, getPkKills()); - statement.setInt(22, getClanId()); + statement.setInt(18, _fame); + statement.setInt(19, _raidbossPoints); + statement.setInt(20, _pvpKills); + statement.setInt(21, _pkKills); + statement.setInt(22, _clanId); statement.setInt(23, getRace().ordinal()); statement.setInt(24, getClassId().getId()); - statement.setLong(25, getDeleteTimer()); + statement.setLong(25, _deleteTimer); statement.setInt(26, hasDwarvenCraft() ? 1 : 0); statement.setString(27, getTitle()); - statement.setInt(28, getAppearance().getTitleColor()); + statement.setInt(28, _appearance.getTitleColor()); statement.setInt(29, isOnlineInt()); - statement.setInt(30, getClanPrivileges().getBitmask()); - statement.setInt(31, getWantsPeace()); - statement.setInt(32, getBaseClass()); + statement.setInt(30, _clanPrivileges.getBitmask()); + statement.setInt(31, _wantsPeace); + statement.setInt(32, _baseClass); statement.setInt(33, _nobleLevel); statement.setLong(34, 0); statement.setInt(35, PcStat.MIN_VITALITY_POINTS); - statement.setDate(36, new Date(getCreateDate().getTimeInMillis())); + statement.setDate(36, new Date(_createDate.getTimeInMillis())); statement.executeUpdate(); } catch (Exception e) @@ -7117,32 +7104,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(5, getCurrentCp()); statement.setInt(6, getMaxMp()); statement.setDouble(7, getCurrentMp()); - statement.setInt(8, getAppearance().getFace()); - statement.setInt(9, getAppearance().getHairStyle()); - statement.setInt(10, getAppearance().getHairColor()); - statement.setInt(11, getAppearance().getSex() ? 1 : 0); + statement.setInt(8, _appearance.getFace()); + statement.setInt(9, _appearance.getHairStyle()); + statement.setInt(10, _appearance.getHairColor()); + statement.setInt(11, _appearance.getSex() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); statement.setInt(15, _lastLoc != null ? _lastLoc.getZ() : getZ()); statement.setLong(16, exp); - statement.setLong(17, getExpBeforeDeath()); + statement.setLong(17, _expBeforeDeath); statement.setLong(18, sp); statement.setInt(19, getReputation()); - statement.setInt(20, getFame()); - statement.setInt(21, getRaidbossPoints()); - statement.setInt(22, getPvpKills()); - statement.setInt(23, getPkKills()); - statement.setInt(24, getClanId()); + statement.setInt(20, _fame); + statement.setInt(21, _raidbossPoints); + statement.setInt(22, _pvpKills); + statement.setInt(23, _pkKills); + statement.setInt(24, _clanId); statement.setInt(25, getRace().ordinal()); statement.setInt(26, getClassId().getId()); - statement.setLong(27, getDeleteTimer()); + statement.setLong(27, _deleteTimer); statement.setString(28, getTitle()); - statement.setInt(29, getAppearance().getTitleColor()); + statement.setInt(29, _appearance.getTitleColor()); statement.setInt(30, isOnlineInt()); - statement.setInt(31, getClanPrivileges().getBitmask()); - statement.setInt(32, getWantsPeace()); - statement.setInt(33, getBaseClass()); + statement.setInt(31, _clanPrivileges.getBitmask()); + statement.setInt(32, _wantsPeace); + statement.setInt(33, _baseClass); long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) @@ -7152,29 +7139,29 @@ public final class L2PcInstance extends L2Playable statement.setLong(34, totalOnlineTime); statement.setInt(35, _nobleLevel); - statement.setInt(36, getPowerGrade()); - statement.setInt(37, getPledgeType()); - statement.setInt(38, getLvlJoinedAcademy()); - statement.setLong(39, getApprentice()); - statement.setLong(40, getSponsor()); - statement.setLong(41, getClanJoinExpiryTime()); - statement.setLong(42, getClanCreateExpiryTime()); + statement.setInt(36, _powerGrade); + statement.setInt(37, _pledgeType); + statement.setInt(38, _lvlJoinedAcademy); + statement.setLong(39, _apprentice); + statement.setLong(40, _sponsor); + statement.setLong(41, _clanJoinExpiryTime); + statement.setLong(42, _clanCreateExpiryTime); statement.setString(43, getName()); - statement.setInt(44, getBookMarkSlot()); + statement.setInt(44, _bookmarkslot); statement.setInt(45, getStat().getBaseVitalityPoints()); - statement.setString(46, getLang()); + statement.setString(46, _lang); int factionId = 0; - if (isGood()) + if (_isGood) { factionId = 1; } - if (isEvil()) + if (_isEvil) { factionId = 2; } statement.setInt(47, factionId); - statement.setInt(48, getPcCafePoints()); + statement.setInt(48, _pcCafePoints); statement.setInt(49, getObjectId()); statement.execute(); @@ -7229,7 +7216,7 @@ public final class L2PcInstance extends L2Playable { // Delete all current stored effects for char to avoid dupe delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.execute(); int buff_index = 0; @@ -7295,7 +7282,7 @@ public final class L2PcInstance extends L2Playable statement.setDouble(7, (t != null) && t.hasNotPassed() ? t.getStamp() : 0); statement.setInt(8, 0); // Store type 0, active buffs/debuffs. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7327,7 +7314,7 @@ public final class L2PcInstance extends L2Playable statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); statement.setInt(8, 1); // Restore type 1, skill reuse. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7466,7 +7453,7 @@ public final class L2PcInstance extends L2Playable // Remove or update a L2PcInstance skill from the character_skills table of the database statement.setInt(1, oldSkill.getId()); statement.setInt(2, getObjectId()); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7482,7 +7469,7 @@ public final class L2PcInstance extends L2Playable if (skill != null) { - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) { @@ -7585,7 +7572,7 @@ public final class L2PcInstance extends L2Playable { // Retrieve all skills of this L2PcInstance from the database statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7636,7 +7623,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_SKILL_SAVE)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7674,7 +7661,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement delete = con.prepareStatement(DELETE_SKILL_SAVE)) { delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.executeUpdate(); } } @@ -7712,7 +7699,7 @@ public final class L2PcInstance extends L2Playable isInInventory = true; // Using item Id - L2ItemInstance item = getInventory().getItemByItemId(itemId); + L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { item = getWarehouse().getItemByItemId(itemId); @@ -7764,7 +7751,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_HENNAS)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { int slot; @@ -7873,7 +7860,7 @@ public final class L2PcInstance extends L2Playable { statement.setInt(1, getObjectId()); statement.setInt(2, slot); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7903,7 +7890,7 @@ public final class L2PcInstance extends L2Playable } if (henna.getCancelCount() > 0) { - getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); + _inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(henna.getDyeItemId()); sm.addLong(henna.getCancelCount()); @@ -7972,7 +7959,7 @@ public final class L2PcInstance extends L2Playable statement.setInt(1, getObjectId()); statement.setInt(2, henna.getDyeId()); statement.setInt(3, i); - statement.setInt(4, getClassIndex()); + statement.setInt(4, _classIndex); statement.execute(); } catch (Exception e) @@ -8118,7 +8105,7 @@ public final class L2PcInstance extends L2Playable if (Config.UPDATE_ITEMS_ON_CHAR_STORE) { - getInventory().updateDatabase(); + _inventory.updateDatabase(); getWarehouse().updateDatabase(); } } @@ -8169,7 +8156,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker isn't the L2PcInstance Pet - if ((attacker == this) || (attacker == getPet()) || attacker.hasServitor(attacker.getObjectId())) + if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { return false; } @@ -8187,13 +8174,13 @@ public final class L2PcInstance extends L2Playable } // is AutoAttackable if both players are in the same duel and the duel is still going on - if (attacker.isPlayable() && (getDuelState() == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) + if (attacker.isPlayable() && (_duelState == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { return true; } // Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. - if (isInParty() && getParty().getMembers().contains(attacker)) + if (isInParty() && _party.getMembers().contains(attacker)) { return false; } @@ -8201,14 +8188,14 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) + if (_inOlympiadMode && _OlympiadStart && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) { return true; } return false; } - if (isOnCustomEvent() && (getTeam() == attacker.getTeam())) + if (_isOnCustomEvent && (getTeam() == attacker.getTeam())) { return false; } @@ -8230,7 +8217,7 @@ public final class L2PcInstance extends L2Playable // Get L2PcInstance final L2PcInstance attackerPlayer = attacker.getActingPlayer(); - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) @@ -8263,7 +8250,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker is not in the same clan - if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) + if ((_clan != null) && _clan.isMember(attacker.getObjectId())) { return false; } @@ -8288,10 +8275,10 @@ public final class L2PcInstance extends L2Playable if (attacker instanceof L2DefenderInstance) { - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return ((siege != null) && siege.checkIsAttacker(_clan)); } } @@ -8301,7 +8288,7 @@ public final class L2PcInstance extends L2Playable } // Check if the L2PcInstance has Karma - if ((getReputation() < 0) || (getPvpFlag() > 0)) + if ((getReputation() < 0) || (_pvpFlag > 0)) { return true; } @@ -8395,7 +8382,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (inObserverMode()) + if (_observerMode) { sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(ActionFailed.STATIC_PACKET); @@ -8443,7 +8430,7 @@ public final class L2PcInstance extends L2Playable } // Check if the caster is sitting - if (isSitting()) + if (_waitTypeSitting) { sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING); sendPacket(ActionFailed.STATIC_PACKET); @@ -8479,7 +8466,7 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill final L2Object target = skill.getTarget(this, forceUse, dontMove, true); - final Location worldPosition = getCurrentSkillWorldPosition(); + final Location worldPosition = _currentSkillWorldPosition; if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { @@ -8535,7 +8522,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (getQueuedSkill() != null) + if (_queuedSkill != null) { setQueuedSkill(null, null, false, false); } @@ -8550,14 +8537,14 @@ public final class L2PcInstance extends L2Playable final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel - if (isInParty() && getParty().isInCommandChannel() && (looter != null)) + if (isInParty() && _party.isInCommandChannel() && (looter != null)) { - return getParty().getCommandChannel().getMembers().contains(looter); + return _party.getCommandChannel().getMembers().contains(looter); } if (isInParty() && (looter != null)) { - return getParty().getMembers().contains(looter); + return _party.getMembers().contains(looter); } return false; @@ -8800,7 +8787,7 @@ public final class L2PcInstance extends L2Playable { for (int itemId : _activeSoulShots) { - final L2ItemInstance item = getInventory().getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { removeAutoSoulShot(itemId); @@ -8894,23 +8881,23 @@ public final class L2PcInstance extends L2Playable public void updateActiveBroochJewel() { // Update active Ruby jewel. - if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV1); } @@ -8919,23 +8906,23 @@ public final class L2PcInstance extends L2Playable setActiveRubyJewel(null); } // Update active Sapphire jewel. - if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1); } @@ -9062,10 +9049,9 @@ public final class L2PcInstance extends L2Playable public void enterOlympiadObserverMode(Location loc, int id) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.unSummon(this); + _pet.unSummon(this); } if (hasServitors()) @@ -9083,13 +9069,13 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoCubic(this)); } - if (getParty() != null) + if (_party != null) { - getParty().removePartyMember(this, MessageType.EXPELLED); + _party.removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -9411,12 +9397,12 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; return false; } - if (isInDuel()) + if (_isInDuel) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL; return false; } - if (isInOlympiadMode() || isOnEvent(CeremonyOfChaosEvent.class)) + if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class)) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS; return false; @@ -9431,7 +9417,7 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE; return false; } - if (getPrivateStoreType() != PrivateStoreType.NONE) + if (_privateStoreType != PrivateStoreType.NONE) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE; return false; @@ -9498,10 +9484,9 @@ public final class L2PcInstance extends L2Playable { super.setTeam(team); broadcastUserInfo(); - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.broadcastStatusUpdate(); + _pet.broadcastStatusUpdate(); } if (hasServitors()) { @@ -9538,9 +9523,9 @@ public final class L2PcInstance extends L2Playable for (Skill s : getSkillList()) { - if (getClan() != null) + if (_clan != null) { - isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0); + isDisabled = s.isClanSkill() && (_clan.getReputationScore() < 0); } sl.addSkill(s.getDisplayId(), s.getReuseDelayGroup(), s.getDisplayLevel(), s.getSubLevel(), s.isPassive(), isDisabled, s.isEnchantable()); @@ -9851,7 +9836,7 @@ public final class L2PcInstance extends L2Playable // Remove active item skills before saving char to database // because next time when choosing this class, weared items can // be different - for (L2ItemInstance item : getInventory().getPaperdollItems(L2ItemInstance::isAugmented)) + for (L2ItemInstance item : _inventory.getPaperdollItems(L2ItemInstance::isAugmented)) { if ((item != null) && item.isEquipped()) { @@ -9889,7 +9874,7 @@ public final class L2PcInstance extends L2Playable if (classIndex == 0) { - setClassTemplate(getBaseClass()); + setClassTemplate(_baseClass); } else { @@ -9907,7 +9892,7 @@ public final class L2PcInstance extends L2Playable if (isInParty()) { - getParty().recalculatePartyLevel(); + _party.recalculatePartyLevel(); } // Update the character's change in class status. @@ -10013,7 +9998,7 @@ public final class L2PcInstance extends L2Playable if (_taskRentPet != null) { // if the rent of a wyvern expires while over a flying zone, tp to down before unmounting - if (checkLandingState() && (getMountType() == MountType.WYVERN)) + if (checkLandingState() && (_mountType == MountType.WYVERN)) { teleToLocation(TeleportWhereType.TOWN); } @@ -10102,7 +10087,7 @@ public final class L2PcInstance extends L2Playable { sendMessage("Entering world in Invisible mode."); } - if (isSilenceMode()) + if (_silenceMode) { sendMessage("Entering world in Silence mode."); } @@ -10208,7 +10193,7 @@ public final class L2PcInstance extends L2Playable restoreExp(revivePower); } - public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int power) + public void reviveRequest(L2PcInstance reviver, Skill skill, boolean isPet, int power) { if (isResurrectionBlocked()) { @@ -10217,11 +10202,11 @@ public final class L2PcInstance extends L2Playable if (_reviveRequested == 1) { - if (_revivePet == Pet) + if (_revivePet == isPet) { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } - else if (Pet) + else if (isPet) { reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. } @@ -10231,12 +10216,11 @@ public final class L2PcInstance extends L2Playable } return; } - final L2Summon pet = getPet(); - if ((Pet && (pet != null) && pet.isDead()) || (!Pet && isDead())) + if ((isPet && (_pet != null) && _pet.isDead()) || (!isPet && isDead())) { _reviveRequested = 1; _revivePower = Formulas.calculateSkillResurrectRestorePercent(power, reviver); - _revivePet = Pet; + _revivePet = isPet; if (hasCharmOfCourage()) { @@ -10246,7 +10230,7 @@ public final class L2PcInstance extends L2Playable return; } - final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); + final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100); final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); @@ -10257,8 +10241,7 @@ public final class L2PcInstance extends L2Playable public void reviveAnswer(int answer) { - final L2Summon pet = getPet(); - if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (pet != null) && !pet.isDead())) + if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (_pet != null) && !_pet.isDead())) { return; } @@ -10276,15 +10259,15 @@ public final class L2PcInstance extends L2Playable doRevive(); } } - else if (pet != null) + else if (_pet != null) { if (_revivePower != 0) { - pet.doRevive(_revivePower); + _pet.doRevive(_revivePower); } else { - pet.doRevive(); + _pet.doRevive(); } } } @@ -10353,7 +10336,7 @@ public final class L2PcInstance extends L2Playable @Override public void teleToLocation(ILocational loc, boolean allowRandomOffset) { - if ((getVehicle() != null) && !getVehicle().isTeleporting()) + if ((_vehicle != null) && !_vehicle.isTeleporting()) { setVehicle(null); } @@ -10384,31 +10367,30 @@ public final class L2PcInstance extends L2Playable checkItemRestriction(); - if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !isInOlympiadMode()) + if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !_inOlympiadMode) { setTeleportProtection(true); } // Trained beast is lost after teleport - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.deleteMe(); } - getTrainedBeasts().clear(); + _tamedBeast.clear(); } // Modify the position of the pet if necessary - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.setFollowStatus(false); - pet.teleToLocation(getLocation(), false); - ((L2SummonAI) pet.getAI()).setStartFollowController(true); - pet.setFollowStatus(true); - pet.setInstance(getInstanceWorld()); - pet.updateAndBroadcastStatus(0); + _pet.setFollowStatus(false); + _pet.teleToLocation(getLocation(), false); + ((L2SummonAI) _pet.getAI()).setStartFollowController(true); + _pet.setFollowStatus(true); + _pet.setInstance(getInstanceWorld()); + _pet.updateAndBroadcastStatus(0); } getServitors().values().forEach(s -> @@ -10498,9 +10480,9 @@ public final class L2PcInstance extends L2Playable super.reduceCurrentHp(value, attacker, skill, isDOT, directlyToHp, critical, reflect); // notify the tamed beast of attacks - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.onOwnerGotAttacked(attacker); } @@ -10633,7 +10615,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -10642,8 +10624,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return false; } @@ -10785,7 +10766,7 @@ public final class L2PcInstance extends L2Playable // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) try { - if (!isOnline()) + if (!_isOnline) { LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } @@ -10798,7 +10779,7 @@ public final class L2PcInstance extends L2Playable try { - if (Config.ENABLE_BLOCK_CHECKER_EVENT && (getBlockCheckerArena() != -1)) + if (Config.ENABLE_BLOCK_CHECKER_EVENT && (_handysBlockCheckerEventArena != -1)) { HandysBlockCheckerManager.getInstance().onDisconnect(this); } @@ -10823,7 +10804,7 @@ public final class L2PcInstance extends L2Playable // remove combat flag try { - if (getInventory().getItemByItemId(9819) != null) + if (_inventory.getItemByItemId(9819) != null) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -10832,9 +10813,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } } @@ -10960,13 +10941,13 @@ public final class L2PcInstance extends L2Playable { try { - L2Summon pet = getPet(); + L2Summon pet = _pet; if (pet != null) { pet.setRestoreSummon(true); pet.unSummon(this); // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) - pet = getPet(); + pet = _pet; if (pet != null) { pet.broadcastNpcInfo(0); @@ -10985,12 +10966,12 @@ public final class L2PcInstance extends L2Playable } // returns pet to control item } - if (getClan() != null) + if (_clan != null) { // set the status for pledge member list to OFFLINE try { - final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = _clan.getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -11027,14 +11008,14 @@ public final class L2PcInstance extends L2Playable { // Check if the L2PcInstance is in observer mode to set its position to its position // before entering in observer mode - if (inObserverMode()) + if (_observerMode) { setLocationInvisible(_lastLoc); } - if (getVehicle() != null) + if (_vehicle != null) { - getVehicle().oustPlayer(this); + _vehicle.oustPlayer(this); } } catch (Exception e) @@ -11068,7 +11049,7 @@ public final class L2PcInstance extends L2Playable // Update database with items in its inventory and remove them from the world try { - getInventory().deleteMe(); + _inventory.deleteMe(); } catch (Exception e) { @@ -11091,7 +11072,7 @@ public final class L2PcInstance extends L2Playable try { - getFreight().deleteMe(); + _freight.deleteMe(); } catch (Exception e) { @@ -11119,10 +11100,10 @@ public final class L2PcInstance extends L2Playable } } - if (getClanId() > 0) + if (_clanId > 0) { - getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); - getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan())); + _clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); + _clan.broadcastToOnlineMembers(new ExPledgeCount(_clan)); // ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); } @@ -11156,7 +11137,7 @@ public final class L2PcInstance extends L2Playable try { notifyFriends(L2FriendStatus.MODE_OFFLINE); - getBlockList().playerLogout(); + _blockList.playerLogout(); } catch (Exception e) { @@ -11422,12 +11403,12 @@ public final class L2PcInstance extends L2Playable { _souls -= count; - if (getChargedSouls() < 0) + if (_souls < 0) { _souls = 0; } - if (getChargedSouls() == 0) + if (_souls == 0) { stopSoulTask(); } @@ -11673,10 +11654,10 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = _inventory.getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { - getInventory().unEquipItemInSlot(i); + _inventory.unEquipItemInSlot(i); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); @@ -11826,10 +11807,9 @@ public final class L2PcInstance extends L2Playable } if (hasPet()) { - final L2Summon pet = getPet(); - setCurrentFeed(((L2PetInstance) pet).getCurrentFed()); - _controlItemId = pet.getControlObjectId(); - sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); + setCurrentFeed(_pet.getCurrentFed()); + _controlItemId = _pet.getControlObjectId(); + sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); if (!isDead()) { _mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000); @@ -11838,7 +11818,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -11898,7 +11878,7 @@ public final class L2PcInstance extends L2Playable { final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -11914,7 +11894,7 @@ public final class L2PcInstance extends L2Playable public boolean isHungry() { - return hasPet() && _canFeed && (getCurrentFeed() < ((getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())); + return hasPet() && _canFeed && (_curFeed < ((getPetData(_mountNpcId).getHungryLimit() / 100f) * getPetLevelData(_mountNpcId).getPetMaxFeed())); } public void enteredNoLanding(int delay) @@ -11940,7 +11920,7 @@ public final class L2PcInstance extends L2Playable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(req)) { - statement.setInt(1, getCurrentFeed()); + statement.setInt(1, _curFeed); statement.setInt(2, _controlItemId); statement.executeUpdate(); _controlItemId = 0; @@ -12109,7 +12089,7 @@ public final class L2PcInstance extends L2Playable { return; } - if (getInventory().getInventoryItemCount(13016, 0) == 0) + if (_inventory.getInventoryItemCount(13016, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; @@ -12121,7 +12101,7 @@ public final class L2PcInstance extends L2Playable final TeleportBookmark bookmark = _tpbookmarks.get(id); if (bookmark != null) { - destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(13016).getObjectId(), 1, null, false); teleToLocation(bookmark, false); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12134,12 +12114,12 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE); return false; } - else if (isInSiege() || (getSiegeState() != 0)) + else if (_isInSiege || (_siegeState != 0)) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_A_LARGE_SCALE_BATTLE_SUCH_AS_A_CASTLE_SIEGE_FORTRESS_SIEGE_OR_CLAN_HALL_SIEGE); return false; } - else if (isInDuel()) + else if (_isInDuel) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL); return false; @@ -12149,7 +12129,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING); return false; } - else if (isInOlympiadMode()) + else if (_inOlympiadMode) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH); return false; @@ -12208,7 +12188,7 @@ public final class L2PcInstance extends L2Playable return; } - if (getInventory().getInventoryItemCount(20033, 0) == 0) + if (_inventory.getInventoryItemCount(20033, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG); return; @@ -12224,7 +12204,7 @@ public final class L2PcInstance extends L2Playable } _tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name)); - destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); @@ -12278,7 +12258,7 @@ public final class L2PcInstance extends L2Playable setXYZ(getBoat().getLocation()); activeChar.sendPacket(new CharInfo(this, isInvisible() && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS))); - activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition())); + activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); } else if (isInAirShip()) { @@ -12296,10 +12276,9 @@ public final class L2PcInstance extends L2Playable rc1.addRelation(this, relation1, isAutoAttackable(activeChar)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc1.addRelation(pet, relation1, isAutoAttackable(activeChar)); + rc1.addRelation(_pet, relation1, isAutoAttackable(activeChar)); } if (hasServitors()) { @@ -12313,10 +12292,9 @@ public final class L2PcInstance extends L2Playable rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this)); if (activeChar.hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this)); + rc2.addRelation(_pet, relation2, activeChar.isAutoAttackable(this)); } if (hasServitors()) { @@ -12325,7 +12303,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(rc2); - switch (getPrivateStoreType()) + switch (_privateStoreType) { case SELL: { @@ -12352,7 +12330,7 @@ public final class L2PcInstance extends L2Playable public void playMovie(MovieHolder holder) { - if (getMovieHolder() != null) + if (_movieHolder != null) { return; } @@ -12368,7 +12346,7 @@ public final class L2PcInstance extends L2Playable public void stopMovie() { - sendPacket(new ExStopScenePlayer(getMovieHolder().getMovie())); + sendPacket(new ExStopScenePlayer(_movieHolder.getMovie())); setMovieHolder(null); } @@ -12446,7 +12424,7 @@ public final class L2PcInstance extends L2Playable public int getBirthdays() { - long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12615,24 +12593,24 @@ public final class L2PcInstance extends L2Playable @Override public double getCollisionRadius() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override public double getCollisionHeight() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -12774,7 +12752,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || (getMovieHolder() != null) || _fishing.isFishing(); + return super.isMovementDisabled() || (_movieHolder != null) || _fishing.isFishing(); } public String getHtmlPrefix() @@ -12884,7 +12862,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return ((_privateStoreType == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); } public void setMultiSocialAction(int id, int targetId) @@ -12984,7 +12962,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); } /** @@ -12994,7 +12972,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder80(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); } public boolean havePetInvItems() @@ -13080,8 +13058,8 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("REPLACE INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?)")) { ps.setInt(1, getObjectId()); - ps.setInt(2, getRecomHave()); - ps.setInt(3, getRecomLeft()); + ps.setInt(2, _recomHave); + ps.setInt(3, _recomLeft); ps.setLong(4, 0); ps.execute(); } @@ -13507,7 +13485,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHair() { - return getVariables().getInt("visualHairId", getAppearance().getHairStyle()); + return getVariables().getInt("visualHairId", _appearance.getHairStyle()); } /** @@ -13515,7 +13493,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHairColor() { - return getVariables().getInt("visualHairColorId", getAppearance().getHairColor()); + return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); } /** @@ -13523,7 +13501,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualFace() { - return getVariables().getInt("visualFaceId", getAppearance().getFace()); + return getVariables().getInt("visualFaceId", _appearance.getFace()); } /** @@ -13622,7 +13600,7 @@ public final class L2PcInstance extends L2Playable */ public CastleSide getPlayerSide() { - if ((getClan() == null) || (getClan().getCastleId() == 0)) + if ((_clan == null) || (_clan.getCastleId() == 0)) { return CastleSide.NEUTRAL; } @@ -13967,7 +13945,7 @@ public final class L2PcInstance extends L2Playable @Override public MoveType getMoveType() { - if (isSitting()) + if (_waitTypeSitting) { return MoveType.SITTING; } @@ -13986,10 +13964,9 @@ public final class L2PcInstance extends L2Playable private void updateOnlineTime() { - final L2Clan clan = getClan(); - if (clan != null) + if (_clan != null) { - clan.addMemberOnlineTime(this); + _clan.addMemberOnlineTime(this); } } @@ -14004,7 +13981,7 @@ public final class L2PcInstance extends L2Playable public GroupType getGroupType() { - return isInParty() ? (getParty().isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; + return isInParty() ? (_party.isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; } public boolean isTrueHero() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 10429b5b5b..f1112eee76 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -83,8 +83,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,skill_sub_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -140,9 +140,9 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - else if (getCurrentFed() > getFeedConsume()) + else if (_curFed > getFeedConsume()) { - setCurrentFed(getCurrentFed() - getFeedConsume()); + setCurrentFed(_curFed - getFeedConsume()); } else { @@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -333,9 +333,9 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - if (getInventory() != null) + if (_inventory != null) { - return getInventory().getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); + return _inventory.getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); } return null; } @@ -622,8 +622,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -639,7 +639,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -702,9 +702,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -756,11 +756,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - statement.setInt(1, getControlObjectId()); + statement.setInt(1, _controlObjectId); statement.execute(); } catch (Exception e) @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -817,7 +817,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -921,7 +921,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -933,7 +933,7 @@ public class L2PetInstance extends L2Summon } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -951,10 +951,10 @@ public class L2PetInstance extends L2Summon statement.setDouble(4, getStatus().getCurrentMp()); statement.setLong(5, getStat().getExp()); statement.setLong(6, getStat().getSp()); - statement.setInt(7, getCurrentFed()); + statement.setInt(7, _curFed); statement.setInt(8, getOwner().getObjectId()); statement.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - statement.setInt(10, getControlObjectId()); + statement.setInt(10, _controlObjectId); statement.executeUpdate(); _respawned = true; @@ -997,7 +997,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1045,7 +1045,7 @@ public class L2PetInstance extends L2Summon continue; } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, skill.getSubLevel()); @@ -1073,7 +1073,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rset = ps1.executeQuery()) { while (rset.next()) @@ -1094,7 +1094,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1147,9 +1147,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1340,13 +1340,13 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1357,7 +1357,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1367,7 +1367,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 42bd49e7f9..8ed3a9f1d3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -240,7 +240,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable final Map> servitorEffects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()); if (servitorEffects != null) { - final List effects = servitorEffects.get(getReferenceSkill()); + final List effects = servitorEffects.get(_referenceSkill); if ((effects != null) && !effects.isEmpty()) { for (SummonEffect effect : effects) @@ -294,7 +294,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.execute(); int buff_index = 0; @@ -348,7 +348,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -397,7 +397,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -437,7 +437,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -554,12 +554,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -573,7 +573,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); // Using same task to check if owner is in visible range if (calculateDistance(getOwner(), true, false) > 2000) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java index 285b9af507..aa681dd5f3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java @@ -51,7 +51,7 @@ public class L2ShuttleInstance extends L2Vehicle public void closeDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { @@ -63,7 +63,7 @@ public class L2ShuttleInstance extends L2Vehicle public void openDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index e5e5d055c4..32f94719bb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index a7276d30f8..f1d5b120e9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -72,7 +72,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -136,7 +136,7 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - final L2Character activeChar = getActiveChar(); + final L2Character activeChar = _activeChar; if (activeChar.isDead()) { return; @@ -169,14 +169,14 @@ public class CharStatus } if (Formulas.calcRealTargetBreak()) { - getActiveChar().getEffectList().stopEffects(AbnormalType.REAL_TARGET); + _activeChar.getEffectList().stopEffects(AbnormalType.REAL_TARGET); } } if (value > 0) { - final double oldHp = getCurrentHp(); - final double newHp = Math.max(getCurrentHp() - value, activeChar.isUndying() ? 1 : 0); + final double oldHp = _currentHp; + final double newHp = Math.max(_currentHp - value, activeChar.isUndying() ? 1 : 0); setCurrentHp(newHp); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureHpChange(activeChar, oldHp, newHp), activeChar); } @@ -189,7 +189,7 @@ public class CharStatus public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -202,10 +202,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -269,12 +269,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getStat().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getStat().getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -324,7 +324,7 @@ public class CharStatus if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -337,7 +337,7 @@ public class CharStatus hpOrMpWasChanged |= setCurrentMp(newMp, false); if (hpOrMpWasChanged) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -360,12 +360,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getStat().getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -398,7 +398,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -407,10 +407,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE); - final double newMp = getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE); + final double newHp = _currentHp + _activeChar.getStat().getValue(Stats.REGENERATE_HP_RATE); + final double newMp = _currentMp + _activeChar.getStat().getValue(Stats.REGENERATE_MP_RATE); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 4d221ab370..813634b659 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -48,9 +48,9 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -78,7 +78,7 @@ public class PcStatus extends PlayableStatus } // If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken. - if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) + if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isCrafting() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) { return; } @@ -100,7 +100,7 @@ public class PcStatus extends PlayableStatus getActiveChar().stopEffectsOnDamage(); } // Attacked players in craft/shops stand up. - if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) + if (getActiveChar().isCrafting() || getActiveChar().isInStoreMode()) { getActiveChar().setPrivateStoreType(PrivateStoreType.NONE); getActiveChar().standUp(); @@ -238,14 +238,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -337,7 +337,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -388,9 +388,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); + setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 80a80f6018..1d84f3da14 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -279,7 +279,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 1ce3ab05ca..6ee4d7e704 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -262,13 +262,13 @@ public final class Transform implements IIdentifiable if (creature.isPlayer()) { - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } if (addSkills) @@ -374,11 +374,11 @@ public final class Transform implements IIdentifiable final L2PcInstance player = creature.getActingPlayer(); final boolean hasTransformSkills = player.hasTransformSkills(); - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index ebee3cd82c..1adc7b039f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setInt(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setInt(6, _repeat); st.execute(); try (ResultSet rset = st.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setLong(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setLong(6, _repeat); st.setLong(7, getId()); st.execute(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/base/SubClass.java index 0e65764560..e318f331ee 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -140,7 +140,7 @@ public final class SubClass public void incLevel() { - if (!_dualClass && (getLevel() == _maxLevel)) + if (!_dualClass && (_level == _maxLevel)) { return; } @@ -151,7 +151,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java index 03b1a51b6b..8360f7712c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -69,7 +69,7 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() @@ -124,7 +124,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(this::restock, getRestockDelay()); + _restockTask = ThreadPool.schedule(this::restock, _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -133,7 +133,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -151,7 +151,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -161,7 +161,7 @@ public final class Product PreparedStatement statement = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { statement.setInt(1, _buyListId); - statement.setInt(2, getItemId()); + statement.setInt(2, _item.getId()); statement.setLong(3, getCount()); statement.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index ce7a68dcc7..4e95946a36 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -538,9 +538,9 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - getHolder().broadCastPacketToTeam(changePoints); + _holder.broadCastPacketToTeam(changePoints); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java index 4fa38d85d4..9b249a9069 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -72,7 +72,7 @@ public final class Castle extends AbstractResidence private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -96,12 +96,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -158,7 +158,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -185,29 +185,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -223,11 +223,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -244,7 +244,7 @@ public final class Castle extends AbstractResidence initResidenceZone(); initFunctions(); spawnSideNpcs(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -287,7 +287,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -338,7 +338,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -380,7 +380,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -460,7 +460,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -481,7 +481,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, String doorName, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -516,7 +516,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -877,7 +877,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -897,12 +897,12 @@ public final class Castle extends AbstractResidence public final L2DoorInstance getDoor(int doorId) { - return getDoors().stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); } public final L2DoorInstance getDoor(String doorName) { - return getDoors().stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); } public final List getDoors() @@ -957,7 +957,7 @@ public final class Castle extends AbstractResidence public final int getTaxPercent(TaxType type) { final int taxPercent; - switch (getSide()) + switch (_castleSide) { case LIGHT: { @@ -1036,7 +1036,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -1156,7 +1156,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); + final Skill skill = _castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); player.addSkill(skill); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index d41afdb68a..6fc9b45046 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -58,7 +58,7 @@ public final class ClanHall extends AbstractResidence private final ClanHallGrade _grade; private final ClanHallType _type; private final int _minBid; - private final int _lease; + final int _lease; private final int _deposit; private final List _npcs; private final List _doors; @@ -66,8 +66,8 @@ public final class ClanHall extends AbstractResidence private final Location _ownerLocation; private final Location _banishLocation; // Dynamic parameters - private L2Clan _owner = null; - private long _paidUntil = 0; + L2Clan _owner = null; + long _paidUntil = 0; protected ScheduledFuture _checkPaymentTask = null; // Other private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; @@ -137,7 +137,7 @@ public final class ClanHall extends AbstractResidence PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) { statement.setInt(1, getOwnerId()); - statement.setLong(2, getPaidUntil()); + statement.setLong(2, _paidUntil); statement.setInt(3, getResidenceId()); statement.execute(); } @@ -159,7 +159,7 @@ public final class ClanHall extends AbstractResidence public int getCostFailDay() { - final Duration failDay = Duration.between(Instant.ofEpochMilli(getPaidUntil()), Instant.now()); + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); return failDay.isNegative() ? 0 : (int) failDay.toDays(); } @@ -256,13 +256,13 @@ public final class ClanHall extends AbstractResidence _owner = clan; clan.setHideoutId(getResidenceId()); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (getPaidUntil() == 0) + if (_paidUntil == 0) { setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); } final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : getPaidUntil(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else @@ -351,29 +351,28 @@ public final class ClanHall extends AbstractResidence @Override public void run() { - final L2Clan clan = getOwner(); - if (clan != null) + if (_owner != null) { - if (clan.getWarehouse().getAdena() < getLease()) + if (_owner.getWarehouse().getAdena() < _lease) { if (getCostFailDay() > 8) { setOwner(null); - clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + _owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); } else { _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); - clan.broadcastToOnlineMembers(sm); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); } } else { - clan.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, getLease(), null, null); - setPaidUntil(Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), getPaidUntil() - System.currentTimeMillis()); + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java index 826a7beece..a4b57818fa 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -75,7 +75,7 @@ public class Duel private boolean _finished = false; private final Map _playerConditions = new ConcurrentHashMap<>(); - private Instance _duelInstance; + Instance _duelInstance; public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId) { @@ -213,9 +213,9 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPool.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - if (getDueldInstance() != null) + if (_duelInstance != null) { - getDueldInstance().destroy(); + _duelInstance.destroy(); } break; } @@ -674,7 +674,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -695,7 +695,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java index 3d030d3183..2433d41209 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -237,7 +237,7 @@ public final class Fort extends AbstractResidence super(fortId); load(); loadFlagPoles(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -506,7 +506,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -781,7 +781,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -873,7 +873,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1001,8 +1001,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1068,7 +1068,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 75de2719fc..c7a8bd6dfa 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -70,7 +70,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -101,7 +101,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -115,7 +115,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -184,7 +184,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -205,7 +205,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -228,7 +228,7 @@ public class FortSiege implements Siegable // Fort setting protected Set _commanders = ConcurrentHashMap.newKeySet(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private final Collection _siegeGuards = new LinkedList<>(); ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -248,7 +248,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { _isInProgress = false; // Flag so that siege instance can be started removeFlags(); // Removes all flags. Note: Remove flag before teleporting players @@ -257,22 +257,22 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); int ownerId = -1; - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - ownerId = getFort().getOwnerClan().getId(); + ownerId = _fort.getOwnerClan().getId(); } - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -306,16 +306,16 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -326,24 +326,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -358,7 +358,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -369,7 +369,7 @@ public class FortSiege implements Siegable } } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -391,7 +391,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -411,7 +411,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -421,7 +421,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -441,7 +441,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -470,7 +470,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return (_isInProgress && (_fort.checkIfInZone(x, y, z))); // Fort zone during siege } /** @@ -490,7 +490,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - if ((clan != null) && (getFort().getOwnerClan() == clan)) + if ((clan != null) && (_fort.getOwnerClan() == clan)) { return true; } @@ -504,22 +504,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -540,7 +540,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -550,7 +550,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -583,10 +583,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -614,7 +614,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if ((getFort() != null) && (!_commanders.isEmpty())) + if ((_fort != null) && (!_commanders.isEmpty())) { final L2Spawn spawn = instance.getSpawn(); if (spawn != null) @@ -657,14 +657,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -674,22 +674,22 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } // schedule restoring doors/commanders respawn else if (_siegeRestore == null) { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); } } else { - LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } } @@ -705,7 +705,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -734,7 +734,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player don't have enough adena to register } @@ -754,7 +754,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -788,7 +788,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(query)) { - statement.setInt(1, getFort().getResidenceId()); + statement.setInt(1, _fort.getResidenceId()); if (clanId != 0) { statement.setInt(2, clanId); @@ -796,9 +796,9 @@ public class FortSiege implements Siegable statement.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -843,7 +843,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -896,9 +896,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -927,7 +927,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -948,7 +948,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -991,18 +991,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1038,7 +1038,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1060,8 +1060,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, _fort.getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1085,7 +1085,7 @@ public class FortSiege implements Siegable PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getFort().getResidenceId()); + statement.setInt(2, _fort.getResidenceId()); statement.execute(); addAttacker(clan.getId()); @@ -1151,7 +1151,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1235,7 +1235,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1265,7 +1265,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1288,7 +1288,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public Set getCommanders() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java index a2ad3c924d..32b1d6187a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -92,7 +92,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -160,14 +160,14 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } try { - if (!getIsTimeRegistrationOver()) + if (!_castle.getIsTimeRegistrationOver()) { final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) @@ -186,7 +186,7 @@ public class Siege implements Siegable else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; clearSiegeWaitingClan(); @@ -228,8 +228,8 @@ public class Siege implements Siegable // Castle setting private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); - private final Castle _castle; - private boolean _isInProgress = false; + final Castle _castle; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,18 +246,18 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); if (clan.getId() == _firstOwnerClanId) @@ -267,7 +267,7 @@ public class Siege implements Siegable } else { - getCastle().setTicketBuyCount(0); + _castle.setTicketBuyCount(0); for (L2ClanMember member : clan.getMembers()) { if (member != null) @@ -284,7 +284,7 @@ public class Siege implements Siegable else { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); } @@ -322,7 +322,7 @@ public class Siege implements Siegable clan.clearSiegeDeaths(); } - getCastle().updateClansReputation(); + _castle.updateClansReputation(); removeFlags(); // Removes all flags. Note: Remove flag before teleporting players teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town _isInProgress = false; // Flag so that siege instance can be started @@ -331,14 +331,14 @@ public class Siege implements Siegable clearSiegeClan(); // Clear siege clan from db removeTowers(); // Remove all towers from this castle SiegeGuardManager.getInstance().unspawnSiegeGuard(getCastle()); // Remove all spawned siege guard from this castle - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); } - getCastle().spawnDoor(); // Respawn door to castle - getCastle().getZone().setIsActive(false); - getCastle().getZone().updateZoneStatusForCharactersInside(); - getCastle().getZone().setSiegeInstance(null); + _castle.spawnDoor(); // Respawn door to castle + _castle.getZone().setIsActive(false); + _castle.getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(null); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeFinish(this), getCastle()); @@ -387,9 +387,9 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); // Remove all merc entry from db } @@ -398,13 +398,13 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); return; } - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) @@ -426,7 +426,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -444,7 +444,7 @@ public class Siege implements Siegable } } - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -462,8 +462,8 @@ public class Siege implements Siegable teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town removeDefenderFlags(); // Removes defenders' flags - getCastle().removeUpgrade(); // Remove all castle upgrade - getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) + _castle.removeUpgrade(); // Remove all castle upgrade + _castle.spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) removeTowers(); // Remove all towers from this castle _controlTowerCount = 0; // Each new siege midvictory CT are completely respawned. spawnControlTower(); @@ -483,9 +483,9 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { - _firstOwnerClanId = getCastle().getOwnerId(); + _firstOwnerClanId = _castle.getOwnerId(); if (getAttackerClans().isEmpty()) { @@ -500,7 +500,7 @@ public class Siege implements Siegable final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId); ownerClan.increaseBloodAllianceCount(); } - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); saveCastleSiege(); return; @@ -515,20 +515,20 @@ public class Siege implements Siegable _controlTowerCount = 0; spawnControlTower(); // Spawn control tower spawnFlameTower(); // Spawn control tower - getCastle().spawnDoor(); // Spawn door + _castle.spawnDoor(); // Spawn door spawnSiegeGuard(); // Spawn siege guard SiegeGuardManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground - getCastle().getZone().setSiegeInstance(this); - getCastle().getZone().setIsActive(true); - getCastle().getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(this); + _castle.getZone().setIsActive(true); + _castle.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEndDate = Calendar.getInstance(); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); - ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task + ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); // Notify to scripts. @@ -589,7 +589,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -649,7 +649,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -723,7 +723,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return (_isInProgress && (_castle.checkIfInZone(x, y, z))); // Castle zone during siege } /** @@ -763,21 +763,21 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) { - delete.setInt(1, getCastle().getOwnerId()); + delete.setInt(1, _castle.getOwnerId()); delete.execute(); } } getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -791,10 +791,10 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -821,7 +821,7 @@ public class Siege implements Siegable */ public List getPlayersInZone() { - return getCastle().getZone().getPlayersInside(); + return _castle.getZone().getPlayersInside(); } /** @@ -845,7 +845,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - return getCastle().getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); + return _castle.getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); } /** @@ -872,7 +872,7 @@ public class Siege implements Siegable */ public void listRegisterClan(L2PcInstance player) { - player.sendPacket(new SiegeInfo(getCastle(), player)); + player.sendPacket(new SiegeInfo(_castle, player)); } /** @@ -892,7 +892,7 @@ public class Siege implements Siegable return; } int allyId = 0; - if (getCastle().getOwnerId() != 0) + if (_castle.getOwnerId() != 0) { allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); } @@ -935,9 +935,9 @@ public class Siege implements Siegable public void registerDefender(L2PcInstance player, boolean force) { - if (getCastle().getOwnerId() <= 0) + if (_castle.getOwnerId() <= 0) { - player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC."); + player.sendMessage("You cannot register as a defender because " + _castle.getName() + " is owned by NPC."); return; } @@ -975,7 +975,7 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.setInt(2, clanId); statement.execute(); @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _castle.getName() + ": " + _castle.getSiegeDate().getTime()); loadSiegeClan(); @@ -1028,7 +1028,7 @@ public class Siege implements Siegable { _scheduledStartSiegeTask.cancel(false); } - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } /** @@ -1048,12 +1048,12 @@ public class Siege implements Siegable } case NotOwner: { - players = getPlayersInZone(); + players = _castle.getZone().getPlayersInside(); final Iterator it = players.iterator(); while (it.hasNext()) { final L2PcInstance player = it.next(); - if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId()))) + if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == _castle.getOwnerId()))) { it.remove(); } @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1149,7 +1149,7 @@ public class Siege implements Siegable { player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_5_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE); } - else if (player.getClan().getId() == getCastle().getOwnerId()) + else if (player.getClan().getId() == _castle.getOwnerId()) { player.sendPacket(SystemMessageId.CASTLE_OWNING_CLANS_ARE_AUTOMATICALLY_REGISTERED_ON_THE_DEFENDING_SIDE); } @@ -1243,15 +1243,15 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { - addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER); + addDefender(_castle.getOwnerId(), SiegeClanType.OWNER); } - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); try (ResultSet rs = statement.executeQuery()) { int typeId; @@ -1333,8 +1333,8 @@ public class Siege implements Siegable setNextSiegeDate(); // Set the next set date for 2 weeks from now // Schedule Time registration end getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); - getCastle().setIsTimeRegistrationOver(false); + _castle.getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); + _castle.setIsTimeRegistrationOver(false); saveSiegeDate(); // Save the new date startAutoTask(); // Prepare auto start siege and end registration @@ -1346,16 +1346,16 @@ public class Siege implements Siegable if (_scheduledStartSiegeTask != null) { _scheduledStartSiegeTask.cancel(true); - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ? WHERE id = ?")) { - statement.setLong(1, getSiegeDate().getTimeInMillis()); - statement.setLong(2, getTimeRegistrationOverDate().getTimeInMillis()); - statement.setString(3, String.valueOf(getIsTimeRegistrationOver())); - statement.setInt(4, getCastle().getResidenceId()); + statement.setLong(1, _castle.getSiegeDate().getTimeInMillis()); + statement.setLong(2, _castle.getTimeRegistrationOverDate().getTimeInMillis()); + statement.setString(3, String.valueOf(_castle.getIsTimeRegistrationOver())); + statement.setInt(4, _castle.getResidenceId()); statement.execute(); } catch (Exception e) @@ -1397,7 +1397,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, typeId); statement.execute(); } @@ -1407,7 +1407,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) { statement.setInt(1, typeId); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, clan.getId()); statement.execute(); } @@ -1435,7 +1435,7 @@ public class Siege implements Siegable /** Set the date for the next siege. */ private void setNextSiegeDate() { - final Calendar cal = getCastle().getSiegeDate(); + final Calendar cal = _castle.getSiegeDate(); if (cal.getTimeInMillis() < System.currentTimeMillis()) { cal.setTimeInMillis(System.currentTimeMillis()); @@ -1460,7 +1460,7 @@ public class Siege implements Siegable } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = false; // Allow registration for next siege @@ -1645,7 +1645,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1672,23 +1672,23 @@ public class Siege implements Siegable public final boolean getIsTimeRegistrationOver() { - return getCastle().getIsTimeRegistrationOver(); + return _castle.getIsTimeRegistrationOver(); } @Override public final Calendar getSiegeDate() { - return getCastle().getSiegeDate(); + return _castle.getSiegeDate(); } public final Calendar getTimeRegistrationOverDate() { - return getCastle().getTimeRegistrationOverDate(); + return _castle.getTimeRegistrationOverDate(); } public void endTimeRegistration(boolean automatic) { - getCastle().setIsTimeRegistrationOver(true); + _castle.setIsTimeRegistrationOver(true); if (!automatic) { saveSiegeDate(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java index f09be6765f..ac490ba86d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -129,7 +129,7 @@ public class EventScheduler run(); updateLastRun(); - if (isRepeating()) + if (_repeat) { ThreadPool.schedule(this::startScheduler, 1000); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index eae25b08f7..1d42731b7a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() @@ -46,16 +46,16 @@ public final class MovieHolder public void playerEscapeVote(L2PcInstance player) { - if (getVotedPlayers().contains(player) || !getPlayers().contains(player) || !getMovie().isEscapable()) + if (_votedPlayers.contains(player) || !_players.contains(player) || !_movie.isEscapable()) { return; } - getVotedPlayers().add(player); + _votedPlayers.add(player); - if (((getVotedPlayers().size() * 100) / getPlayers().size()) >= 50) + if (((_votedPlayers.size() * 100) / _players.size()) >= 50) { - getPlayers().forEach(L2PcInstance::stopMovie); + _players.forEach(L2PcInstance::stopMovie); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index a4fde8355e..4bc6353cfa 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -487,7 +487,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return Collections.emptyList(); } @@ -502,7 +502,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } return npcs; } @@ -516,7 +516,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return; } @@ -526,7 +526,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } } @@ -810,7 +810,7 @@ public final class Instance implements IIdentifiable, INamable public void setReenterTime(long time) { // Cannot store reenter data for instance without template id. - if ((getTemplateId() == -1) && (time > 0)) + if ((_template.getId() == -1) && (time > 0)) { return; } @@ -824,7 +824,7 @@ public final class Instance implements IIdentifiable, INamable if (player != null) { ps.setInt(1, player.getObjectId()); - ps.setInt(2, getTemplateId()); + ps.setInt(2, _template.getId()); ps.setLong(3, time); ps.addBatch(); } @@ -835,11 +835,11 @@ public final class Instance implements IIdentifiable, INamable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null) { - msg.addInstanceName(getTemplateId()); + msg.addInstanceName(_template.getId()); } else { - msg.addString(getName()); + msg.addString(_template.getName()); } _allowed.forEach(player -> { @@ -995,7 +995,7 @@ public final class Instance implements IIdentifiable, INamable removePlayer(player); if (Config.RESTORE_PLAYER_INSTANCE) { - player.getVariables().set("INSTANCE_RESTORE", getId()); + player.getVariables().set("INSTANCE_RESTORE", _id); } else { @@ -1161,6 +1161,6 @@ public final class Instance implements IIdentifiable, INamable @Override public String toString() { - return getName() + "(" + getId() + ")"; + return _template.getName() + "(" + _id + ")"; } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 409678ea5a..ba6f5482ad 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -788,6 +788,6 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl @Override public String toString() { - return "ID: " + getId() + " Name: " + getName(); + return "ID: " + _templateId + " Name: " + _name; } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 4ebae030de..24c473792a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -181,12 +181,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -250,7 +250,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -340,7 +340,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5bb5770412..9e94b591e8 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -115,9 +115,9 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - statement.setInt(1, getOwnerId()); + statement.setInt(1, _ownerId); statement.setString(2, getBaseLocation().name()); - statement.setInt(3, getMessageId()); + statement.setInt(3, _messageId); try (ResultSet inv = statement.executeQuery()) { while (inv.next()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index c7a3128aa9..9228d151c2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -150,7 +150,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -211,7 +211,7 @@ public class PcInventory extends Inventory { return getItems(i -> { - if (!i.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) + if (!i.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) { return false; } @@ -232,7 +232,7 @@ public class PcInventory extends Inventory { //@formatter:off return _items.values().stream() - .filter(i -> i.isAvailable(getOwner(), false, false)) + .filter(i -> i.isAvailable(_owner, false, false)) .map(tradeList::adjustAvailableItem) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -689,12 +689,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (getOwner().isProcessingItem(item.getObjectId())) + if (_owner.isProcessingItem(item.getObjectId())) { - getOwner().removeRequestsThatProcessesItem(item.getObjectId()); + _owner.removeRequestsThatProcessesItem(item.getObjectId()); } if (item.getId() == ADENA_ID) @@ -720,7 +720,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(true); + _owner.refreshOverloaded(true); } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 87c35d5d82..fa6332fb1f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -120,7 +120,7 @@ public class PetInventory extends Inventory { if (item.isEquipped()) { - if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (!item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 4c8db6b288..dbba43acd0 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -73,6 +73,6 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index a04975542f..8d988d61be 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -89,7 +89,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java index c86ec8ca9b..5089b53c7f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -411,11 +411,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -430,11 +430,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -528,7 +528,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -585,7 +585,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -776,7 +776,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) { if (isEquipable()) { @@ -789,7 +789,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return false; } - if (isCocRestrictedItem() && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_is_coc_restricted && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 1db19c172a..a0ee0a7895 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -119,7 +119,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 0f9a69fec3..d9baca8329 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -274,7 +274,7 @@ public class AppearanceStone return false; } - switch (getType()) + switch (_type) { case RESTORE: { @@ -383,15 +383,15 @@ public class AppearanceStone return false; } - if (getWeaponType() != WeaponType.NONE) + if (_weaponType != WeaponType.NONE) { - if (!targetItem.isWeapon() || (targetItem.getItemType() != getWeaponType())) + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); return false; } - switch (getHandType()) + switch (_handType) { case ONE_HANDED: { @@ -413,7 +413,7 @@ public class AppearanceStone } } - switch (getMagicType()) + switch (_magicType) { case MAGICAL: { @@ -435,9 +435,9 @@ public class AppearanceStone } } - if (getArmorType() != ArmorType.NONE) + if (_armorType != ArmorType.NONE) { - switch (getArmorType()) + switch (_armorType) { case SHIELD: { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 851ee0b06b..9cd7f326c0 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -328,14 +328,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -344,7 +344,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -366,7 +366,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -482,7 +482,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -504,12 +504,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -519,7 +519,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -542,7 +542,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -559,9 +559,9 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isEnchantable(); + return _item.isEnchantable(); } return 0; } @@ -656,7 +656,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -730,7 +730,7 @@ public final class L2ItemInstance extends L2Object /** * @return the reference price of the item. */ - public int getReferencePrice() + public long getReferencePrice() { return _item.getReferencePrice(); } @@ -880,7 +880,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public final class L2ItemInstance extends L2Object final L2Summon pet = player.getPet(); return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -963,7 +963,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1139,9 +1139,9 @@ public final class L2ItemInstance extends L2Object { if (isWeapon()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - return getItem().getAttributes().stream().findFirst().orElse(null); + return _item.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1167,9 +1167,9 @@ public final class L2ItemInstance extends L2Object { if (isArmor()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - final AttributeHolder attribute = getItem().getAttribute(element); + final AttributeHolder attribute = _item.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1411,7 +1411,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1433,7 +1433,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1615,11 +1615,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1651,12 +1651,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1838,7 +1838,7 @@ public final class L2ItemInstance extends L2Object player.sendInventoryUpdate(iu); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1852,7 +1852,7 @@ public final class L2ItemInstance extends L2Object { player.getWarehouse().destroyItem("L2ItemInstance", this, player, null); } - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(getId())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId)); } } @@ -1949,32 +1949,32 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isElementable(); + return _item.isElementable(); } return false; } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -1991,7 +1991,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && (getItem().getSkills(ItemSkillType.NORMAL) != null); + return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2004,7 +2004,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2025,7 +2025,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2429,7 +2429,15 @@ public final class L2ItemInstance extends L2Object iu.addModifiedItem(this); player.broadcastUserInfo(UserInfoType.APPAREANCE); player.sendInventoryUpdate(iu); - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + + if (isEnchanted()) + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this)); + } + else + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + } } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 4858feb6a9..9a7dbcac0d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/options/Options.java index 813ec8f6db..630038eb77 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/options/Options.java @@ -189,14 +189,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { addSkill(player, holder.getSkill()); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { addSkill(player, holder.getSkill()); } @@ -227,14 +227,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { player.removeSkill(holder.getSkill(), false, false); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { player.removeSkill(holder.getSkill(), false, true); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java index 34abe34bae..c9adc46e86 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2739,7 +2739,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2752,9 +2751,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); @@ -2942,7 +2941,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if (activeChar.getQuestState(getName()) != null) { - final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList packet = new ExQuestNpcLogList(_questId); getNpcLogList(activeChar).forEach(packet::add); activeChar.sendPacket(packet); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 40aa1878fd..5e0a66a375 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + _questName + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -755,7 +755,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 4013de0733..1cf9e26073 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,13 +53,13 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; - private final ScheduledFuture _schedular; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; + private final ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) { @@ -68,7 +68,7 @@ public class QuestTimer _player = player; _npc = npc; _isRepeating = repeating; - _schedular = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); + _scheduler = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); } public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) @@ -87,9 +87,9 @@ public class QuestTimer public void cancel() { _isActive = false; - if (_schedular != null) + if (_scheduler != null) { - _schedular.cancel(false); + _scheduler.cancel(false); } } @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java index 73f5ed97a8..81ec17cf73 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -132,7 +132,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -152,7 +152,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + _residenceId, e); } } @@ -173,7 +173,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN ps.setInt(1, func.getId()); ps.setInt(2, func.getLevel()); ps.setLong(3, func.getExpiration()); - ps.setInt(4, getResidenceId()); + ps.setInt(4, _residenceId); ps.setInt(5, func.getLevel()); ps.setLong(6, func.getExpiration()); @@ -181,7 +181,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + _residenceId, e); } finally { @@ -202,13 +202,13 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ? and id = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.setInt(2, func.getId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + _residenceId, e); } finally { @@ -225,12 +225,12 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + _residenceId, e); } finally { @@ -313,6 +313,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + " (" + getResidenceId() + ")"; + return _name + " (" + _residenceId + ")"; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index ab2394ed74..cac8ecf953 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -333,7 +333,7 @@ public final class BuffInfo } // Call on start. - effect.onStart(getEffector(), getEffected(), getSkill()); + effect.onStart(_effector, _effected, _skill); // If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it. if (effect.getTicks() > 0) @@ -360,7 +360,7 @@ public final class BuffInfo if (_isInUse) { // Callback for on action time event. - continueForever = effect.onActionTime(getEffector(), getEffected(), getSkill()); + continueForever = effect.onActionTime(_effector, _effected, _skill); } if (!continueForever && _skill.isToggle()) @@ -369,7 +369,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -391,7 +391,7 @@ public final class BuffInfo // Instant effects shouldn't call onExit(..). if (!effect.isInstant()) { - effect.onExit(getEffector(), getEffected(), getSkill()); + effect.onExit(_effector, _effected, _skill); } } @@ -403,7 +403,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java index 19a1a61b20..1cea15b228 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -240,15 +240,15 @@ public final class Skill implements IIdentifiable _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -441,7 +441,7 @@ public final class Skill implements IIdentifiable } _magicCriticalRate = set.getDouble("magicCriticalRate", 0); - _buffType = isTriggeredSkill() ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : isDebuff() ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; + _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); } @@ -1054,7 +1054,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getMaxSoulConsumeCount() @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable public boolean isStayAfterDeath() { - return _stayAfterDeath || isIrreplacableBuff() || isNecessaryToggle(); + return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle; } public boolean isBad() @@ -1333,7 +1333,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isIgnoringSkillEffects(getId(), getLevel())) + if (effected.isIgnoringSkillEffects(_id, _level)) { return; } @@ -1357,7 +1357,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1368,19 +1368,19 @@ public final class Skill implements IIdentifiable } // Check for mesmerizing debuffs and increase resist level. - if (isDebuff() && (getBasicProperty() != BasicProperty.NONE) && effected.hasBasicPropertyResist()) + if (_isDebuff && (_basicProperty != BasicProperty.NONE) && effected.hasBasicPropertyResist()) { - final BasicPropertyResist resist = effected.getBasicPropertyResist(getBasicProperty()); + final BasicPropertyResist resist = effected.getBasicPropertyResist(_basicProperty); resist.increaseResistLevel(); } } // Support for buff sharing feature including healing herbs. - if (isSharedWithSummon() && effected.isPlayer() && effected.hasServitors() && !isTransformation()) + if (_isSharedWithSummon && effected.isPlayer() && effected.hasServitors() && !isTransformation()) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - effected.getServitors().values().forEach(s -> applyEffects(effector, s, isRecoveryHerb(), 0)); + effected.getServitors().values().forEach(s -> applyEffects(effector, s, _isRecoveryHerb, 0)); } } } @@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1413,7 +1413,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && isSharedWithSummon() && info.getEffected().isPlayer() && isContinuous() && !isDebuff() && info.getEffected().hasServitors()) + if (addContinuousEffects && _isSharedWithSummon && info.getEffected().isPlayer() && isContinuous() && !_isDebuff && info.getEffected().hasServitors()) { info.getEffected().getServitors().values().forEach(s -> applyEffects(effector, s, false, 0)); } @@ -1498,9 +1498,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0, item); } @@ -1517,7 +1517,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1571,7 +1571,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isIrreplacableBuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispelled(); + return !isPassive() && !isToggle() && !_isDebuff && !_irreplacableBuff && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispelled; } public boolean isClanSkill() @@ -1733,20 +1733,20 @@ public final class Skill implements IIdentifiable public Skill getAttachedSkill(L2Character activeChar) { // If character is double casting, return double cast skill. - if ((getDoubleCastSkill() > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) + if ((_doubleCastSkill > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) { return SkillData.getInstance().getSkill(getDoubleCastSkill(), getLevel(), getSubLevel()); } // Default toggle group ID, assume nothing attached. - if ((getAttachToggleGroupId() <= 0) || (getAttachSkills() == null)) + if ((_attachToggleGroupId <= 0) || (_attachSkills == null)) { return null; } //@formatter:off final int toggleSkillId = activeChar.getEffectList().getEffects().stream() - .filter(info -> info.getSkill().getToggleGroupId() == getAttachToggleGroupId()) + .filter(info -> info.getSkill().getToggleGroupId() == _attachToggleGroupId) .mapToInt(info -> info.getSkill().getId()) .findAny().orElse(0); //@formatter:on @@ -1757,7 +1757,7 @@ public final class Skill implements IIdentifiable return null; } - final AttachSkillHolder attachedSkill = getAttachSkills().stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); + final AttachSkillHolder attachedSkill = _attachSkills.stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); // No attached skills for this toggle found. if (attachedSkill == null) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 8e607be078..f5da8aed03 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -99,7 +99,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -160,7 +160,7 @@ public class SkillChannelizer implements Runnable if (o.isCharacter()) { targetList.add((L2Character) o); - ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), _channelizer); } }); } @@ -198,13 +198,13 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer()) + if (character.isPlayable() && _channelizer.isPlayer()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } // Be warned, this method has the possibility to call doDie->abortCast->stopChanneling method. Variable cache above try"+ +" is used in this case to avoid NPEs. - channeledSkill.applyEffects(getChannelizer(), character); + channeledSkill.applyEffects(_channelizer, character); // Reduce shots. if (skill.useSpiritShot()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 84fb8d0f96..3394227e4c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -145,7 +145,7 @@ public final class TeleportHolder // Build html final StringBuilder sb = new StringBuilder(); final StringBuilder sb_f = new StringBuilder(); - for (TeleportLocation loc : getLocations()) + for (TeleportLocation loc : _teleportData) { String finalName = loc.getName(); String confirmDesc = loc.getName(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 66f0ce1b9f..69519245dc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -205,7 +205,7 @@ public abstract class L2ZoneType extends ListenersContainer final Instance world = character.getInstanceWorld(); if (world != null) { - if (world.getTemplateId() != getInstanceTemplateId()) + if (world.getTemplateId() != _instanceTemplateId) { return false; } @@ -214,7 +214,7 @@ public abstract class L2ZoneType extends ListenersContainer return false; } } - else if (getInstanceTemplateId() > 0) + else if (_instanceTemplateId > 0) { return false; } @@ -402,12 +402,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -572,7 +572,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) @@ -605,10 +605,10 @@ public abstract class L2ZoneType extends ListenersContainer { if (_enabledInInstance != null) { - return _enabledInInstance.getOrDefault(instanceId, isEnabled()); + return _enabledInInstance.getOrDefault(instanceId, _enabled); } - return isEnabled(); + return _enabled; } public void oustAllPlayers() @@ -633,7 +633,7 @@ public abstract class L2ZoneType extends ListenersContainer return; } - for (L2Character character : getCharactersInside()) + for (L2Character character : _characterList.values()) { if ((character != null) && character.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 33d3bb8723..6a7479f3af 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public final class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -257,7 +257,7 @@ public final class L2EffectZone extends L2ZoneType { getCharactersInside().forEach(character -> { - if ((character != null) && !character.isDead() && (Rnd.get(100) < getChance())) + if ((character != null) && !character.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index a1a99b7051..95223b63a9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9b786f0b7d..f1e975876e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -252,7 +252,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -533,7 +533,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -603,11 +603,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 8aa642c02a..1c02d43810 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -56,7 +56,7 @@ public final class RequestRecipeItemMakeSelf implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index ba40366a3e..fda43da41c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -79,7 +79,7 @@ public final class RequestRecipeShopMakeItem implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index dad7c7aefa..86324a84a0 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -120,7 +120,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket return; } - final int price = itemInstance.getReferencePrice(); + final long price = itemInstance.getReferencePrice(); if (itemInstance.getReferencePrice() == 0) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_COMBINED); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index b3f8a823c8..ad3f971eda 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -59,7 +59,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); return; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 4fe4ef7d8c..75c44c649d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -54,7 +54,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 97d035b0f3..1d6ef78348 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -62,7 +62,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExShapeShiftingResult.CLOSE); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index a06dff5ebc..9dc3eba861 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -430,7 +430,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java index 1a16f0bd49..934a748fa3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 17f3f7f21b..bda9f2f3e5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -68,7 +68,7 @@ public final class OfflineTradeUtil } default: { - canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isInCraftMode(); + canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isCrafting(); break; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 4911f2826c..e5388f4596 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -240,7 +240,7 @@ public class TaskExecutor */ public void pause() throws UnsupportedOperationException { - if (!canBePaused()) + if (!task.canBePaused()) { throw new UnsupportedOperationException("Pause not supported"); } @@ -276,7 +276,7 @@ public class TaskExecutor */ public void stop() throws UnsupportedOperationException { - if (!canBeStopped()) + if (!task.canBeStopped()) { throw new UnsupportedOperationException("Stop not supported"); } @@ -346,7 +346,7 @@ public class TaskExecutor */ public String getStatusMessage() throws UnsupportedOperationException { - if (!supportsStatusTracking()) + if (!task.supportsStatusTracking()) { throw new UnsupportedOperationException("Status tracking not supported"); } @@ -360,7 +360,7 @@ public class TaskExecutor */ public double getCompleteness() throws UnsupportedOperationException { - if (!supportsCompletenessTracking()) + if (!task.supportsCompletenessTracking()) { throw new UnsupportedOperationException("Completeness tracking not supported"); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java index 85dbd2a34a..7d9ec1824b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java index da20164f21..068a5f1773 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 859128de7b..c90c8127a6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -286,7 +286,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -314,10 +314,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -376,59 +376,59 @@ public abstract class BaseGameServerRegister if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.printf(getBundle().getString("checkingIdInUse") + Config.EOL, _id); + System.out.printf(_bundle.getString("checkingIdInUse") + Config.EOL, _id); if (GameServerTable.getInstance().hasRegisteredGameServerOnId(_id)) { - System.out.println(getBundle().getString("yes")); + System.out.println(_bundle.getString("yes")); if (_force) { - System.out.printf(getBundle().getString("forcingRegistration") + Config.EOL, _id); + System.out.printf(_bundle.getString("forcingRegistration") + Config.EOL, _id); unregisterGameServer(_id); registerGameServer(_id, _outDir); - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, _id); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, _id); } else if (_fallback) { - System.out.println(getBundle().getString("fallingBack")); + System.out.println(_bundle.getString("fallingBack")); final int registeredId = registerFirstAvailable(_outDir); if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.println(getBundle().getString("noAction")); + System.out.println(_bundle.getString("noAction")); } } else { - System.out.println(getBundle().getString("no")); + System.out.println(_bundle.getString("no")); registerGameServer(_id, _outDir); } } } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } catch (IOException e) { - showError(getBundle().getString("ioErrorRegister"), e); + showError(_bundle.getString("ioErrorRegister"), e); } } } @@ -453,14 +453,14 @@ public abstract class BaseGameServerRegister @Override public void run() { - System.out.printf(getBundle().getString("removingGsId") + Config.EOL, _id); + System.out.printf(_bundle.getString("removingGsId") + Config.EOL, _id); try { unregisterGameServer(_id); } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } } } @@ -479,7 +479,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 59ca8fcc83..6251faab77 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -40,7 +40,7 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING); return false; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/SocialAction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/SocialAction.java index f7db8c36f7..fde530a2b4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/SocialAction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/SocialAction.java @@ -149,7 +149,7 @@ public final class SocialAction implements IPlayerActionHandler } SystemMessage sm; - if (player.isInStoreMode() || player.isInCraftMode()) + if (player.isInStoreMode() || player.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(player); @@ -228,7 +228,7 @@ public final class SocialAction implements IPlayerActionHandler // Checks for partner. final L2PcInstance partner = target.getActingPlayer(); - if (partner.isInStoreMode() || partner.isInCraftMode()) + if (partner.isInStoreMode() || partner.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(partner); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 881d3eb70b..135edbc233 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -530,7 +530,7 @@ public class Q00663_SeductiveWhispers extends Quest @Override public String toString() { - return getSide() == Side.MOON ? "" + getSide().getName() + ": " + getNumber() + "" : "" + getSide().getName() + ": " + getNumber() + ""; + return _side == Side.MOON ? "" + _side.getName() + ": " + _number + "" : "" + _side.getName() + ": " + _number + ""; } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/PacketReader.java index ea90113f43..bdf5c76ac8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/RecipeController.java index 5bf504afb5..ef52c215f3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/RecipeController.java @@ -199,7 +199,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -291,7 +291,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -438,7 +438,7 @@ public class RecipeController // update load and mana bar of craft window updateCurMp(); _activeMakers.remove(_player.getObjectId()); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendItemList(false); } @@ -654,7 +654,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player.getObjectId()); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java index cad4fb54da..717f999c27 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -608,7 +608,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -648,7 +648,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -680,7 +680,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player)) + if (_actor.isVisibleFor(player)) { if (_clientMoving) { @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (getTarget() instanceof L2Character) && (getIntention() == AI_INTENTION_FOLLOW); + return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); } /** @@ -737,7 +737,7 @@ public abstract class AbstractAI implements Ctrl return; } - final L2Object followTarget = getTarget(); // copy to prevent NPE + final L2Object followTarget = _target; // copy to prevent NPE if (followTarget == null) { if (_actor.isSummon()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8826f4e507..3880807630 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -166,7 +166,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, max_range); } @@ -216,7 +216,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -256,7 +256,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 4f3a018802..0052f4791d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -224,7 +224,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtAttacked(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } @@ -239,7 +239,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtEvaded(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java index 3127c4156e..265a5a6758 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -66,7 +66,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index 316e1ed757..dd22855ae4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 5aac2716cf..d0cd743b0f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -134,7 +134,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -349,7 +349,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index ff236652e3..c60afbd78a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -48,9 +48,9 @@ public class AttendanceRewardData implements IGameXmlReader { if (Config.ENABLE_ATTENDANCE_REWARDS) { - getRewards().clear(); + _rewards.clear(); parseDatapackFile("data/AttendanceRewards.xml"); - _rewardsCount = getRewards().size(); + _rewardsCount = _rewards.size(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _rewardsCount + " rewards."); } else @@ -73,7 +73,7 @@ public class AttendanceRewardData implements IGameXmlReader } else { - getRewards().add(new ItemHolder(itemId, itemCount)); + _rewards.add(new ItemHolder(itemId, itemCount)); } })); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java index 712d1febdd..6618dcdf1d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java @@ -108,7 +108,7 @@ public final class CastleData implements IGameXmlReader guards.add(new SiegeGuardHolder(castleId, itemId, type, stationary, npcId, npcMaxAmount)); } } - getSiegeGuards().put(castleId, guards); + _siegeGuards.put(castleId, guards); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b0b755ac92..db7fdf9fa6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -258,7 +258,7 @@ public class RecipeData implements IGameXmlReader if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage("No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java index ac3c07c3c9..d5266c07ef 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/enums/AttributeType.java @@ -63,7 +63,7 @@ public enum AttributeType */ public AttributeType getOpposite() { - return ATTRIBUTE_TYPES[((getClientId() % 2) == 0) ? (getClientId() + 1) : (getClientId() - 1)]; + return ATTRIBUTE_TYPES[((_clientId % 2) == 0) ? (_clientId + 1) : (_clientId - 1)]; } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2615be0ddf..f0275d4660 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 792edf3cba..afc836f427 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -68,7 +68,7 @@ public final class CastleManager implements InstanceListManager if (nearestCastle == null) { double distance; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { distance = castle.getDistance(obj); if (maxDistance > distance) @@ -88,7 +88,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastleByOwner(L2Clan clan) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getOwnerId() == clan.getId()) { @@ -100,7 +100,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(String name) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getName().equalsIgnoreCase(name.trim())) { @@ -112,7 +112,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(int x, int y, int z) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.checkIfInZone(x, y, z)) { @@ -135,7 +135,7 @@ public final class CastleManager implements InstanceListManager public boolean hasOwnedCastle() { boolean hasOwnedCastle = false; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { if (castle.getOwnerId() > 0) { @@ -224,7 +224,7 @@ public final class CastleManager implements InstanceListManager final int castleId = rs.getInt("id"); _castles.put(castleId, new Castle(castleId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCastles().size() + " castles."); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.values().size() + " castles."); } catch (Exception e) { @@ -240,7 +240,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { castle.activateInstance(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index dc63278e16..37f7cd0a21 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -47,7 +47,7 @@ public final class FortManager implements InstanceListManager Fort nearestFort = getFort(obj); if (nearestFort == null) { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { final double distance = fort.getDistance(obj); if (maxDistance > distance) @@ -62,7 +62,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getResidenceId() == fortId) { @@ -74,7 +74,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getOwnerClan() == clan) { @@ -86,7 +86,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -98,7 +98,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.checkIfInZone(x, y, z)) { @@ -131,8 +131,8 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); - for (Fort fort : getForts()) + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.values().size() + " fortress"); + for (Fort fort : _forts.values()) { fort.getSiege().loadSiegeGuard(); } @@ -151,7 +151,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { fort.activateInstance(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 58b75f592d..0b4c7601cb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -102,7 +102,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -115,7 +115,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -128,7 +128,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -141,7 +141,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -159,7 +159,7 @@ public final class MailManager public int getMailsInProgress(int objectId) { int count = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getMailType() == MailType.REGULAR)) { @@ -179,7 +179,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 41216a0555..30581681f4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -244,7 +244,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return (currPetition.getState() == PetitionState.IN_PROCESS); } @@ -252,7 +252,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -283,7 +283,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -302,7 +302,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -312,7 +312,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -330,7 +330,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -363,12 +363,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("

There are no currently pending petitions.
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -379,7 +379,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -419,7 +419,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -440,7 +440,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 964757069c..20b6c07319 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -171,7 +171,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java index 1b0e62c021..83b903b671 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -277,7 +277,7 @@ public final class CharEffectList */ public int getBuffCount() { - return _actives != null ? (_buffCount.intValue() - _hiddenBuffs.get()) : 0; + return _actives != null ? (_buffCount.get() - _hiddenBuffs.get()) : 0; } /** @@ -287,7 +287,7 @@ public final class CharEffectList */ public int getDanceCount() { - return _danceCount.intValue(); + return _danceCount.get(); } /** @@ -297,7 +297,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return _triggerBuffCount.intValue(); + return _triggerBuffCount.get(); } /** @@ -307,7 +307,7 @@ public final class CharEffectList */ public int getToggleCount() { - return _toggleCount.intValue(); + return _toggleCount.get(); } /** @@ -317,7 +317,7 @@ public final class CharEffectList */ public int getDebuffCount() { - return _debuffCount.intValue(); + return _debuffCount.get(); } /** @@ -352,7 +352,7 @@ public final class CharEffectList */ public void stopAllToggles() { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { // Ignore necessary toggles. stopEffects(b -> b.getSkill().isToggle() && !b.getSkill().isNecessaryToggle() && !b.getSkill().isIrreplacableBuff(), true, true); @@ -361,7 +361,7 @@ public final class CharEffectList public void stopAllTogglesOfGroup(int toggleGroup) { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { stopEffects(b -> b.getSkill().isToggle() && (b.getSkill().getToggleGroupId() == toggleGroup), true, true); } @@ -508,7 +508,7 @@ public final class CharEffectList */ public void stopEffectsOnAction() { - if (_hasBuffsRemovedOnAnyAction.intValue() > 0) + if (_hasBuffsRemovedOnAnyAction.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnAnyActionExceptMove(), true, true); } @@ -516,7 +516,7 @@ public final class CharEffectList public void stopEffectsOnDamage() { - if (_hasBuffsRemovedOnDamage.intValue() > 0) + if (_hasBuffsRemovedOnDamage.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnDamage(), true, true); } @@ -535,16 +535,16 @@ public final class CharEffectList { case TRIGGER: { - return (getTriggeredBuffCount() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); + return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); } case DANCE: { - return (getDanceCount() > Config.DANCES_MAX_AMOUNT); + return (_danceCount.get() > Config.DANCES_MAX_AMOUNT); } // case TOGGLE: Do toggles have limit? case DEBUFF: { - return (getDebuffCount() > 24); + return (_debuffCount.get() > 24); } case BUFF: { @@ -1106,7 +1106,7 @@ public final class CharEffectList final Skill skill = info.getSkill(); // Handle hidden buffs. Check if there was such abnormal before so we can continue. - if ((getHiddenBuffsCount() > 0) && _stackedEffects.contains(skill.getAbnormalType())) + if ((_hiddenBuffs.get() > 0) && _stackedEffects.contains(skill.getAbnormalType())) { // If incoming buff isnt hidden, remove any hidden buffs with its abnormal type. if (info.isInUse()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 8de8a2fb0e..2265d6876c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -71,7 +71,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java index 9e5a0a9df5..8556a75cae 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java @@ -110,7 +110,7 @@ public class Fishing public synchronized void startFishing() { - if (isFishing()) + if (_isFishing) { return; } @@ -132,7 +132,7 @@ public class Fishing if (!canFish()) { - if (isFishing()) + if (_isFishing) { _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); } @@ -182,7 +182,7 @@ public class Fishing return; } - if (_player.isInCraftMode() || _player.isInStoreMode()) + if (_player.isCrafting() || _player.isInStoreMode()) { _player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -201,7 +201,7 @@ public class Fishing _baitLocation = calculateBaitLocation(); if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null)) { - if (isFishing()) + if (_isFishing) { // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -262,7 +262,7 @@ public class Fishing private void reelIn(FishingEndReason reason, boolean consumeBait) { - if (!isFishing()) + if (!_isFishing) { return; } @@ -326,7 +326,7 @@ public class Fishing public synchronized void stopFishing(FishingEndType endType) { - if (isFishing()) + if (_isFishing) { reelIn(FishingEndReason.STOP, false); _isFishing = false; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index ec834bcb34..c05e0915be 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -177,7 +177,7 @@ public final class L2ArmorSet public int getLowestSetEnchant(L2PcInstance player) { // Player don't have full set - if (getPiecesCount(player, L2ItemInstance::getId) < getMinimumPieces()) + if (getPiecesCount(player, L2ItemInstance::getId) < _minimumPieces) { return 0; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java index 46a329c1a0..091545ed6f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -170,7 +170,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); final ClanRewardBonus availableOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(this); if ((_lastMembersOnlineBonus == null) && (availableOnlineBonus != null)) @@ -242,7 +242,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -278,7 +278,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - LOGGER.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + _name + " without clan leader!"); return ""; } return _leader.getName(); @@ -570,7 +570,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -608,7 +608,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -628,7 +628,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -882,8 +882,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -926,8 +926,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -942,8 +942,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -978,15 +978,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1015,19 +1015,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1071,7 +1071,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1084,12 +1084,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1109,7 +1109,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1146,7 +1146,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1177,7 +1177,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1237,7 +1237,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1364,7 +1364,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1372,7 +1372,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1612,7 +1612,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1765,7 +1765,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1855,7 +1855,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); return null; @@ -1864,7 +1864,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1879,11 +1879,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1949,7 +1949,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1965,7 +1965,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2014,7 +2014,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2026,7 +2026,7 @@ public class L2Clan implements IIdentifiable, INamable LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } - for (L2ClanMember cm : getMembers()) + for (L2ClanMember cm : _members.values()) { if (cm.isOnline()) { @@ -2050,7 +2050,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2090,12 +2090,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2169,7 +2169,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2206,7 +2206,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2238,7 +2238,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2390,22 +2390,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2426,7 +2426,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2439,12 +2439,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2483,7 +2483,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2491,7 +2491,7 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; - switch (getLevel()) + switch (_level) { case 0: { @@ -2589,9 +2589,9 @@ public class L2Clan implements IIdentifiable, INamable case 5: { // Upgrade to 6 - if ((getReputationScore() >= Config.CLAN_LEVEL_6_COST) && (getMembersCount() >= Config.CLAN_LEVEL_6_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_6_COST) && (_members.size() >= Config.CLAN_LEVEL_6_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_6_COST); player.sendPacket(cr); @@ -2602,9 +2602,9 @@ public class L2Clan implements IIdentifiable, INamable case 6: { // Upgrade to 7 - if ((getReputationScore() >= Config.CLAN_LEVEL_7_COST) && (getMembersCount() >= Config.CLAN_LEVEL_7_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_7_COST) && (_members.size() >= Config.CLAN_LEVEL_7_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_7_COST); player.sendPacket(cr); @@ -2615,9 +2615,9 @@ public class L2Clan implements IIdentifiable, INamable case 7: { // Upgrade to 8 - if ((getReputationScore() >= Config.CLAN_LEVEL_8_COST) && (getMembersCount() >= Config.CLAN_LEVEL_8_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_8_COST) && (_members.size() >= Config.CLAN_LEVEL_8_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_8_COST); player.sendPacket(cr); @@ -2628,12 +2628,12 @@ public class L2Clan implements IIdentifiable, INamable case 8: { // Upgrade to 9 - if ((getReputationScore() >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (getMembersCount() >= Config.CLAN_LEVEL_9_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT)) { // itemId 9910 == Blood Oath if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_9_COST); player.sendPacket(cr); @@ -2649,12 +2649,12 @@ public class L2Clan implements IIdentifiable, INamable case 9: { // Upgrade to 10 - if ((getReputationScore() >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (getMembersCount() >= Config.CLAN_LEVEL_10_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (_members.size() >= Config.CLAN_LEVEL_10_REQUIREMENT)) { // itemId 9911 == Blood Alliance if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_10_COST); player.sendPacket(cr); @@ -2670,9 +2670,9 @@ public class L2Clan implements IIdentifiable, INamable case 10: { // Upgrade to 11 - if ((getReputationScore() >= Config.CLAN_LEVEL_11_COST) && (getMembersCount() >= Config.CLAN_LEVEL_11_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_11_COST) && (_members.size() >= Config.CLAN_LEVEL_11_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_11_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_11_COST); player.sendPacket(cr); @@ -2699,7 +2699,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendItemList(false); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2712,7 +2712,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2722,9 +2722,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2747,7 +2747,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2758,12 +2758,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2780,15 +2780,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2830,7 +2830,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2841,12 +2841,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -3116,7 +3116,7 @@ public class L2Clan implements IIdentifiable, INamable getVariables().set("PREVIOUS_HUNTING_POINTS", getHuntingPoints()); // Reset - getMembers().forEach(L2ClanMember::resetBonus); + _members.values().forEach(L2ClanMember::resetBonus); getVariables().remove("HUNTING_POINTS"); // force store @@ -3134,7 +3134,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_vars == null) { - _vars = new ClanVariables(getId()); + _vars = new ClanVariables(_clanId); if (Config.CLAN_VARIABLES_STORE_INTERVAL > 0) { ThreadPool.scheduleAtFixedRate(this::storeVariables, Config.CLAN_VARIABLES_STORE_INTERVAL, Config.CLAN_VARIABLES_STORE_INTERVAL); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ClanMember.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ClanMember.java index 139c302ce9..1ae5225355 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ClanMember.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ClanMember.java @@ -855,7 +855,6 @@ public class L2ClanMember private PlayerVariables getVariables() { - final L2PcInstance player = getPlayerInstance(); - return player != null ? player.getVariables() : new PlayerVariables(_objectId); + return _player != null ? _player.getVariables() : new PlayerVariables(_objectId); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index d91e7e0554..df5da1b8ba 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Crest.java index dc3c3497a3..24eedf1679 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,42 +94,41 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - final byte[] data = getData(); - if (data != null) + if (_data != null) { for (int i = 0; i <= 4; i++) { if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); - activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); + System.arraycopy(_data, (14336 * i), fullChunk, 0, 14336); + activeChar.sendPacket(new ExPledgeEmblem(_id, fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); - activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); + System.arraycopy(_data, (14336 * i), lastChunk, 0, 8320); + activeChar.sendPacket(new ExPledgeEmblem(_id, lastChunk, 0, i)); } } } - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java index a1eb3d2480..5c086b9d83 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -52,7 +52,7 @@ public class L2Mentee try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT char_name, level, base_class FROM characters WHERE charId = ?")) { - statement.setInt(1, getObjectId()); + statement.setInt(1, _objectId); try (ResultSet rset = statement.executeQuery()) { if (rset.next()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java index 171ad1e543..70a2a9e6e2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java @@ -148,15 +148,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -180,7 +175,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -242,7 +237,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -632,7 +627,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get()); } /** @@ -680,13 +675,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -781,7 +775,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -806,7 +800,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -880,19 +874,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -904,6 +897,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java index 9636853228..d01a52009e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java @@ -168,7 +168,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -195,7 +195,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -260,7 +260,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -279,7 +279,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -294,7 +294,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -305,14 +305,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if (pMember != null) { @@ -333,7 +333,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -357,7 +357,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -439,7 +439,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(target, tacticalSignId)); m.sendPacket(sm); @@ -450,7 +450,7 @@ public class L2Party extends AbstractPlayerGroup // Sign already assigned // If the sign is applied on the same target, remove it _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); + _members.forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); } else { @@ -462,7 +462,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); @@ -502,19 +502,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isInDuel()) @@ -573,25 +573,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(ExCloseMPCC.STATIC_PACKET); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -653,7 +653,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -663,9 +663,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -800,7 +800,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -930,11 +930,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2SiegeClan.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2SiegeClan.java index 2ba2a8a219..57266247c3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2SiegeClan.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2SiegeClan.java @@ -53,12 +53,12 @@ public class L2SiegeClan flag.deleteMe(); - return getFlag().remove(flag); + return _flags.remove(flag); } public void removeFlags() { - for (L2Npc flag : getFlag()) + for (L2Npc flag : _flags) { removeFlag(flag); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java index 1b7cb26b50..f36fed74eb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -511,7 +511,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocz = loc.getZ(); setLocation(loc); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -519,9 +519,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -539,16 +539,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } // Set custom Npc server side name and title @@ -670,7 +670,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } public final boolean getRandomWalking() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 97608b326d..4a88a92311 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java index 4b5e290517..3794527a37 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Location.java @@ -190,6 +190,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java index 4eb38cf27b..ef36048457 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -136,16 +136,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -200,12 +200,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + int choice = Rnd.nextInt(getMobs().size()); for (L2ControllableMobInstance mob : getMobs()) { if (--choice == 0) @@ -220,7 +220,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroupTable.java index da1b620a40..121e34e9c4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Petition.java index cbed80441a..ff4816d7ef 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TempItem.java index fa918cfc55..db4b2f817f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TempItem.java @@ -28,7 +28,7 @@ public final class TempItem { private final int _itemId; private int _quantity; - private final int _referencePrice; + private final long _referencePrice; private final String _itemName; /** @@ -60,7 +60,7 @@ public final class TempItem _quantity = quantity; } - public int getReferencePrice() + public long getReferencePrice() { return _referencePrice; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java index 197f137df5..7d0fa18073 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/TradeList.java @@ -195,7 +195,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -209,13 +209,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -265,7 +265,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -312,7 +312,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -607,15 +607,15 @@ public class TradeList boolean success = false; // check weight and slots - if (!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()) || !partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())) + if ((!_owner.getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if (!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())) || !partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))) + else if ((!_owner.getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -624,7 +624,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -649,7 +649,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -705,7 +705,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 5a9fc58f63..2787a91e5f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -208,7 +208,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -239,7 +239,7 @@ public class L2Attackable extends L2Npc addDamage(attacker, (int) value, skill); // Check Raidboss attack. Character will be petrified if attacking a raid that's more than 8 levels lower. In retail you deal damage to raid before curse. - if (isRaid() && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) + if (_isRaid && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) { if (attacker.getLevel() > (getLevel() + 8)) { @@ -386,7 +386,7 @@ public class L2Attackable extends L2Npc } // Calculate raidboss points - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final L2PcInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer(); broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); @@ -480,7 +480,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -489,8 +489,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -515,7 +515,7 @@ public class L2Attackable extends L2Npc } clan.addHuntingPoints(attacker, this, finalExp); } - attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, isRaid()), true, false); + attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp); } } @@ -592,7 +592,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -603,8 +603,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -984,7 +984,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1036,7 +1036,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); sm.addString(getName()); @@ -1048,7 +1048,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) + if (Config.CHAMPION_ENABLE && _champion && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY); final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty); @@ -1230,7 +1230,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() != _spoilerObjectId) && !sweeper.isInLooterParty(_spoilerObjectId)) { if (sendMessage) { @@ -1384,7 +1384,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1458,7 +1458,7 @@ public class L2Attackable extends L2Npc if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (isMonster() && !getTemplate().isUndying() && !_isRaid && !_isRaidMinion && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -1683,7 +1683,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b8662c6e57..a5d7f51aa7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -499,13 +499,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public double getCollisionRadius() { - final double defaultCollisionRadius = getTemplate().getCollisionRadius(); + final double defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } public double getCollisionHeight() { - final double defaultCollisionHeight = getTemplate().getCollisionHeight(); + final double defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -530,7 +530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -550,9 +550,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Stop on creature see task and clear the data @@ -584,7 +584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -649,8 +649,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -703,8 +703,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // HP - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); - su.addUpdate(StatusUpdateType.CUR_HP, (int) getCurrentHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); + su.addUpdate(StatusUpdateType.CUR_HP, (int) _status.getCurrentHp()); // MP computeStatusUpdate(su, StatusUpdateType.MAX_MP); @@ -1053,7 +1053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe mpConsume = weaponItem.getReducedMpConsume(); } mpConsume = isAffected(EffectFlag.CHEAPSHOT) ? 0 : mpConsume; - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1065,7 +1065,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } } } @@ -1073,7 +1073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final WeaponType attackType = getAttackType(); final boolean isTwoHanded = (weaponItem != null) && (weaponItem.getBodyPart() == L2Item.SLOT_LR_HAND); - final int timeAtk = Formulas.calculateTimeBetweenAttacks(getPAtkSpd()); + final int timeAtk = Formulas.calculateTimeBetweenAttacks(_stat.getPAtkSpd()); final int timeToHit = Formulas.calculateTimeToHit(timeAtk, weaponType, isTwoHanded, false); _attackEndTime = System.nanoTime() + (TimeUnit.MILLISECONDS.toNanos(timeAtk)); @@ -1196,12 +1196,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackCountMax = (int) getStat().getValue(Stats.ATTACK_COUNT_MAX, 1); - if ((attackCountMax > 1) && !(getStat().getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) + int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1); + if ((attackCountMax > 1) && !(_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) { final double headingAngle = Util.convertHeadingToDegree(getHeading()); - final int maxRadius = getStat().getPhysicalAttackRadius(); - final int physicalAttackAngle = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRadius(); + final int physicalAttackAngle = _stat.getPhysicalAttackAngle(); for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius)) { // Skip main target. @@ -1251,7 +1251,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss) { shld = Formulas.calcShldUse(this, target); - crit = Formulas.calcCrit(getStat().getCriticalHit(), this, target, null); + crit = Formulas.calcCrit(_stat.getCriticalHit(), this, target, null); damage = (int) Formulas.calcAutoAttackDamage(this, target, shld, crit, shotConsumed); if (halfDamage) { @@ -1294,7 +1294,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Try casting the skill - final SkillCaster skillCaster = SkillCaster.castSkill(this, getTarget(), skill, item, castingType, ctrlPressed, shiftPressed); + final SkillCaster skillCaster = SkillCaster.castSkill(this, _target, skill, item, castingType, ctrlPressed, shiftPressed); if ((skillCaster == null) && isPlayer()) { // Skill casting failed, notify player. @@ -1612,7 +1612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); if (isMonster()) { @@ -1676,9 +1676,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Remove all effects, do not broadcast changes. @@ -1696,26 +1696,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -1855,7 +1855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; } public final boolean isConfused() @@ -1915,7 +1915,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return hasBlockActions() || isRooted() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting(); + return hasBlockActions() || isRooted() || _isOverloaded || _isImmobilized || isAlikeDead() || _isTeleporting; } public final boolean isOverloaded() @@ -1934,7 +1934,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2023,7 +2023,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2048,7 +2048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2379,7 +2379,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.STUN); + _effectList.stopEffects(AbnormalType.STUN); } if (!isPlayer()) @@ -2402,11 +2402,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.TRANSFORM); - getEffectList().stopEffects(AbnormalType.CHANGEBODY); + _effectList.stopEffects(AbnormalType.TRANSFORM); + _effectList.stopEffects(AbnormalType.CHANGEBODY); } - if (isTransformed()) + if (_transform.isPresent()) { untransform(); } @@ -2517,7 +2517,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet. - if (isMoving() && (getMoveSpeed() <= 0)) + if (isMoving() && (_stat.getMoveSpeed() <= 0)) { stopMove(null); } @@ -2585,7 +2585,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxCp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp()); } break; } @@ -2597,7 +2597,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); } break; } @@ -2609,7 +2609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxMp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp()); } break; } @@ -2682,7 +2682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2924,7 +2924,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided @@ -2940,7 +2940,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -3147,7 +3147,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -3174,7 +3174,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -3252,7 +3252,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -3381,7 +3381,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -3428,7 +3428,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -3623,7 +3623,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void onHitTimeNotDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3652,7 +3652,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onFirstHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime, int delayForSecondAttack) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3682,7 +3682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onSecondHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime1, int hitTime2, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3970,10 +3970,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Stop all effects of that skill if (oldSkill.isPassive()) { - getEffectList().stopSkillEffects(true, oldSkill); + _effectList.stopSkillEffects(true, oldSkill); } - getStat().recalculateStats(true); + _stat.recalculateStats(true); } if (newSkill.isPassive()) @@ -4008,7 +4008,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) { stopSkillEffects(true, oldSkill.getId()); - getStat().recalculateStats(true); + _stat.recalculateStats(true); } } @@ -4105,7 +4105,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - final int random = (int) getStat().getValue(Stats.RANDOM_DAMAGE); + final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE); return (1 + ((double) Rnd.get(-random, random) / 100)); } @@ -4127,193 +4127,193 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public int getMagicAccuracy() { - return getStat().getMagicAccuracy(); + return _stat.getMagicAccuracy(); } public int getMagicEvasionRate() { - return getStat().getMagicEvasionRate(); + return _stat.getMagicEvasionRate(); } public final double getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(int init) { - return getStat().getCriticalDmg(init); + return _stat.getCriticalDmg(init); } public int getCriticalHit() { - return getStat().getCriticalHit(); + return _stat.getCriticalHit(); } public int getEvasionRate() { - return getStat().getEvasionRate(); + return _stat.getEvasionRate(); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public int getMAtk() { - return getStat().getMAtk(); + return _stat.getMAtk(); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit() { - return getStat().getMCriticalHit(); + return _stat.getMCriticalHit(); } public int getMDef() { - return getStat().getMDef(); + return _stat.getMDef(); } public int getPAtk() { - return getStat().getPAtk(); + return _stat.getPAtk(); } public int getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public int getPDef() { - return getStat().getPDef(); + return _stat.getPDef(); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } public int getLUC() { - return getStat().getLUC(); + return _stat.getLUC(); } public int getCHA() { - return getStat().getCHA(); + return _stat.getCHA(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) @@ -4338,7 +4338,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // RearDamage effect bonus. if (isBehind(target)) { - damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1); } // Counterattacks happen before damage received. @@ -4383,27 +4383,27 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Absorb HP from the damage inflicted double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1); - if ((absorbPercent > 0) && (Rnd.nextDouble() < getStat().getValue(Stats.ABSORB_DAMAGE_CHANCE))) + if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE))) { - int absorbDamage = (int) Math.min(absorbPercent * damage, getMaxRecoverableHp() - getCurrentHp()); + int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp()); if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted. Unconfirmed for skill attacks. if (skill == null) { - absorbPercent = getStat().getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); + absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); if (absorbPercent > 0) { - int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, getMaxRecoverableMp() - getCurrentMp()); + int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp()); if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } } @@ -4448,7 +4448,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - final double damageCap = getStat().getValue(Stats.DAMAGE_LIMIT); + final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT); if (damageCap > 0) { value = Math.min(value, damageCap); @@ -4459,17 +4459,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + getStat().getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; } else { - value *= (100 + getStat().getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; } } if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } else if (isPlayer()) { @@ -4477,7 +4477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } if (attacker != null) @@ -4488,83 +4488,83 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final int getCurrentCpPercent() { - return (int) ((getCurrentCp() * 100) / getMaxCp()); + return (int) ((_status.getCurrentCp() * 100) / _stat.getMaxCp()); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final void setCurrentCp(double newCp, boolean broadcast) { - getStatus().setCurrentCp(newCp, broadcast); + _status.setCurrentCp(newCp, broadcast); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final int getCurrentHpPercent() { - return (int) ((getCurrentHp() * 100) / getMaxHp()); + return (int) ((_status.getCurrentHp() * 100) / _stat.getMaxHp()); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHp(double newHp, boolean broadcast) { - getStatus().setCurrentHp(newHp, broadcast); + _status.setCurrentHp(newHp, broadcast); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final int getCurrentMpPercent() { - return (int) ((getCurrentMp() * 100) / getMaxMp()); + return (int) ((_status.getCurrentMp() * 100) / _stat.getMaxMp()); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } public final void setCurrentMp(double newMp, boolean broadcast) { - getStatus().setCurrentMp(newMp, false); + _status.setCurrentMp(newMp, false); } /** @@ -4577,7 +4577,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); - return (int) getStat().getValue(Stats.WEIGHT_LIMIT, baseLoad); + return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad); } return 0; } @@ -4586,7 +4586,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (isPlayer() || isPet()) { - return (int) getStat().getValue(Stats.WEIGHT_PENALTY, 1); + return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1); } return 0; } @@ -4623,17 +4623,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public AttributeType getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(AttributeType attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(AttributeType defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -4852,8 +4852,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return weapon.getItemType(); } - final WeaponType defaultWeaponType = getTemplate().getBaseAttackType(); - return getTransformation().map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); + final WeaponType defaultWeaponType = _template.getBaseAttackType(); + return _transform.map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); } public final boolean isInCategory(CategoryType type) @@ -5001,7 +5001,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).collect(Collectors.toList()); + return _skillCasters.values().stream().filter(filter).collect(Collectors.toList()); } @SafeVarargs @@ -5012,7 +5012,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).findAny().orElse(null); + return _skillCasters.values().stream().filter(filter).findAny().orElse(null); } /** @@ -5098,7 +5098,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -5128,7 +5128,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override @@ -5200,7 +5200,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean hasAbnormalType(AbnormalType abnormalType) { - return getEffectList().hasAbnormalType(abnormalType); + return _effectList.hasAbnormalType(abnormalType); } public void addBlockActionsAllowedSkill(int skillId) @@ -5267,11 +5267,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public MoveType getMoveType() { - if (isMoving() && isRunning()) + if (isMoving() && _isRunning) { return MoveType.RUNNING; } - else if (isMoving() && !isRunning()) + else if (isMoving() && !_isRunning) { return MoveType.WALKING; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 71cc537769..433cfdd815 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -372,7 +372,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -514,7 +514,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -745,7 +745,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -925,7 +925,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getReputation() >= 0)) @@ -999,10 +999,9 @@ public class L2Npc extends L2Character DecayTaskManager.getInstance().add(this); - final L2Spawn spawn = getSpawn(); - if (spawn != null) + if (_spawn != null) { - final NpcSpawnTemplate npcTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcTemplate = _spawn.getNpcSpawnTemplate(); if (npcTemplate != null) { npcTemplate.notifyNpcDeath(this, killer); @@ -1140,7 +1139,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1228,7 +1227,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1299,7 +1298,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1318,7 +1317,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1394,7 +1393,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic, boolean fish) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1474,7 +1473,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** @@ -1784,10 +1783,9 @@ public class L2Npc extends L2Character return _params; } - final L2Spawn spawn = getSpawn(); - if (spawn != null) // Minions doesn't have L2Spawn object bound + if (_spawn != null) // Minions doesn't have L2Spawn object bound { - final NpcSpawnTemplate npcSpawnTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { final StatsSet params = getTemplate().getParameters(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index a103c9edc4..983a499cad 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -118,15 +118,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -196,7 +196,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if (player == getOwner()) + if (player == _owner) { player.sendPacket(new PetInfo(this, 1)); return; @@ -242,19 +242,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getReputation() { - return getOwner() != null ? getOwner().getReputation() : 0; + return _owner != null ? _owner.getReputation() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -313,8 +313,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -326,7 +325,7 @@ public abstract class L2Summon extends L2Playable final AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -392,7 +391,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); } @@ -434,12 +433,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } @@ -477,7 +476,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -546,7 +545,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, L2ItemInstance item, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -654,7 +653,7 @@ public abstract class L2Summon extends L2Playable if (skill.isBad()) { // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; @@ -673,7 +672,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -695,13 +694,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (crit) { @@ -715,14 +714,14 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } final SystemMessage sm; - if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF))) + if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF))) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } @@ -744,7 +743,7 @@ public abstract class L2Summon extends L2Playable { super.reduceCurrentHp(damage, attacker, skill); - if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) + if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -757,14 +756,13 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); - if ((skill.getTarget(this, false, false, false) == null) && !actingPlayer.getAccessLevel().allowPeaceAttack()) + if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance - actingPlayer.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + _owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // Send a Server->Client packet ActionFailed to the L2PcInstance - actingPlayer.sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -774,18 +772,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -796,10 +794,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } } @@ -807,7 +805,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -842,7 +840,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, isDead() ? 0 : 1)); if (isPet()) @@ -870,7 +868,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -904,7 +902,7 @@ public abstract class L2Summon extends L2Playable */ public void doAttack(L2Object target) { - if (getOwner() != null) + if (_owner != null) { if (target != null) { @@ -912,7 +910,7 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -926,12 +924,12 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(L2Object target, boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - if ((target == null) || (this == target) || (getOwner() == target)) + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -940,7 +938,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -960,28 +958,28 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -994,7 +992,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1014,18 +1012,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1041,14 +1039,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1059,7 +1057,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1071,14 +1069,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1086,13 +1084,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() @@ -1144,7 +1142,7 @@ public abstract class L2Summon extends L2Playable public void sendInventoryUpdate(InventoryUpdate iu) { - final L2PcInstance owner = getOwner(); + final L2PcInstance owner = _owner; if (owner != null) { owner.sendInventoryUpdate(iu); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index fe1f4c81cf..a03a262e08 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -74,7 +74,7 @@ public class PcAppearance { if (_visibleName == null) { - return getOwner().getName(); + return _owner.getName(); } return _visibleName; } @@ -94,7 +94,7 @@ public class PcAppearance { if (_visibleTitle == null) { - return getOwner().getTitle(); + return _owner.getTitle(); } return _visibleTitle; } @@ -220,27 +220,27 @@ public class PcAppearance public int getVisibleClanId() { - return _visibleClanId != -1 ? _visibleClanId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanId(); + return _visibleClanId != -1 ? _visibleClanId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanId(); } public int getVisibleClanCrestId() { - return _visibleClanCrestId != -1 ? _visibleClanCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestId(); + return _visibleClanCrestId != -1 ? _visibleClanCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestId(); } public int getVisibleClanLargeCrestId() { - return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestLargeId(); + return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestLargeId(); } public int getVisibleAllyId() { - return _visibleAllyId != -1 ? _visibleAllyId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyId(); + return _visibleAllyId != -1 ? _visibleAllyId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyId(); } public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 91548e2a10..7aae137ada 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -53,7 +53,7 @@ public class L2DecoyInstance extends L2Character _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; final int skilllevel = getTemplate().getDisplayId() - 13070; - _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); + _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -269,18 +269,18 @@ public class L2DecoyInstance extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index baab09b858..d82f30b44d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class L2DoorInstance extends L2Character { - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isInverted = false; private int _meshindex = 1; @@ -293,7 +293,7 @@ public final class L2DoorInstance extends L2Character { return false; } - else if (getIsAttackableDoor()) + else if (_isAttackableDoor) { return true; } @@ -369,13 +369,13 @@ public final class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - oe = new OnEventTrigger(getEmitter(), !isOpen()); + oe = new OnEventTrigger(getEmitter(), !_open); } else { - oe = new OnEventTrigger(getEmitter(), isOpen()); + oe = new OnEventTrigger(getEmitter(), _open); } } @@ -592,13 +592,13 @@ public final class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), !isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), !_open)); } else { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), _open)); } } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -649,7 +649,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -661,8 +661,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -671,7 +670,7 @@ public final class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 35cb265650..53df3b876a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -75,7 +75,7 @@ public class L2MonsterInstance extends L2Attackable } // Check if the L2MonsterInstance target is aggressive - if (Config.GUARD_ATTACK_AGGRO_MOB && isAggressive() && (attacker instanceof L2GuardInstance)) + if (Config.GUARD_ATTACK_AGGRO_MOB && getTemplate().isAggressive() && (attacker instanceof L2GuardInstance)) { return true; } @@ -108,11 +108,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -173,9 +173,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -229,7 +229,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -238,7 +238,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 7ee4977126..26b83a3a41 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -508,7 +508,7 @@ public final class L2PcInstance extends L2Playable private AdminTeleportType _teleportType = AdminTeleportType.NORMAL; private boolean _inCrystallize; - private boolean _inCraftMode; + private boolean _isCrafting; private long _offlineShopStart = 0; @@ -914,7 +914,7 @@ public final class L2PcInstance extends L2Playable public String getAccountName() { - return _client == null ? getAccountNamePlayer() : _client.getAccountName(); + return _client == null ? _accountName : _client.getAccountName(); } public String getAccountNamePlayer() @@ -931,7 +931,7 @@ public final class L2PcInstance extends L2Playable { int result = 0; - if (getClan() != null) + if (_clan != null) { result |= RelationChanged.RELATION_CLAN_MEMBER; if (getClan() == target.getClan()) @@ -950,9 +950,9 @@ public final class L2PcInstance extends L2Playable if ((getParty() != null) && (getParty() == target.getParty())) { result |= RelationChanged.RELATION_HAS_PARTY; - for (int i = 0; i < getParty().getMembers().size(); i++) + for (int i = 0; i < _party.getMembers().size(); i++) { - if (getParty().getMembers().get(i) != this) + if (_party.getMembers().get(i) != this) { continue; } @@ -1006,7 +1006,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getSiegeState() != 0) + if (_siegeState != 0) { result |= RelationChanged.RELATION_INSIEGE; if (getSiegeState() != target.getSiegeState()) @@ -1017,7 +1017,7 @@ public final class L2PcInstance extends L2Playable { result |= RelationChanged.RELATION_ALLY; } - if (getSiegeState() == 1) + if (_siegeState == 1) { result |= RelationChanged.RELATION_ATTACKER; } @@ -1033,7 +1033,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getBlockCheckerArena() != -1) + if (_handysBlockCheckerEventArena != -1) { result |= RelationChanged.RELATION_INSIEGE; final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); @@ -1233,17 +1233,17 @@ public final class L2PcInstance extends L2Playable public boolean isInStoreMode() { - return getPrivateStoreType() != PrivateStoreType.NONE; + return _privateStoreType != PrivateStoreType.NONE; } - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** @@ -1320,7 +1320,7 @@ public final class L2PcInstance extends L2Playable LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) { @@ -1453,13 +1453,13 @@ public final class L2PcInstance extends L2Playable return; } - final L2Npc target = getLastFolkNPC(); + final L2Npc target = _lastFolkNpc; if ((target != null) && isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false)) { quest.notifyEvent(event, target, this); } - else if (getLastQuestNpcObject() > 0) + else if (_questNpcObject > 0) { final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); @@ -1660,7 +1660,7 @@ public final class L2PcInstance extends L2Playable @Override public void updatePvPFlag(int value) { - if (getPvpFlag() == value) + if (_pvpFlag == value) { return; } @@ -1678,7 +1678,7 @@ public final class L2PcInstance extends L2Playable if (hasSummon()) { final RelationChanged rc = new RelationChanged(); - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, getRelation(this), false); @@ -1705,7 +1705,7 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, relation, isAutoAttackable(player)); @@ -2112,7 +2112,7 @@ public final class L2PcInstance extends L2Playable weaponPenalty = weaponPenalty - expertiseLevel - bonus; weaponPenalty = Math.min(Math.max(weaponPenalty, 0), 4); - if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) + if ((_expertiseWeaponPenalty != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) { _expertiseWeaponPenalty = weaponPenalty; if (_expertiseWeaponPenalty > 0) @@ -2130,7 +2130,7 @@ public final class L2PcInstance extends L2Playable armorPenalty = armorPenalty - expertiseLevel - bonus; armorPenalty = Math.min(Math.max(armorPenalty, 0), 4); - if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) + if ((_expertiseArmorPenalty != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) { _expertiseArmorPenalty = armorPenalty; if (_expertiseArmorPenalty > 0) @@ -2173,20 +2173,20 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - final int slot = getInventory().getSlotFromItem(item); + final int slot = _inventory.getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { - items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + items = _inventory.unEquipItemInSlotAndRecord(item.getLocationSlot()); } else { - items = getInventory().unEquipItemInBodySlotAndRecord(slot); + items = _inventory.unEquipItemInBodySlotAndRecord(slot); } } else { - items = getInventory().equipItemAndRecord(item); + items = _inventory.equipItemAndRecord(item); if (item.isEquipped()) { @@ -2298,7 +2298,7 @@ public final class L2PcInstance extends L2Playable */ public void increaseRaidbossPoints(int increasePoints) { - setRaidbossPoints(getRaidbossPoints() + increasePoints); + setRaidbossPoints(_raidbossPoints + increasePoints); } /** @@ -2324,17 +2324,17 @@ public final class L2PcInstance extends L2Playable { if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.THIRD)) { - if (getLvlJoinedAcademy() <= 16) + if (_lvlJoinedAcademy <= 16) { _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); } - else if (getLvlJoinedAcademy() >= 39) + else if (_lvlJoinedAcademy >= 39) { _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -2346,7 +2346,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES); // receive graduation gift - getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet + _inventory.addItem("Gift", 8181, 1, this, null); // give academy circlet } if (isSubClassActive()) { @@ -2367,12 +2367,12 @@ public final class L2PcInstance extends L2Playable // Update class icon in party and clan if (isInParty()) { - getParty().broadcastPacket(new PartySmallWindowUpdate(this, true)); + _party.broadcastPacket(new PartySmallWindowUpdate(this, true)); } - if (getClan() != null) + if (_clan != null) { - getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); + _clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); } sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED)); @@ -2521,33 +2521,32 @@ public final class L2PcInstance extends L2Playable } // Add Hero skills if hero - if (isHero()) + if (_hero) { setHero(true); } // Add clan skills - if (getClan() != null) + if (_clan != null) { - final L2Clan clan = getClan(); - clan.addSkillEffects(this); + _clan.addSkillEffects(this); - if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) + if ((_clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) { SiegeManager.getInstance().addSiegeSkills(this); } - if (getClan().getCastleId() > 0) + if (_clan.getCastleId() > 0) { CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this); } - if (getClan().getFortId() > 0) + if (_clan.getFortId() > 0) { FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this); } } // Reload passive skills from armors / jewels / weapons - getInventory().reloadEquippedItems(); + _inventory.reloadEquippedItems(); } /** @@ -2700,13 +2699,12 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info - if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) + if ((_clan != null) && (_clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -2844,7 +2842,7 @@ public final class L2PcInstance extends L2Playable */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().isSitForced()) + if (L2Event.isParticipant(this) && eventStatus.isSitForced()) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -2998,7 +2996,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAdena()) + if (count > _inventory.getAdena()) { if (sendMessage) { @@ -3048,7 +3046,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceBeautyTickets(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getBeautyTickets()) + if (count > _inventory.getBeautyTickets()) { if (sendMessage) { @@ -3142,7 +3140,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAncientAdena()) + if (count > _inventory.getAncientAdena()) { if (sendMessage) { @@ -3548,7 +3546,7 @@ public final class L2PcInstance extends L2Playable { return null; } - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3632,7 +3630,7 @@ public final class L2PcInstance extends L2Playable */ public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) { - final PcInventory inv = getInventory(); + final PcInventory inv = _inventory; if (!inv.validateCapacityByItemId(rewardId, count)) { if (sendMessage) @@ -3834,7 +3832,7 @@ public final class L2PcInstance extends L2Playable return null; } - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -3855,8 +3853,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return null; } @@ -4060,10 +4057,8 @@ public final class L2PcInstance extends L2Playable final boolean needHpUpdate = needHpUpdate(); final boolean needMpUpdate = needMpUpdate(); - final L2Party party = getParty(); - // Check if a party is in progress and party window update is usefull - if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) + if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) { final PartySmallWindowUpdate partyWindow = new PartySmallWindowUpdate(this, false); if (needCpUpdate) @@ -4081,10 +4076,10 @@ public final class L2PcInstance extends L2Playable partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP); partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP); } - party.broadcastToPartyMembers(this, partyWindow); + _party.broadcastToPartyMembers(this, partyWindow); } - if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) + if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) { final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); if ((game != null) && game.isBattleStarted()) @@ -4094,7 +4089,7 @@ public final class L2PcInstance extends L2Playable } // In duel MP updated only with CP or HP - if (isInDuel() && (needCpUpdate || needHpUpdate)) + if (_isInDuel && (needCpUpdate || needHpUpdate)) { DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this)); } @@ -4181,10 +4176,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4222,10 +4216,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4254,15 +4247,15 @@ public final class L2PcInstance extends L2Playable public int getAllyCrestId() { - if (getClanId() == 0) + if (_clanId == 0) { return 0; } - if (getClan().getAllyId() == 0) + if (_clan.getAllyId() == 0) { return 0; } - return getClan().getAllyCrestId(); + return _clan.getAllyCrestId(); } /** @@ -4301,22 +4294,21 @@ public final class L2PcInstance extends L2Playable { if (target instanceof L2PcInstance) { - final L2PcInstance temp = (L2PcInstance) target; + final L2PcInstance targetPlayer = (L2PcInstance) target; sendPacket(ActionFailed.STATIC_PACKET); - if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) + if ((targetPlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (targetPlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) { - sendPacket(new PrivateStoreListSell(this, temp)); + sendPacket(new PrivateStoreListSell(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.BUY) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.BUY) { - sendPacket(new PrivateStoreListBuy(this, temp)); + sendPacket(new PrivateStoreListBuy(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) { - sendPacket(new RecipeShopSellList(this, temp)); + sendPacket(new RecipeShopSellList(this, targetPlayer)); } - } else if (target != null) // _interactTarget=null should never happen but one never knows ^^; { @@ -4341,7 +4333,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) { - getParty().distributeItem(this, itemId, itemCount, false, target); + _party.distributeItem(this, itemId, itemCount, false, target); } else if (itemId == Inventory.ADENA_ID) { @@ -4421,7 +4413,7 @@ public final class L2PcInstance extends L2Playable return; } - if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) + if (((isInParty() && (_party.getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -4530,9 +4522,9 @@ public final class L2PcInstance extends L2Playable // Check if a Party is in progress if (isInParty()) { - getParty().distributeItem(this, target); + _party.distributeItem(this, target); } - else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) + else if ((target.getId() == Inventory.ADENA_ID) && (_inventory.getAdenaInstance() != null)) { addAdena("Pickup", target.getCount(), null, true); ItemTable.getInstance().destroyItem("Pickup", target, this, null); @@ -4541,7 +4533,7 @@ public final class L2PcInstance extends L2Playable { addItem("Pickup", target, null, true); // Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts. - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { final L2EtcItem etcItem = target.getEtcItem(); @@ -4590,13 +4582,13 @@ public final class L2PcInstance extends L2Playable } } - return !isSellingBuffs() && !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); + return !_isSellingBuffs && !isAlikeDead() && !_inOlympiadMode && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); } @Override public int getMinShopDistance() { - return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return _waitTypeSitting ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4604,13 +4596,13 @@ public final class L2PcInstance extends L2Playable // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death) if (canOpenPrivateStore()) { - if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) + if ((_privateStoreType == PrivateStoreType.BUY) || (_privateStoreType == PrivateStoreType.BUY_MANAGE)) { setPrivateStoreType(PrivateStoreType.NONE); } - if (getPrivateStoreType() == PrivateStoreType.NONE) + if (_privateStoreType == PrivateStoreType.NONE) { - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -4652,7 +4644,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -4737,7 +4729,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getActiveWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); } /** @@ -4749,7 +4741,7 @@ public final class L2PcInstance extends L2Playable final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { - return getFistsWeaponItem(); + return _fistsWeaponItem; } return (L2Weapon) weapon.getItem(); @@ -4757,12 +4749,12 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance getChestArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); } public L2ItemInstance getLegsArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LEGS); } public L2Armor getActiveChestArmorItem() @@ -4803,7 +4795,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) { return true; } @@ -4825,7 +4817,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) { return true; } @@ -4847,7 +4839,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) { return true; } @@ -4861,7 +4853,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getSecondaryWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); } /** @@ -4871,7 +4863,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -4911,12 +4903,12 @@ public final class L2PcInstance extends L2Playable !(Config.DISABLE_REWARDS_IN_PVP_ZONES && isInsideZone(ZoneId.PVP))) { // pvp - if (Config.REWARD_PVP_ITEM && (getPvpFlag() != 0)) + if (Config.REWARD_PVP_ITEM && (_pvpFlag != 0)) { pk.addItem("PvP Item Reward", Config.REWARD_PVP_ITEM_ID, Config.REWARD_PVP_ITEM_AMOUNT, this, Config.REWARD_PVP_ITEM_MESSAGE); } // pk - if (Config.REWARD_PK_ITEM && (getPvpFlag() == 0)) + if (Config.REWARD_PK_ITEM && (_pvpFlag == 0)) { pk.addItem("PK Item Reward", Config.REWARD_PK_ITEM_ID, Config.REWARD_PK_ITEM_AMOUNT, this, Config.REWARD_PK_ITEM_MESSAGE); } @@ -4927,7 +4919,7 @@ public final class L2PcInstance extends L2Playable if (Config.ANNOUNCE_PK_PVP && (((pk != null) && !pk.isGM()) || fpcKill)) { String msg = ""; - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4941,7 +4933,7 @@ public final class L2PcInstance extends L2Playable Broadcast.toAllOnlinePlayers(msg, false); } } - else if (getPvpFlag() != 0) + else if (_pvpFlag != 0) { msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4957,7 +4949,7 @@ public final class L2PcInstance extends L2Playable } } - if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (getPvpFlag() == 0) && (getReputation() >= 0)) + if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (_pvpFlag == 0) && (getReputation() >= 0)) { killer.setReputation(killer.getReputation() - 150); } @@ -4967,6 +4959,9 @@ public final class L2PcInstance extends L2Playable // Clear resurrect xp calculation setExpBeforeDeath(0); + // Calculate Shilen's Breath debuff level. It must happen right before death, because buffs aren't applied on dead characters. + calculateShilensBreathDebuffLevel(killer); + // Kill the L2PcInstance if (!super.doDie(killer)) { @@ -4978,7 +4973,7 @@ public final class L2PcInstance extends L2Playable { CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer); } - else if (isCombatFlagEquipped()) + else if (_combatFlagEquippedId) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -4987,9 +4982,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } else @@ -5002,7 +4997,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && (pk != null)) { final L2Clan pkClan = pk.getClan(); - if ((pkClan != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pkClan != null) && (_clan != null) && !isAcademyMember() && !(pk.isAcademyMember())) { final ClanWar clanWar = _clan.getWarWith(pkClan.getId()); if ((clanWar != null) && AntiFeedManager.getInstance().check(killer, this)) @@ -5020,9 +5015,6 @@ public final class L2PcInstance extends L2Playable } } - // calculate Shilen's Breath debuff level - calculateShilensBreathDebuffLevel(killer); - if (isMounted()) { stopFeed(); @@ -5047,7 +5039,7 @@ public final class L2PcInstance extends L2Playable getSkillChannelized().abortChannelization(); } - if (getAgathionId() != 0) + if (_agathionId != 0) { setAgathionId(0); } @@ -5075,8 +5067,8 @@ public final class L2PcInstance extends L2Playable } final L2PcInstance pk = killer.getActingPlayer(); - if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) - // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) + if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) + // || _clan.isAtWarWith(((L2PcInstance)killer).getClanId()) )) { return; @@ -5093,7 +5085,7 @@ public final class L2PcInstance extends L2Playable int dropLimit = 0; int dropPercent = 0; - if ((getReputation() < 0) && (getPkKills() >= pkLimit)) + if ((getReputation() < 0) && (_pkKills >= pkLimit)) { isKarmaDrop = true; dropPercent = Config.KARMA_RATE_DROP; @@ -5115,16 +5107,15 @@ public final class L2PcInstance extends L2Playable { int dropCount = 0; int itemDropPercent = 0; - final L2Summon pet = getPet(); - for (L2ItemInstance itemDrop : getInventory().getItems()) + for (L2ItemInstance itemDrop : _inventory.getItems()) { // Don't drop if (itemDrop.isShadowItem() || // Dont drop Shadow Items itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items !itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena (itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items - ((pet != null) && (pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet + ((_pet != null) && (_pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list )) @@ -5136,7 +5127,7 @@ public final class L2PcInstance extends L2Playable { // Set proper chance according to Item type of equipped Item itemDropPercent = itemDrop.getItem().getType2() == L2Item.TYPE2_WEAPON ? dropEquipWeapon : dropEquip; - getInventory().unEquipItemInSlot(itemDrop.getLocationSlot()); + _inventory.unEquipItemInSlot(itemDrop.getLocationSlot()); } else { @@ -5169,80 +5160,78 @@ public final class L2PcInstance extends L2Playable public void onPlayerKill(L2Playable killedPlayable) { - final L2PcInstance player = getActingPlayer(); final L2PcInstance killedPlayer = killedPlayable.getActingPlayer(); // Avoid nulls && check if player != killedPlayer - if ((player == null) || (killedPlayer == null) || (player == killedPlayer)) + if ((killedPlayer == null) || (this == killedPlayer)) { return; } // Cursed weapons progress - if (player.isCursedWeaponEquipped() && killedPlayer.isPlayer()) + if (isCursedWeaponEquipped() && killedPlayer.isPlayer()) { CursedWeaponsManager.getInstance().increaseKills(getCursedWeaponEquippedId()); return; } // Duel support - if (player.isInDuel() && killedPlayer.getActingPlayer().isInDuel()) + if (isInDuel() && killedPlayer.isInDuel()) { return; } // Do nothing if both players are in PVP zone - if (player.isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) + if (isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) { return; } // If both players are in SIEGE zone just increase siege kills/deaths - if (player.isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) + if (isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) { - if ((player.getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (player.getSiegeState() != killedPlayer.getSiegeState())) + if ((getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (getSiegeState() != killedPlayer.getSiegeState())) { - final L2Clan killerClan = player.getClan(); final L2Clan targetClan = killedPlayer.getClan(); - if ((killerClan != null) && (targetClan != null)) + if ((_clan != null) && (targetClan != null)) { - killerClan.addSiegeKill(); + _clan.addSiegeKill(); targetClan.addSiegeDeath(); } } return; } - if (player.checkIfPvP(killedPlayer)) + if (checkIfPvP(killedPlayer)) { // Check if player should get + rep if (killedPlayer.getReputation() < 0) { - final int levelDiff = killedPlayer.getLevel() - player.getLevel(); - if ((player.getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours + final int levelDiff = killedPlayer.getLevel() - getLevel(); + if ((getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours { - player.setReputation(player.getReputation() + Config.REPUTATION_INCREASE); + setReputation(getReputation() + Config.REPUTATION_INCREASE); } } - player.setPvpKills(player.getPvpKills() + 1); + setPvpKills(_pvpKills + 1); } - else if ((getReputation() > 0) && (getPkKills() == 0)) + else if ((getReputation() > 0) && (_pkKills == 0)) { - player.setReputation(0); - player.setPkKills(player.getPkKills() + 1); + setReputation(0); + setPkKills(getPkKills() + 1); } else { // Calculate new karma and increase pk count - player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killedPlayable.isSummon())); - player.setPkKills(player.getPkKills() + 1); + setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); + setPkKills(getPkKills() + 1); } final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); - player.sendPacket(ui); - player.checkItemRestriction(); + sendPacket(ui); + checkItemRestriction(); } public void updatePvPStatus() @@ -5253,7 +5242,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5277,7 +5266,7 @@ public final class L2PcInstance extends L2Playable return; } - if (isInDuel() && (player_target.getDuelId() == getDuelId())) + if (_isInDuel && (player_target.getDuelId() == getDuelId())) { return; } @@ -5291,7 +5280,7 @@ public final class L2PcInstance extends L2Playable { setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5312,10 +5301,10 @@ public final class L2PcInstance extends L2Playable */ public void restoreExp(double restorePercent) { - if (getExpBeforeDeath() > 0) + if (_expBeforeDeath > 0) { // Restore the specified % of lost experience. - getStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100)); + getStat().addExp(Math.round(((_expBeforeDeath - getExp()) * restorePercent) / 100)); setExpBeforeDeath(0); } } @@ -5433,10 +5422,9 @@ public final class L2PcInstance extends L2Playable final List summons = new ArrayList<>(); summons.addAll(getServitors().values()); - final L2PetInstance pet = getPet(); - if (pet != null) + if (_pet != null) { - summons.add(pet); + summons.add(_pet); } return summons; @@ -5833,11 +5821,11 @@ public final class L2PcInstance extends L2Playable */ public boolean isClanLeader() { - if (getClan() == null) + if (_clan == null) { return false; } - return getObjectId() == getClan().getLeaderId(); + return getObjectId() == _clan.getLeaderId(); } /** @@ -5847,22 +5835,22 @@ public final class L2PcInstance extends L2Playable @Override protected boolean checkAndEquipAmmunition(EtcItemType type) { - L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + L2ItemInstance arrows = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (arrows == null) { final L2Weapon weapon = getActiveWeaponItem(); if (type == EtcItemType.ARROW) { - arrows = getInventory().findArrowForBow(weapon); + arrows = _inventory.findArrowForBow(weapon); } else if (type == EtcItemType.BOLT) { - arrows = getInventory().findBoltForCrossBow(weapon); + arrows = _inventory.findBoltForCrossBow(weapon); } if (arrows != null) { // Equip arrows needed in left hand - getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); + _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); sendItemList(false); return true; } @@ -5881,7 +5869,7 @@ public final class L2PcInstance extends L2Playable public boolean disarmWeapons() { // If there is no weapon to disarm then return true. - final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance wpn = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (wpn == null) { return true; @@ -5894,7 +5882,7 @@ public final class L2PcInstance extends L2Playable } // Don't allow disarming a Combat Flag or Territory Ward. - if (isCombatFlagEquipped()) + if (_combatFlagEquippedId) { return false; } @@ -5905,7 +5893,7 @@ public final class L2PcInstance extends L2Playable return false; } - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -5942,10 +5930,10 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -6053,7 +6041,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE); return false; } - else if (isSitting()) + else if (_waitTypeSitting) { // A strider can be ridden only when standing sendPacket(ActionFailed.STATIC_PACKET); @@ -6073,7 +6061,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); return false; } - else if (getInventory().getItemByItemId(9819) != null) + else if (_inventory.getItemByItemId(9819) != null) { sendPacket(ActionFailed.STATIC_PACKET); // FIXME: Wrong Message @@ -6103,7 +6091,7 @@ public final class L2PcInstance extends L2Playable } else if (isMounted()) { - if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) + if ((_mountType == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION); @@ -6252,12 +6240,12 @@ public final class L2PcInstance extends L2Playable public boolean isInCommandChannel() { - return isInParty() && getParty().isInCommandChannel(); + return isInParty() && _party.isInCommandChannel(); } public L2CommandChannel getCommandChannel() { - return (isInCommandChannel()) ? getParty().getCommandChannel() : null; + return (isInCommandChannel()) ? _party.getCommandChannel() : null; } /** @@ -6266,7 +6254,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isGM() { - return getAccessLevel().isGm(); + return _accessLevel.isGm(); } /** @@ -6297,8 +6285,8 @@ public final class L2PcInstance extends L2Playable _accessLevel = accessLevel; - getAppearance().setNameColor(_accessLevel.getNameColor()); - getAppearance().setTitleColor(_accessLevel.getTitleColor()); + _appearance.setNameColor(_accessLevel.getNameColor()); + _appearance.setTitleColor(_accessLevel.getTitleColor()); if (broadcast) { broadcastUserInfo(); @@ -6386,10 +6374,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -6459,32 +6446,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(8, getCurrentCp()); statement.setInt(9, getMaxMp()); statement.setDouble(10, getCurrentMp()); - statement.setInt(11, getAppearance().getFace()); - statement.setInt(12, getAppearance().getHairStyle()); - statement.setInt(13, getAppearance().getHairColor()); - statement.setInt(14, getAppearance().getSex() ? 1 : 0); + statement.setInt(11, _appearance.getFace()); + statement.setInt(12, _appearance.getHairStyle()); + statement.setInt(13, _appearance.getHairColor()); + statement.setInt(14, _appearance.getSex() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); - statement.setInt(18, getFame()); - statement.setInt(19, getRaidbossPoints()); - statement.setInt(20, getPvpKills()); - statement.setInt(21, getPkKills()); - statement.setInt(22, getClanId()); + statement.setInt(18, _fame); + statement.setInt(19, _raidbossPoints); + statement.setInt(20, _pvpKills); + statement.setInt(21, _pkKills); + statement.setInt(22, _clanId); statement.setInt(23, getRace().ordinal()); statement.setInt(24, getClassId().getId()); - statement.setLong(25, getDeleteTimer()); + statement.setLong(25, _deleteTimer); statement.setInt(26, hasDwarvenCraft() ? 1 : 0); statement.setString(27, getTitle()); - statement.setInt(28, getAppearance().getTitleColor()); + statement.setInt(28, _appearance.getTitleColor()); statement.setInt(29, isOnlineInt()); - statement.setInt(30, getClanPrivileges().getBitmask()); - statement.setInt(31, getWantsPeace()); - statement.setInt(32, getBaseClass()); + statement.setInt(30, _clanPrivileges.getBitmask()); + statement.setInt(31, _wantsPeace); + statement.setInt(32, _baseClass); statement.setInt(33, _nobleLevel); statement.setLong(34, 0); statement.setInt(35, PcStat.MIN_VITALITY_POINTS); - statement.setDate(36, new Date(getCreateDate().getTimeInMillis())); + statement.setDate(36, new Date(_createDate.getTimeInMillis())); statement.executeUpdate(); } catch (Exception e) @@ -7119,32 +7106,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(5, getCurrentCp()); statement.setInt(6, getMaxMp()); statement.setDouble(7, getCurrentMp()); - statement.setInt(8, getAppearance().getFace()); - statement.setInt(9, getAppearance().getHairStyle()); - statement.setInt(10, getAppearance().getHairColor()); - statement.setInt(11, getAppearance().getSex() ? 1 : 0); + statement.setInt(8, _appearance.getFace()); + statement.setInt(9, _appearance.getHairStyle()); + statement.setInt(10, _appearance.getHairColor()); + statement.setInt(11, _appearance.getSex() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); statement.setInt(15, _lastLoc != null ? _lastLoc.getZ() : getZ()); statement.setLong(16, exp); - statement.setLong(17, getExpBeforeDeath()); + statement.setLong(17, _expBeforeDeath); statement.setLong(18, sp); statement.setInt(19, getReputation()); - statement.setInt(20, getFame()); - statement.setInt(21, getRaidbossPoints()); - statement.setInt(22, getPvpKills()); - statement.setInt(23, getPkKills()); - statement.setInt(24, getClanId()); + statement.setInt(20, _fame); + statement.setInt(21, _raidbossPoints); + statement.setInt(22, _pvpKills); + statement.setInt(23, _pkKills); + statement.setInt(24, _clanId); statement.setInt(25, getRace().ordinal()); statement.setInt(26, getClassId().getId()); - statement.setLong(27, getDeleteTimer()); + statement.setLong(27, _deleteTimer); statement.setString(28, getTitle()); - statement.setInt(29, getAppearance().getTitleColor()); + statement.setInt(29, _appearance.getTitleColor()); statement.setInt(30, isOnlineInt()); - statement.setInt(31, getClanPrivileges().getBitmask()); - statement.setInt(32, getWantsPeace()); - statement.setInt(33, getBaseClass()); + statement.setInt(31, _clanPrivileges.getBitmask()); + statement.setInt(32, _wantsPeace); + statement.setInt(33, _baseClass); long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) @@ -7154,29 +7141,29 @@ public final class L2PcInstance extends L2Playable statement.setLong(34, totalOnlineTime); statement.setInt(35, _nobleLevel); - statement.setInt(36, getPowerGrade()); - statement.setInt(37, getPledgeType()); - statement.setInt(38, getLvlJoinedAcademy()); - statement.setLong(39, getApprentice()); - statement.setLong(40, getSponsor()); - statement.setLong(41, getClanJoinExpiryTime()); - statement.setLong(42, getClanCreateExpiryTime()); + statement.setInt(36, _powerGrade); + statement.setInt(37, _pledgeType); + statement.setInt(38, _lvlJoinedAcademy); + statement.setLong(39, _apprentice); + statement.setLong(40, _sponsor); + statement.setLong(41, _clanJoinExpiryTime); + statement.setLong(42, _clanCreateExpiryTime); statement.setString(43, getName()); - statement.setInt(44, getBookMarkSlot()); + statement.setInt(44, _bookmarkslot); statement.setInt(45, getStat().getBaseVitalityPoints()); - statement.setString(46, getLang()); + statement.setString(46, _lang); int factionId = 0; - if (isGood()) + if (_isGood) { factionId = 1; } - if (isEvil()) + if (_isEvil) { factionId = 2; } statement.setInt(47, factionId); - statement.setInt(48, getPcCafePoints()); + statement.setInt(48, _pcCafePoints); statement.setInt(49, getObjectId()); statement.execute(); @@ -7231,7 +7218,7 @@ public final class L2PcInstance extends L2Playable { // Delete all current stored effects for char to avoid dupe delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.execute(); int buff_index = 0; @@ -7297,7 +7284,7 @@ public final class L2PcInstance extends L2Playable statement.setDouble(7, (t != null) && t.hasNotPassed() ? t.getStamp() : 0); statement.setInt(8, 0); // Store type 0, active buffs/debuffs. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7329,7 +7316,7 @@ public final class L2PcInstance extends L2Playable statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); statement.setInt(8, 1); // Restore type 1, skill reuse. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7468,7 +7455,7 @@ public final class L2PcInstance extends L2Playable // Remove or update a L2PcInstance skill from the character_skills table of the database statement.setInt(1, oldSkill.getId()); statement.setInt(2, getObjectId()); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7484,7 +7471,7 @@ public final class L2PcInstance extends L2Playable if (skill != null) { - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) { @@ -7587,7 +7574,7 @@ public final class L2PcInstance extends L2Playable { // Retrieve all skills of this L2PcInstance from the database statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7638,7 +7625,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_SKILL_SAVE)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7676,7 +7663,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement delete = con.prepareStatement(DELETE_SKILL_SAVE)) { delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.executeUpdate(); } } @@ -7714,7 +7701,7 @@ public final class L2PcInstance extends L2Playable isInInventory = true; // Using item Id - L2ItemInstance item = getInventory().getItemByItemId(itemId); + L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { item = getWarehouse().getItemByItemId(itemId); @@ -7766,7 +7753,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_HENNAS)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { int slot; @@ -7875,7 +7862,7 @@ public final class L2PcInstance extends L2Playable { statement.setInt(1, getObjectId()); statement.setInt(2, slot); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7905,7 +7892,7 @@ public final class L2PcInstance extends L2Playable } if (henna.getCancelCount() > 0) { - getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); + _inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(henna.getDyeItemId()); sm.addLong(henna.getCancelCount()); @@ -7974,7 +7961,7 @@ public final class L2PcInstance extends L2Playable statement.setInt(1, getObjectId()); statement.setInt(2, henna.getDyeId()); statement.setInt(3, i); - statement.setInt(4, getClassIndex()); + statement.setInt(4, _classIndex); statement.execute(); } catch (Exception e) @@ -8120,7 +8107,7 @@ public final class L2PcInstance extends L2Playable if (Config.UPDATE_ITEMS_ON_CHAR_STORE) { - getInventory().updateDatabase(); + _inventory.updateDatabase(); getWarehouse().updateDatabase(); } } @@ -8171,7 +8158,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker isn't the L2PcInstance Pet - if ((attacker == this) || (attacker == getPet()) || attacker.hasServitor(attacker.getObjectId())) + if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { return false; } @@ -8189,13 +8176,13 @@ public final class L2PcInstance extends L2Playable } // is AutoAttackable if both players are in the same duel and the duel is still going on - if (attacker.isPlayable() && (getDuelState() == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) + if (attacker.isPlayable() && (_duelState == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { return true; } // Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. - if (isInParty() && getParty().getMembers().contains(attacker)) + if (isInParty() && _party.getMembers().contains(attacker)) { return false; } @@ -8203,14 +8190,14 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) + if (_inOlympiadMode && _OlympiadStart && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) { return true; } return false; } - if (isOnCustomEvent() && (getTeam() == attacker.getTeam())) + if (_isOnCustomEvent && (getTeam() == attacker.getTeam())) { return false; } @@ -8232,7 +8219,7 @@ public final class L2PcInstance extends L2Playable // Get L2PcInstance final L2PcInstance attackerPlayer = attacker.getActingPlayer(); - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) @@ -8265,7 +8252,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker is not in the same clan - if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) + if ((_clan != null) && _clan.isMember(attacker.getObjectId())) { return false; } @@ -8290,10 +8277,10 @@ public final class L2PcInstance extends L2Playable if (attacker instanceof L2DefenderInstance) { - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return ((siege != null) && siege.checkIsAttacker(_clan)); } } @@ -8303,7 +8290,7 @@ public final class L2PcInstance extends L2Playable } // Check if the L2PcInstance has Karma - if ((getReputation() < 0) || (getPvpFlag() > 0)) + if ((getReputation() < 0) || (_pvpFlag > 0)) { return true; } @@ -8397,7 +8384,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (inObserverMode()) + if (_observerMode) { sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(ActionFailed.STATIC_PACKET); @@ -8445,7 +8432,7 @@ public final class L2PcInstance extends L2Playable } // Check if the caster is sitting - if (isSitting()) + if (_waitTypeSitting) { sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING); sendPacket(ActionFailed.STATIC_PACKET); @@ -8481,7 +8468,7 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill final L2Object target = skill.getTarget(this, forceUse, dontMove, true); - final Location worldPosition = getCurrentSkillWorldPosition(); + final Location worldPosition = _currentSkillWorldPosition; if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { @@ -8537,7 +8524,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (getQueuedSkill() != null) + if (_queuedSkill != null) { setQueuedSkill(null, null, false, false); } @@ -8552,14 +8539,14 @@ public final class L2PcInstance extends L2Playable final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel - if (isInParty() && getParty().isInCommandChannel() && (looter != null)) + if (isInParty() && _party.isInCommandChannel() && (looter != null)) { - return getParty().getCommandChannel().getMembers().contains(looter); + return _party.getCommandChannel().getMembers().contains(looter); } if (isInParty() && (looter != null)) { - return getParty().getMembers().contains(looter); + return _party.getMembers().contains(looter); } return false; @@ -8802,7 +8789,7 @@ public final class L2PcInstance extends L2Playable { for (int itemId : _activeSoulShots) { - final L2ItemInstance item = getInventory().getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { removeAutoSoulShot(itemId); @@ -8896,27 +8883,27 @@ public final class L2PcInstance extends L2Playable public void updateActiveBroochJewel() { // Update active Ruby jewel. - if ((getInventory().getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.GREATER_RUBY); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV1); } @@ -8925,27 +8912,27 @@ public final class L2PcInstance extends L2Playable setActiveRubyJewel(null); } // Update active Sapphire jewel. - if ((getInventory().getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.GREATER_SHAPPHIRE); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1); } @@ -9072,10 +9059,9 @@ public final class L2PcInstance extends L2Playable public void enterOlympiadObserverMode(Location loc, int id) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.unSummon(this); + _pet.unSummon(this); } if (hasServitors()) @@ -9093,13 +9079,13 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoCubic(this)); } - if (getParty() != null) + if (_party != null) { - getParty().removePartyMember(this, MessageType.EXPELLED); + _party.removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -9421,12 +9407,12 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; return false; } - if (isInDuel()) + if (_isInDuel) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL; return false; } - if (isInOlympiadMode() || isOnEvent(CeremonyOfChaosEvent.class)) + if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class)) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS; return false; @@ -9441,7 +9427,7 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE; return false; } - if (getPrivateStoreType() != PrivateStoreType.NONE) + if (_privateStoreType != PrivateStoreType.NONE) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE; return false; @@ -9508,10 +9494,9 @@ public final class L2PcInstance extends L2Playable { super.setTeam(team); broadcastUserInfo(); - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.broadcastStatusUpdate(); + _pet.broadcastStatusUpdate(); } if (hasServitors()) { @@ -9548,9 +9533,9 @@ public final class L2PcInstance extends L2Playable for (Skill s : getSkillList()) { - if (getClan() != null) + if (_clan != null) { - isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0); + isDisabled = s.isClanSkill() && (_clan.getReputationScore() < 0); } sl.addSkill(s.getDisplayId(), s.getReuseDelayGroup(), s.getDisplayLevel(), s.getSubLevel(), s.isPassive(), isDisabled, s.isEnchantable()); @@ -9861,7 +9846,7 @@ public final class L2PcInstance extends L2Playable // Remove active item skills before saving char to database // because next time when choosing this class, weared items can // be different - for (L2ItemInstance item : getInventory().getPaperdollItems(L2ItemInstance::isAugmented)) + for (L2ItemInstance item : _inventory.getPaperdollItems(L2ItemInstance::isAugmented)) { if ((item != null) && item.isEquipped()) { @@ -9899,7 +9884,7 @@ public final class L2PcInstance extends L2Playable if (classIndex == 0) { - setClassTemplate(getBaseClass()); + setClassTemplate(_baseClass); } else { @@ -9917,7 +9902,7 @@ public final class L2PcInstance extends L2Playable if (isInParty()) { - getParty().recalculatePartyLevel(); + _party.recalculatePartyLevel(); } // Update the character's change in class status. @@ -10023,7 +10008,7 @@ public final class L2PcInstance extends L2Playable if (_taskRentPet != null) { // if the rent of a wyvern expires while over a flying zone, tp to down before unmounting - if (checkLandingState() && (getMountType() == MountType.WYVERN)) + if (checkLandingState() && (_mountType == MountType.WYVERN)) { teleToLocation(TeleportWhereType.TOWN); } @@ -10112,7 +10097,7 @@ public final class L2PcInstance extends L2Playable { sendMessage("Entering world in Invisible mode."); } - if (isSilenceMode()) + if (_silenceMode) { sendMessage("Entering world in Silence mode."); } @@ -10218,7 +10203,7 @@ public final class L2PcInstance extends L2Playable restoreExp(revivePower); } - public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int power) + public void reviveRequest(L2PcInstance reviver, Skill skill, boolean isPet, int power) { if (isResurrectionBlocked()) { @@ -10227,11 +10212,11 @@ public final class L2PcInstance extends L2Playable if (_reviveRequested == 1) { - if (_revivePet == Pet) + if (_revivePet == isPet) { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } - else if (Pet) + else if (isPet) { reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. } @@ -10241,12 +10226,11 @@ public final class L2PcInstance extends L2Playable } return; } - final L2Summon pet = getPet(); - if ((Pet && (pet != null) && pet.isDead()) || (!Pet && isDead())) + if ((isPet && (_pet != null) && _pet.isDead()) || (!isPet && isDead())) { _reviveRequested = 1; _revivePower = Formulas.calculateSkillResurrectRestorePercent(power, reviver); - _revivePet = Pet; + _revivePet = isPet; if (hasCharmOfCourage()) { @@ -10256,7 +10240,7 @@ public final class L2PcInstance extends L2Playable return; } - final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); + final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100); final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); @@ -10267,8 +10251,7 @@ public final class L2PcInstance extends L2Playable public void reviveAnswer(int answer) { - final L2Summon pet = getPet(); - if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (pet != null) && !pet.isDead())) + if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (_pet != null) && !_pet.isDead())) { return; } @@ -10286,15 +10269,15 @@ public final class L2PcInstance extends L2Playable doRevive(); } } - else if (pet != null) + else if (_pet != null) { if (_revivePower != 0) { - pet.doRevive(_revivePower); + _pet.doRevive(_revivePower); } else { - pet.doRevive(); + _pet.doRevive(); } } } @@ -10363,7 +10346,7 @@ public final class L2PcInstance extends L2Playable @Override public void teleToLocation(ILocational loc, boolean allowRandomOffset) { - if ((getVehicle() != null) && !getVehicle().isTeleporting()) + if ((_vehicle != null) && !_vehicle.isTeleporting()) { setVehicle(null); } @@ -10394,31 +10377,30 @@ public final class L2PcInstance extends L2Playable checkItemRestriction(); - if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !isInOlympiadMode()) + if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !_inOlympiadMode) { setTeleportProtection(true); } // Trained beast is lost after teleport - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.deleteMe(); } - getTrainedBeasts().clear(); + _tamedBeast.clear(); } // Modify the position of the pet if necessary - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.setFollowStatus(false); - pet.teleToLocation(getLocation(), false); - ((L2SummonAI) pet.getAI()).setStartFollowController(true); - pet.setFollowStatus(true); - pet.setInstance(getInstanceWorld()); - pet.updateAndBroadcastStatus(0); + _pet.setFollowStatus(false); + _pet.teleToLocation(getLocation(), false); + ((L2SummonAI) _pet.getAI()).setStartFollowController(true); + _pet.setFollowStatus(true); + _pet.setInstance(getInstanceWorld()); + _pet.updateAndBroadcastStatus(0); } getServitors().values().forEach(s -> @@ -10508,9 +10490,9 @@ public final class L2PcInstance extends L2Playable super.reduceCurrentHp(value, attacker, skill, isDOT, directlyToHp, critical, reflect); // notify the tamed beast of attacks - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.onOwnerGotAttacked(attacker); } @@ -10643,7 +10625,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -10652,8 +10634,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return false; } @@ -10795,7 +10776,7 @@ public final class L2PcInstance extends L2Playable // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) try { - if (!isOnline()) + if (!_isOnline) { LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } @@ -10808,7 +10789,7 @@ public final class L2PcInstance extends L2Playable try { - if (Config.ENABLE_BLOCK_CHECKER_EVENT && (getBlockCheckerArena() != -1)) + if (Config.ENABLE_BLOCK_CHECKER_EVENT && (_handysBlockCheckerEventArena != -1)) { HandysBlockCheckerManager.getInstance().onDisconnect(this); } @@ -10833,7 +10814,7 @@ public final class L2PcInstance extends L2Playable // remove combat flag try { - if (getInventory().getItemByItemId(9819) != null) + if (_inventory.getItemByItemId(9819) != null) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -10842,9 +10823,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } } @@ -10970,13 +10951,13 @@ public final class L2PcInstance extends L2Playable { try { - L2Summon pet = getPet(); + L2Summon pet = _pet; if (pet != null) { pet.setRestoreSummon(true); pet.unSummon(this); // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) - pet = getPet(); + pet = _pet; if (pet != null) { pet.broadcastNpcInfo(0); @@ -10995,12 +10976,12 @@ public final class L2PcInstance extends L2Playable } // returns pet to control item } - if (getClan() != null) + if (_clan != null) { // set the status for pledge member list to OFFLINE try { - final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = _clan.getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -11037,14 +11018,14 @@ public final class L2PcInstance extends L2Playable { // Check if the L2PcInstance is in observer mode to set its position to its position // before entering in observer mode - if (inObserverMode()) + if (_observerMode) { setLocationInvisible(_lastLoc); } - if (getVehicle() != null) + if (_vehicle != null) { - getVehicle().oustPlayer(this); + _vehicle.oustPlayer(this); } } catch (Exception e) @@ -11078,7 +11059,7 @@ public final class L2PcInstance extends L2Playable // Update database with items in its inventory and remove them from the world try { - getInventory().deleteMe(); + _inventory.deleteMe(); } catch (Exception e) { @@ -11101,7 +11082,7 @@ public final class L2PcInstance extends L2Playable try { - getFreight().deleteMe(); + _freight.deleteMe(); } catch (Exception e) { @@ -11129,10 +11110,10 @@ public final class L2PcInstance extends L2Playable } } - if (getClanId() > 0) + if (_clanId > 0) { - getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); - getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan())); + _clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); + _clan.broadcastToOnlineMembers(new ExPledgeCount(_clan)); // ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); } @@ -11166,7 +11147,7 @@ public final class L2PcInstance extends L2Playable try { notifyFriends(L2FriendStatus.MODE_OFFLINE); - getBlockList().playerLogout(); + _blockList.playerLogout(); } catch (Exception e) { @@ -11432,12 +11413,12 @@ public final class L2PcInstance extends L2Playable { _souls -= count; - if (getChargedSouls() < 0) + if (_souls < 0) { _souls = 0; } - if (getChargedSouls() == 0) + if (_souls == 0) { stopSoulTask(); } @@ -11683,10 +11664,10 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = _inventory.getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { - getInventory().unEquipItemInSlot(i); + _inventory.unEquipItemInSlot(i); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); @@ -11836,10 +11817,9 @@ public final class L2PcInstance extends L2Playable } if (hasPet()) { - final L2Summon pet = getPet(); - setCurrentFeed(((L2PetInstance) pet).getCurrentFed()); - _controlItemId = pet.getControlObjectId(); - sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); + setCurrentFeed(_pet.getCurrentFed()); + _controlItemId = _pet.getControlObjectId(); + sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); if (!isDead()) { _mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000); @@ -11848,7 +11828,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -11908,7 +11888,7 @@ public final class L2PcInstance extends L2Playable { final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -11924,7 +11904,7 @@ public final class L2PcInstance extends L2Playable public boolean isHungry() { - return hasPet() && _canFeed && (getCurrentFeed() < ((getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())); + return hasPet() && _canFeed && (_curFeed < ((getPetData(_mountNpcId).getHungryLimit() / 100f) * getPetLevelData(_mountNpcId).getPetMaxFeed())); } public void enteredNoLanding(int delay) @@ -11950,7 +11930,7 @@ public final class L2PcInstance extends L2Playable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(req)) { - statement.setInt(1, getCurrentFeed()); + statement.setInt(1, _curFeed); statement.setInt(2, _controlItemId); statement.executeUpdate(); _controlItemId = 0; @@ -12119,7 +12099,7 @@ public final class L2PcInstance extends L2Playable { return; } - if (getInventory().getInventoryItemCount(13016, 0) == 0) + if (_inventory.getInventoryItemCount(13016, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; @@ -12131,7 +12111,7 @@ public final class L2PcInstance extends L2Playable final TeleportBookmark bookmark = _tpbookmarks.get(id); if (bookmark != null) { - destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(13016).getObjectId(), 1, null, false); teleToLocation(bookmark, false); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12144,12 +12124,12 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE); return false; } - else if (isInSiege() || (getSiegeState() != 0)) + else if (_isInSiege || (_siegeState != 0)) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_A_LARGE_SCALE_BATTLE_SUCH_AS_A_CASTLE_SIEGE_FORTRESS_SIEGE_OR_CLAN_HALL_SIEGE); return false; } - else if (isInDuel()) + else if (_isInDuel) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL); return false; @@ -12159,7 +12139,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING); return false; } - else if (isInOlympiadMode()) + else if (_inOlympiadMode) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH); return false; @@ -12218,7 +12198,7 @@ public final class L2PcInstance extends L2Playable return; } - if (getInventory().getInventoryItemCount(20033, 0) == 0) + if (_inventory.getInventoryItemCount(20033, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG); return; @@ -12234,7 +12214,7 @@ public final class L2PcInstance extends L2Playable } _tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name)); - destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); @@ -12288,7 +12268,7 @@ public final class L2PcInstance extends L2Playable setXYZ(getBoat().getLocation()); activeChar.sendPacket(new CharInfo(this, isInvisible() && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS))); - activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition())); + activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); } else if (isInAirShip()) { @@ -12306,10 +12286,9 @@ public final class L2PcInstance extends L2Playable rc1.addRelation(this, relation1, isAutoAttackable(activeChar)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc1.addRelation(pet, relation1, isAutoAttackable(activeChar)); + rc1.addRelation(_pet, relation1, isAutoAttackable(activeChar)); } if (hasServitors()) { @@ -12323,10 +12302,9 @@ public final class L2PcInstance extends L2Playable rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this)); if (activeChar.hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this)); + rc2.addRelation(_pet, relation2, activeChar.isAutoAttackable(this)); } if (hasServitors()) { @@ -12335,7 +12313,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(rc2); - switch (getPrivateStoreType()) + switch (_privateStoreType) { case SELL: { @@ -12362,7 +12340,7 @@ public final class L2PcInstance extends L2Playable public void playMovie(MovieHolder holder) { - if (getMovieHolder() != null) + if (_movieHolder != null) { return; } @@ -12378,7 +12356,7 @@ public final class L2PcInstance extends L2Playable public void stopMovie() { - sendPacket(new ExStopScenePlayer(getMovieHolder().getMovie())); + sendPacket(new ExStopScenePlayer(_movieHolder.getMovie())); setMovieHolder(null); } @@ -12456,7 +12434,7 @@ public final class L2PcInstance extends L2Playable public int getBirthdays() { - long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12625,24 +12603,24 @@ public final class L2PcInstance extends L2Playable @Override public double getCollisionRadius() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override public double getCollisionHeight() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -12784,7 +12762,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || (getMovieHolder() != null) || _fishing.isFishing(); + return super.isMovementDisabled() || (_movieHolder != null) || _fishing.isFishing(); } public String getHtmlPrefix() @@ -12894,7 +12872,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return ((_privateStoreType == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); } public void setMultiSocialAction(int id, int targetId) @@ -12994,7 +12972,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); } /** @@ -13004,7 +12982,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder80(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); } public boolean havePetInvItems() @@ -13090,8 +13068,8 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("REPLACE INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?)")) { ps.setInt(1, getObjectId()); - ps.setInt(2, getRecomHave()); - ps.setInt(3, getRecomLeft()); + ps.setInt(2, _recomHave); + ps.setInt(3, _recomLeft); ps.setLong(4, 0); ps.execute(); } @@ -13518,7 +13496,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHair() { - return getVariables().getInt("visualHairId", getAppearance().getHairStyle()); + return getVariables().getInt("visualHairId", _appearance.getHairStyle()); } /** @@ -13526,7 +13504,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHairColor() { - return getVariables().getInt("visualHairColorId", getAppearance().getHairColor()); + return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); } /** @@ -13534,7 +13512,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualFace() { - return getVariables().getInt("visualFaceId", getAppearance().getFace()); + return getVariables().getInt("visualFaceId", _appearance.getFace()); } /** @@ -13633,7 +13611,7 @@ public final class L2PcInstance extends L2Playable */ public CastleSide getPlayerSide() { - if ((getClan() == null) || (getClan().getCastleId() == 0)) + if ((_clan == null) || (_clan.getCastleId() == 0)) { return CastleSide.NEUTRAL; } @@ -13978,7 +13956,7 @@ public final class L2PcInstance extends L2Playable @Override public MoveType getMoveType() { - if (isSitting()) + if (_waitTypeSitting) { return MoveType.SITTING; } @@ -13997,10 +13975,9 @@ public final class L2PcInstance extends L2Playable private void updateOnlineTime() { - final L2Clan clan = getClan(); - if (clan != null) + if (_clan != null) { - clan.addMemberOnlineTime(this); + _clan.addMemberOnlineTime(this); } } @@ -14015,7 +13992,7 @@ public final class L2PcInstance extends L2Playable public GroupType getGroupType() { - return isInParty() ? (getParty().isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; + return isInParty() ? (_party.isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; } public boolean isTrueHero() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 10429b5b5b..f1112eee76 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -83,8 +83,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,skill_sub_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -140,9 +140,9 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - else if (getCurrentFed() > getFeedConsume()) + else if (_curFed > getFeedConsume()) { - setCurrentFed(getCurrentFed() - getFeedConsume()); + setCurrentFed(_curFed - getFeedConsume()); } else { @@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -333,9 +333,9 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - if (getInventory() != null) + if (_inventory != null) { - return getInventory().getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); + return _inventory.getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); } return null; } @@ -622,8 +622,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -639,7 +639,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -702,9 +702,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -756,11 +756,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - statement.setInt(1, getControlObjectId()); + statement.setInt(1, _controlObjectId); statement.execute(); } catch (Exception e) @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -817,7 +817,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -921,7 +921,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -933,7 +933,7 @@ public class L2PetInstance extends L2Summon } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -951,10 +951,10 @@ public class L2PetInstance extends L2Summon statement.setDouble(4, getStatus().getCurrentMp()); statement.setLong(5, getStat().getExp()); statement.setLong(6, getStat().getSp()); - statement.setInt(7, getCurrentFed()); + statement.setInt(7, _curFed); statement.setInt(8, getOwner().getObjectId()); statement.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - statement.setInt(10, getControlObjectId()); + statement.setInt(10, _controlObjectId); statement.executeUpdate(); _respawned = true; @@ -997,7 +997,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1045,7 +1045,7 @@ public class L2PetInstance extends L2Summon continue; } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, skill.getSubLevel()); @@ -1073,7 +1073,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rset = ps1.executeQuery()) { while (rset.next()) @@ -1094,7 +1094,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1147,9 +1147,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1340,13 +1340,13 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1357,7 +1357,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1367,7 +1367,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 42bd49e7f9..8ed3a9f1d3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -240,7 +240,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable final Map> servitorEffects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()); if (servitorEffects != null) { - final List effects = servitorEffects.get(getReferenceSkill()); + final List effects = servitorEffects.get(_referenceSkill); if ((effects != null) && !effects.isEmpty()) { for (SummonEffect effect : effects) @@ -294,7 +294,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.execute(); int buff_index = 0; @@ -348,7 +348,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -397,7 +397,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -437,7 +437,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -554,12 +554,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -573,7 +573,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); // Using same task to check if owner is in visible range if (calculateDistance(getOwner(), true, false) > 2000) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java index 285b9af507..aa681dd5f3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java @@ -51,7 +51,7 @@ public class L2ShuttleInstance extends L2Vehicle public void closeDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { @@ -63,7 +63,7 @@ public class L2ShuttleInstance extends L2Vehicle public void openDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index e5e5d055c4..32f94719bb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index a7276d30f8..f1d5b120e9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -72,7 +72,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -136,7 +136,7 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - final L2Character activeChar = getActiveChar(); + final L2Character activeChar = _activeChar; if (activeChar.isDead()) { return; @@ -169,14 +169,14 @@ public class CharStatus } if (Formulas.calcRealTargetBreak()) { - getActiveChar().getEffectList().stopEffects(AbnormalType.REAL_TARGET); + _activeChar.getEffectList().stopEffects(AbnormalType.REAL_TARGET); } } if (value > 0) { - final double oldHp = getCurrentHp(); - final double newHp = Math.max(getCurrentHp() - value, activeChar.isUndying() ? 1 : 0); + final double oldHp = _currentHp; + final double newHp = Math.max(_currentHp - value, activeChar.isUndying() ? 1 : 0); setCurrentHp(newHp); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureHpChange(activeChar, oldHp, newHp), activeChar); } @@ -189,7 +189,7 @@ public class CharStatus public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -202,10 +202,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -269,12 +269,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getStat().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getStat().getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -324,7 +324,7 @@ public class CharStatus if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -337,7 +337,7 @@ public class CharStatus hpOrMpWasChanged |= setCurrentMp(newMp, false); if (hpOrMpWasChanged) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -360,12 +360,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getStat().getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -398,7 +398,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -407,10 +407,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE); - final double newMp = getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE); + final double newHp = _currentHp + _activeChar.getStat().getValue(Stats.REGENERATE_HP_RATE); + final double newMp = _currentMp + _activeChar.getStat().getValue(Stats.REGENERATE_MP_RATE); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 4d221ab370..813634b659 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -48,9 +48,9 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -78,7 +78,7 @@ public class PcStatus extends PlayableStatus } // If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken. - if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) + if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isCrafting() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) { return; } @@ -100,7 +100,7 @@ public class PcStatus extends PlayableStatus getActiveChar().stopEffectsOnDamage(); } // Attacked players in craft/shops stand up. - if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) + if (getActiveChar().isCrafting() || getActiveChar().isInStoreMode()) { getActiveChar().setPrivateStoreType(PrivateStoreType.NONE); getActiveChar().standUp(); @@ -238,14 +238,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -337,7 +337,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -388,9 +388,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); + setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 80a80f6018..1d84f3da14 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -279,7 +279,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 1ce3ab05ca..6ee4d7e704 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -262,13 +262,13 @@ public final class Transform implements IIdentifiable if (creature.isPlayer()) { - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } if (addSkills) @@ -374,11 +374,11 @@ public final class Transform implements IIdentifiable final L2PcInstance player = creature.getActingPlayer(); final boolean hasTransformSkills = player.hasTransformSkills(); - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index ebee3cd82c..1adc7b039f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setInt(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setInt(6, _repeat); st.execute(); try (ResultSet rset = st.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setLong(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setLong(6, _repeat); st.setLong(7, getId()); st.execute(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/base/SubClass.java index 0e65764560..e318f331ee 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -140,7 +140,7 @@ public final class SubClass public void incLevel() { - if (!_dualClass && (getLevel() == _maxLevel)) + if (!_dualClass && (_level == _maxLevel)) { return; } @@ -151,7 +151,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java index 03b1a51b6b..8360f7712c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -69,7 +69,7 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() @@ -124,7 +124,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(this::restock, getRestockDelay()); + _restockTask = ThreadPool.schedule(this::restock, _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -133,7 +133,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -151,7 +151,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -161,7 +161,7 @@ public final class Product PreparedStatement statement = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { statement.setInt(1, _buyListId); - statement.setInt(2, getItemId()); + statement.setInt(2, _item.getId()); statement.setLong(3, getCount()); statement.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index ce7a68dcc7..4e95946a36 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -538,9 +538,9 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - getHolder().broadCastPacketToTeam(changePoints); + _holder.broadCastPacketToTeam(changePoints); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java index 4fa38d85d4..9b249a9069 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -72,7 +72,7 @@ public final class Castle extends AbstractResidence private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -96,12 +96,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -158,7 +158,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -185,29 +185,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -223,11 +223,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -244,7 +244,7 @@ public final class Castle extends AbstractResidence initResidenceZone(); initFunctions(); spawnSideNpcs(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -287,7 +287,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -338,7 +338,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -380,7 +380,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -460,7 +460,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -481,7 +481,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, String doorName, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -516,7 +516,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -877,7 +877,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -897,12 +897,12 @@ public final class Castle extends AbstractResidence public final L2DoorInstance getDoor(int doorId) { - return getDoors().stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); } public final L2DoorInstance getDoor(String doorName) { - return getDoors().stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); } public final List getDoors() @@ -957,7 +957,7 @@ public final class Castle extends AbstractResidence public final int getTaxPercent(TaxType type) { final int taxPercent; - switch (getSide()) + switch (_castleSide) { case LIGHT: { @@ -1036,7 +1036,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -1156,7 +1156,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); + final Skill skill = _castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); player.addSkill(skill); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index d41afdb68a..6fc9b45046 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -58,7 +58,7 @@ public final class ClanHall extends AbstractResidence private final ClanHallGrade _grade; private final ClanHallType _type; private final int _minBid; - private final int _lease; + final int _lease; private final int _deposit; private final List _npcs; private final List _doors; @@ -66,8 +66,8 @@ public final class ClanHall extends AbstractResidence private final Location _ownerLocation; private final Location _banishLocation; // Dynamic parameters - private L2Clan _owner = null; - private long _paidUntil = 0; + L2Clan _owner = null; + long _paidUntil = 0; protected ScheduledFuture _checkPaymentTask = null; // Other private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; @@ -137,7 +137,7 @@ public final class ClanHall extends AbstractResidence PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) { statement.setInt(1, getOwnerId()); - statement.setLong(2, getPaidUntil()); + statement.setLong(2, _paidUntil); statement.setInt(3, getResidenceId()); statement.execute(); } @@ -159,7 +159,7 @@ public final class ClanHall extends AbstractResidence public int getCostFailDay() { - final Duration failDay = Duration.between(Instant.ofEpochMilli(getPaidUntil()), Instant.now()); + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); return failDay.isNegative() ? 0 : (int) failDay.toDays(); } @@ -256,13 +256,13 @@ public final class ClanHall extends AbstractResidence _owner = clan; clan.setHideoutId(getResidenceId()); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (getPaidUntil() == 0) + if (_paidUntil == 0) { setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); } final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : getPaidUntil(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else @@ -351,29 +351,28 @@ public final class ClanHall extends AbstractResidence @Override public void run() { - final L2Clan clan = getOwner(); - if (clan != null) + if (_owner != null) { - if (clan.getWarehouse().getAdena() < getLease()) + if (_owner.getWarehouse().getAdena() < _lease) { if (getCostFailDay() > 8) { setOwner(null); - clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + _owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); } else { _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); - clan.broadcastToOnlineMembers(sm); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); } } else { - clan.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, getLease(), null, null); - setPaidUntil(Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), getPaidUntil() - System.currentTimeMillis()); + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java index 826a7beece..a4b57818fa 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -75,7 +75,7 @@ public class Duel private boolean _finished = false; private final Map _playerConditions = new ConcurrentHashMap<>(); - private Instance _duelInstance; + Instance _duelInstance; public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId) { @@ -213,9 +213,9 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPool.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - if (getDueldInstance() != null) + if (_duelInstance != null) { - getDueldInstance().destroy(); + _duelInstance.destroy(); } break; } @@ -674,7 +674,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -695,7 +695,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java index 3d030d3183..2433d41209 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -237,7 +237,7 @@ public final class Fort extends AbstractResidence super(fortId); load(); loadFlagPoles(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -506,7 +506,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -781,7 +781,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -873,7 +873,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1001,8 +1001,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1068,7 +1068,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 75de2719fc..c7a8bd6dfa 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -70,7 +70,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -101,7 +101,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -115,7 +115,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -184,7 +184,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -205,7 +205,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -228,7 +228,7 @@ public class FortSiege implements Siegable // Fort setting protected Set _commanders = ConcurrentHashMap.newKeySet(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private final Collection _siegeGuards = new LinkedList<>(); ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -248,7 +248,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { _isInProgress = false; // Flag so that siege instance can be started removeFlags(); // Removes all flags. Note: Remove flag before teleporting players @@ -257,22 +257,22 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); int ownerId = -1; - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - ownerId = getFort().getOwnerClan().getId(); + ownerId = _fort.getOwnerClan().getId(); } - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -306,16 +306,16 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -326,24 +326,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -358,7 +358,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -369,7 +369,7 @@ public class FortSiege implements Siegable } } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -391,7 +391,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -411,7 +411,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -421,7 +421,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -441,7 +441,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -470,7 +470,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return (_isInProgress && (_fort.checkIfInZone(x, y, z))); // Fort zone during siege } /** @@ -490,7 +490,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - if ((clan != null) && (getFort().getOwnerClan() == clan)) + if ((clan != null) && (_fort.getOwnerClan() == clan)) { return true; } @@ -504,22 +504,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -540,7 +540,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -550,7 +550,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -583,10 +583,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -614,7 +614,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if ((getFort() != null) && (!_commanders.isEmpty())) + if ((_fort != null) && (!_commanders.isEmpty())) { final L2Spawn spawn = instance.getSpawn(); if (spawn != null) @@ -657,14 +657,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -674,22 +674,22 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } // schedule restoring doors/commanders respawn else if (_siegeRestore == null) { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); } } else { - LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } } @@ -705,7 +705,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -734,7 +734,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player don't have enough adena to register } @@ -754,7 +754,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -788,7 +788,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(query)) { - statement.setInt(1, getFort().getResidenceId()); + statement.setInt(1, _fort.getResidenceId()); if (clanId != 0) { statement.setInt(2, clanId); @@ -796,9 +796,9 @@ public class FortSiege implements Siegable statement.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -843,7 +843,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -896,9 +896,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -927,7 +927,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -948,7 +948,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -991,18 +991,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1038,7 +1038,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1060,8 +1060,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, _fort.getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1085,7 +1085,7 @@ public class FortSiege implements Siegable PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getFort().getResidenceId()); + statement.setInt(2, _fort.getResidenceId()); statement.execute(); addAttacker(clan.getId()); @@ -1151,7 +1151,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1235,7 +1235,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1265,7 +1265,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1288,7 +1288,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public Set getCommanders() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java index a2ad3c924d..32b1d6187a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -92,7 +92,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -160,14 +160,14 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } try { - if (!getIsTimeRegistrationOver()) + if (!_castle.getIsTimeRegistrationOver()) { final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) @@ -186,7 +186,7 @@ public class Siege implements Siegable else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; clearSiegeWaitingClan(); @@ -228,8 +228,8 @@ public class Siege implements Siegable // Castle setting private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); - private final Castle _castle; - private boolean _isInProgress = false; + final Castle _castle; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,18 +246,18 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); if (clan.getId() == _firstOwnerClanId) @@ -267,7 +267,7 @@ public class Siege implements Siegable } else { - getCastle().setTicketBuyCount(0); + _castle.setTicketBuyCount(0); for (L2ClanMember member : clan.getMembers()) { if (member != null) @@ -284,7 +284,7 @@ public class Siege implements Siegable else { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); } @@ -322,7 +322,7 @@ public class Siege implements Siegable clan.clearSiegeDeaths(); } - getCastle().updateClansReputation(); + _castle.updateClansReputation(); removeFlags(); // Removes all flags. Note: Remove flag before teleporting players teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town _isInProgress = false; // Flag so that siege instance can be started @@ -331,14 +331,14 @@ public class Siege implements Siegable clearSiegeClan(); // Clear siege clan from db removeTowers(); // Remove all towers from this castle SiegeGuardManager.getInstance().unspawnSiegeGuard(getCastle()); // Remove all spawned siege guard from this castle - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); } - getCastle().spawnDoor(); // Respawn door to castle - getCastle().getZone().setIsActive(false); - getCastle().getZone().updateZoneStatusForCharactersInside(); - getCastle().getZone().setSiegeInstance(null); + _castle.spawnDoor(); // Respawn door to castle + _castle.getZone().setIsActive(false); + _castle.getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(null); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeFinish(this), getCastle()); @@ -387,9 +387,9 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); // Remove all merc entry from db } @@ -398,13 +398,13 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); return; } - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) @@ -426,7 +426,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -444,7 +444,7 @@ public class Siege implements Siegable } } - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -462,8 +462,8 @@ public class Siege implements Siegable teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town removeDefenderFlags(); // Removes defenders' flags - getCastle().removeUpgrade(); // Remove all castle upgrade - getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) + _castle.removeUpgrade(); // Remove all castle upgrade + _castle.spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) removeTowers(); // Remove all towers from this castle _controlTowerCount = 0; // Each new siege midvictory CT are completely respawned. spawnControlTower(); @@ -483,9 +483,9 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { - _firstOwnerClanId = getCastle().getOwnerId(); + _firstOwnerClanId = _castle.getOwnerId(); if (getAttackerClans().isEmpty()) { @@ -500,7 +500,7 @@ public class Siege implements Siegable final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId); ownerClan.increaseBloodAllianceCount(); } - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); saveCastleSiege(); return; @@ -515,20 +515,20 @@ public class Siege implements Siegable _controlTowerCount = 0; spawnControlTower(); // Spawn control tower spawnFlameTower(); // Spawn control tower - getCastle().spawnDoor(); // Spawn door + _castle.spawnDoor(); // Spawn door spawnSiegeGuard(); // Spawn siege guard SiegeGuardManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground - getCastle().getZone().setSiegeInstance(this); - getCastle().getZone().setIsActive(true); - getCastle().getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(this); + _castle.getZone().setIsActive(true); + _castle.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEndDate = Calendar.getInstance(); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); - ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task + ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); // Notify to scripts. @@ -589,7 +589,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -649,7 +649,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -723,7 +723,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return (_isInProgress && (_castle.checkIfInZone(x, y, z))); // Castle zone during siege } /** @@ -763,21 +763,21 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) { - delete.setInt(1, getCastle().getOwnerId()); + delete.setInt(1, _castle.getOwnerId()); delete.execute(); } } getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -791,10 +791,10 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -821,7 +821,7 @@ public class Siege implements Siegable */ public List getPlayersInZone() { - return getCastle().getZone().getPlayersInside(); + return _castle.getZone().getPlayersInside(); } /** @@ -845,7 +845,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - return getCastle().getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); + return _castle.getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); } /** @@ -872,7 +872,7 @@ public class Siege implements Siegable */ public void listRegisterClan(L2PcInstance player) { - player.sendPacket(new SiegeInfo(getCastle(), player)); + player.sendPacket(new SiegeInfo(_castle, player)); } /** @@ -892,7 +892,7 @@ public class Siege implements Siegable return; } int allyId = 0; - if (getCastle().getOwnerId() != 0) + if (_castle.getOwnerId() != 0) { allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); } @@ -935,9 +935,9 @@ public class Siege implements Siegable public void registerDefender(L2PcInstance player, boolean force) { - if (getCastle().getOwnerId() <= 0) + if (_castle.getOwnerId() <= 0) { - player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC."); + player.sendMessage("You cannot register as a defender because " + _castle.getName() + " is owned by NPC."); return; } @@ -975,7 +975,7 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.setInt(2, clanId); statement.execute(); @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _castle.getName() + ": " + _castle.getSiegeDate().getTime()); loadSiegeClan(); @@ -1028,7 +1028,7 @@ public class Siege implements Siegable { _scheduledStartSiegeTask.cancel(false); } - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } /** @@ -1048,12 +1048,12 @@ public class Siege implements Siegable } case NotOwner: { - players = getPlayersInZone(); + players = _castle.getZone().getPlayersInside(); final Iterator it = players.iterator(); while (it.hasNext()) { final L2PcInstance player = it.next(); - if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId()))) + if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == _castle.getOwnerId()))) { it.remove(); } @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1149,7 +1149,7 @@ public class Siege implements Siegable { player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_5_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE); } - else if (player.getClan().getId() == getCastle().getOwnerId()) + else if (player.getClan().getId() == _castle.getOwnerId()) { player.sendPacket(SystemMessageId.CASTLE_OWNING_CLANS_ARE_AUTOMATICALLY_REGISTERED_ON_THE_DEFENDING_SIDE); } @@ -1243,15 +1243,15 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { - addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER); + addDefender(_castle.getOwnerId(), SiegeClanType.OWNER); } - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); try (ResultSet rs = statement.executeQuery()) { int typeId; @@ -1333,8 +1333,8 @@ public class Siege implements Siegable setNextSiegeDate(); // Set the next set date for 2 weeks from now // Schedule Time registration end getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); - getCastle().setIsTimeRegistrationOver(false); + _castle.getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); + _castle.setIsTimeRegistrationOver(false); saveSiegeDate(); // Save the new date startAutoTask(); // Prepare auto start siege and end registration @@ -1346,16 +1346,16 @@ public class Siege implements Siegable if (_scheduledStartSiegeTask != null) { _scheduledStartSiegeTask.cancel(true); - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ? WHERE id = ?")) { - statement.setLong(1, getSiegeDate().getTimeInMillis()); - statement.setLong(2, getTimeRegistrationOverDate().getTimeInMillis()); - statement.setString(3, String.valueOf(getIsTimeRegistrationOver())); - statement.setInt(4, getCastle().getResidenceId()); + statement.setLong(1, _castle.getSiegeDate().getTimeInMillis()); + statement.setLong(2, _castle.getTimeRegistrationOverDate().getTimeInMillis()); + statement.setString(3, String.valueOf(_castle.getIsTimeRegistrationOver())); + statement.setInt(4, _castle.getResidenceId()); statement.execute(); } catch (Exception e) @@ -1397,7 +1397,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, typeId); statement.execute(); } @@ -1407,7 +1407,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) { statement.setInt(1, typeId); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, clan.getId()); statement.execute(); } @@ -1435,7 +1435,7 @@ public class Siege implements Siegable /** Set the date for the next siege. */ private void setNextSiegeDate() { - final Calendar cal = getCastle().getSiegeDate(); + final Calendar cal = _castle.getSiegeDate(); if (cal.getTimeInMillis() < System.currentTimeMillis()) { cal.setTimeInMillis(System.currentTimeMillis()); @@ -1460,7 +1460,7 @@ public class Siege implements Siegable } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = false; // Allow registration for next siege @@ -1645,7 +1645,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1672,23 +1672,23 @@ public class Siege implements Siegable public final boolean getIsTimeRegistrationOver() { - return getCastle().getIsTimeRegistrationOver(); + return _castle.getIsTimeRegistrationOver(); } @Override public final Calendar getSiegeDate() { - return getCastle().getSiegeDate(); + return _castle.getSiegeDate(); } public final Calendar getTimeRegistrationOverDate() { - return getCastle().getTimeRegistrationOverDate(); + return _castle.getTimeRegistrationOverDate(); } public void endTimeRegistration(boolean automatic) { - getCastle().setIsTimeRegistrationOver(true); + _castle.setIsTimeRegistrationOver(true); if (!automatic) { saveSiegeDate(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java index f09be6765f..ac490ba86d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -129,7 +129,7 @@ public class EventScheduler run(); updateLastRun(); - if (isRepeating()) + if (_repeat) { ThreadPool.schedule(this::startScheduler, 1000); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index eae25b08f7..1d42731b7a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() @@ -46,16 +46,16 @@ public final class MovieHolder public void playerEscapeVote(L2PcInstance player) { - if (getVotedPlayers().contains(player) || !getPlayers().contains(player) || !getMovie().isEscapable()) + if (_votedPlayers.contains(player) || !_players.contains(player) || !_movie.isEscapable()) { return; } - getVotedPlayers().add(player); + _votedPlayers.add(player); - if (((getVotedPlayers().size() * 100) / getPlayers().size()) >= 50) + if (((_votedPlayers.size() * 100) / _players.size()) >= 50) { - getPlayers().forEach(L2PcInstance::stopMovie); + _players.forEach(L2PcInstance::stopMovie); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index a4fde8355e..4bc6353cfa 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -487,7 +487,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return Collections.emptyList(); } @@ -502,7 +502,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } return npcs; } @@ -516,7 +516,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return; } @@ -526,7 +526,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } } @@ -810,7 +810,7 @@ public final class Instance implements IIdentifiable, INamable public void setReenterTime(long time) { // Cannot store reenter data for instance without template id. - if ((getTemplateId() == -1) && (time > 0)) + if ((_template.getId() == -1) && (time > 0)) { return; } @@ -824,7 +824,7 @@ public final class Instance implements IIdentifiable, INamable if (player != null) { ps.setInt(1, player.getObjectId()); - ps.setInt(2, getTemplateId()); + ps.setInt(2, _template.getId()); ps.setLong(3, time); ps.addBatch(); } @@ -835,11 +835,11 @@ public final class Instance implements IIdentifiable, INamable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null) { - msg.addInstanceName(getTemplateId()); + msg.addInstanceName(_template.getId()); } else { - msg.addString(getName()); + msg.addString(_template.getName()); } _allowed.forEach(player -> { @@ -995,7 +995,7 @@ public final class Instance implements IIdentifiable, INamable removePlayer(player); if (Config.RESTORE_PLAYER_INSTANCE) { - player.getVariables().set("INSTANCE_RESTORE", getId()); + player.getVariables().set("INSTANCE_RESTORE", _id); } else { @@ -1161,6 +1161,6 @@ public final class Instance implements IIdentifiable, INamable @Override public String toString() { - return getName() + "(" + getId() + ")"; + return _template.getName() + "(" + _id + ")"; } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 409678ea5a..ba6f5482ad 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -788,6 +788,6 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl @Override public String toString() { - return "ID: " + getId() + " Name: " + getName(); + return "ID: " + _templateId + " Name: " + _name; } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 4ebae030de..24c473792a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -181,12 +181,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -250,7 +250,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -340,7 +340,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5bb5770412..9e94b591e8 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -115,9 +115,9 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - statement.setInt(1, getOwnerId()); + statement.setInt(1, _ownerId); statement.setString(2, getBaseLocation().name()); - statement.setInt(3, getMessageId()); + statement.setInt(3, _messageId); try (ResultSet inv = statement.executeQuery()) { while (inv.next()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index c7a3128aa9..9228d151c2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -150,7 +150,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -211,7 +211,7 @@ public class PcInventory extends Inventory { return getItems(i -> { - if (!i.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) + if (!i.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) { return false; } @@ -232,7 +232,7 @@ public class PcInventory extends Inventory { //@formatter:off return _items.values().stream() - .filter(i -> i.isAvailable(getOwner(), false, false)) + .filter(i -> i.isAvailable(_owner, false, false)) .map(tradeList::adjustAvailableItem) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -689,12 +689,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (getOwner().isProcessingItem(item.getObjectId())) + if (_owner.isProcessingItem(item.getObjectId())) { - getOwner().removeRequestsThatProcessesItem(item.getObjectId()); + _owner.removeRequestsThatProcessesItem(item.getObjectId()); } if (item.getId() == ADENA_ID) @@ -720,7 +720,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(true); + _owner.refreshOverloaded(true); } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 87c35d5d82..fa6332fb1f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -120,7 +120,7 @@ public class PetInventory extends Inventory { if (item.isEquipped()) { - if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (!item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 4c8db6b288..dbba43acd0 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -73,6 +73,6 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index a04975542f..8d988d61be 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -89,7 +89,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java index c86ec8ca9b..5089b53c7f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -411,11 +411,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -430,11 +430,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -528,7 +528,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -585,7 +585,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -776,7 +776,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) { if (isEquipable()) { @@ -789,7 +789,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return false; } - if (isCocRestrictedItem() && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_is_coc_restricted && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 1db19c172a..a0ee0a7895 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -119,7 +119,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 0f9a69fec3..d9baca8329 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -274,7 +274,7 @@ public class AppearanceStone return false; } - switch (getType()) + switch (_type) { case RESTORE: { @@ -383,15 +383,15 @@ public class AppearanceStone return false; } - if (getWeaponType() != WeaponType.NONE) + if (_weaponType != WeaponType.NONE) { - if (!targetItem.isWeapon() || (targetItem.getItemType() != getWeaponType())) + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); return false; } - switch (getHandType()) + switch (_handType) { case ONE_HANDED: { @@ -413,7 +413,7 @@ public class AppearanceStone } } - switch (getMagicType()) + switch (_magicType) { case MAGICAL: { @@ -435,9 +435,9 @@ public class AppearanceStone } } - if (getArmorType() != ArmorType.NONE) + if (_armorType != ArmorType.NONE) { - switch (getArmorType()) + switch (_armorType) { case SHIELD: { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 851ee0b06b..9cd7f326c0 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -328,14 +328,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -344,7 +344,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -366,7 +366,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -482,7 +482,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -504,12 +504,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -519,7 +519,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -542,7 +542,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -559,9 +559,9 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isEnchantable(); + return _item.isEnchantable(); } return 0; } @@ -656,7 +656,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -730,7 +730,7 @@ public final class L2ItemInstance extends L2Object /** * @return the reference price of the item. */ - public int getReferencePrice() + public long getReferencePrice() { return _item.getReferencePrice(); } @@ -880,7 +880,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public final class L2ItemInstance extends L2Object final L2Summon pet = player.getPet(); return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -963,7 +963,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1139,9 +1139,9 @@ public final class L2ItemInstance extends L2Object { if (isWeapon()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - return getItem().getAttributes().stream().findFirst().orElse(null); + return _item.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1167,9 +1167,9 @@ public final class L2ItemInstance extends L2Object { if (isArmor()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - final AttributeHolder attribute = getItem().getAttribute(element); + final AttributeHolder attribute = _item.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1411,7 +1411,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1433,7 +1433,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1615,11 +1615,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1651,12 +1651,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1838,7 +1838,7 @@ public final class L2ItemInstance extends L2Object player.sendInventoryUpdate(iu); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1852,7 +1852,7 @@ public final class L2ItemInstance extends L2Object { player.getWarehouse().destroyItem("L2ItemInstance", this, player, null); } - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(getId())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId)); } } @@ -1949,32 +1949,32 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isElementable(); + return _item.isElementable(); } return false; } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -1991,7 +1991,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && (getItem().getSkills(ItemSkillType.NORMAL) != null); + return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2004,7 +2004,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2025,7 +2025,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2429,7 +2429,15 @@ public final class L2ItemInstance extends L2Object iu.addModifiedItem(this); player.broadcastUserInfo(UserInfoType.APPAREANCE); player.sendInventoryUpdate(iu); - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + + if (isEnchanted()) + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this)); + } + else + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + } } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 4858feb6a9..9a7dbcac0d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/options/Options.java index 813ec8f6db..630038eb77 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/options/Options.java @@ -189,14 +189,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { addSkill(player, holder.getSkill()); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { addSkill(player, holder.getSkill()); } @@ -227,14 +227,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { player.removeSkill(holder.getSkill(), false, false); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { player.removeSkill(holder.getSkill(), false, true); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java index 633c5534f1..b9e803b30a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2740,7 +2740,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2753,9 +2752,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); @@ -2943,7 +2942,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if (activeChar.getQuestState(getName()) != null) { - final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList packet = new ExQuestNpcLogList(_questId); getNpcLogList(activeChar).forEach(packet::add); activeChar.sendPacket(packet); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 40aa1878fd..5e0a66a375 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + _questName + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -755,7 +755,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 4013de0733..1cf9e26073 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,13 +53,13 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; - private final ScheduledFuture _schedular; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; + private final ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) { @@ -68,7 +68,7 @@ public class QuestTimer _player = player; _npc = npc; _isRepeating = repeating; - _schedular = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); + _scheduler = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); } public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) @@ -87,9 +87,9 @@ public class QuestTimer public void cancel() { _isActive = false; - if (_schedular != null) + if (_scheduler != null) { - _schedular.cancel(false); + _scheduler.cancel(false); } } @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java index 73f5ed97a8..81ec17cf73 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -132,7 +132,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -152,7 +152,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + _residenceId, e); } } @@ -173,7 +173,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN ps.setInt(1, func.getId()); ps.setInt(2, func.getLevel()); ps.setLong(3, func.getExpiration()); - ps.setInt(4, getResidenceId()); + ps.setInt(4, _residenceId); ps.setInt(5, func.getLevel()); ps.setLong(6, func.getExpiration()); @@ -181,7 +181,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + _residenceId, e); } finally { @@ -202,13 +202,13 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ? and id = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.setInt(2, func.getId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + _residenceId, e); } finally { @@ -225,12 +225,12 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + _residenceId, e); } finally { @@ -313,6 +313,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + " (" + getResidenceId() + ")"; + return _name + " (" + _residenceId + ")"; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index ab2394ed74..cac8ecf953 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -333,7 +333,7 @@ public final class BuffInfo } // Call on start. - effect.onStart(getEffector(), getEffected(), getSkill()); + effect.onStart(_effector, _effected, _skill); // If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it. if (effect.getTicks() > 0) @@ -360,7 +360,7 @@ public final class BuffInfo if (_isInUse) { // Callback for on action time event. - continueForever = effect.onActionTime(getEffector(), getEffected(), getSkill()); + continueForever = effect.onActionTime(_effector, _effected, _skill); } if (!continueForever && _skill.isToggle()) @@ -369,7 +369,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -391,7 +391,7 @@ public final class BuffInfo // Instant effects shouldn't call onExit(..). if (!effect.isInstant()) { - effect.onExit(getEffector(), getEffected(), getSkill()); + effect.onExit(_effector, _effected, _skill); } } @@ -403,7 +403,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java index 19a1a61b20..1cea15b228 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -240,15 +240,15 @@ public final class Skill implements IIdentifiable _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -441,7 +441,7 @@ public final class Skill implements IIdentifiable } _magicCriticalRate = set.getDouble("magicCriticalRate", 0); - _buffType = isTriggeredSkill() ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : isDebuff() ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; + _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); } @@ -1054,7 +1054,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getMaxSoulConsumeCount() @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable public boolean isStayAfterDeath() { - return _stayAfterDeath || isIrreplacableBuff() || isNecessaryToggle(); + return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle; } public boolean isBad() @@ -1333,7 +1333,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isIgnoringSkillEffects(getId(), getLevel())) + if (effected.isIgnoringSkillEffects(_id, _level)) { return; } @@ -1357,7 +1357,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1368,19 +1368,19 @@ public final class Skill implements IIdentifiable } // Check for mesmerizing debuffs and increase resist level. - if (isDebuff() && (getBasicProperty() != BasicProperty.NONE) && effected.hasBasicPropertyResist()) + if (_isDebuff && (_basicProperty != BasicProperty.NONE) && effected.hasBasicPropertyResist()) { - final BasicPropertyResist resist = effected.getBasicPropertyResist(getBasicProperty()); + final BasicPropertyResist resist = effected.getBasicPropertyResist(_basicProperty); resist.increaseResistLevel(); } } // Support for buff sharing feature including healing herbs. - if (isSharedWithSummon() && effected.isPlayer() && effected.hasServitors() && !isTransformation()) + if (_isSharedWithSummon && effected.isPlayer() && effected.hasServitors() && !isTransformation()) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - effected.getServitors().values().forEach(s -> applyEffects(effector, s, isRecoveryHerb(), 0)); + effected.getServitors().values().forEach(s -> applyEffects(effector, s, _isRecoveryHerb, 0)); } } } @@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1413,7 +1413,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && isSharedWithSummon() && info.getEffected().isPlayer() && isContinuous() && !isDebuff() && info.getEffected().hasServitors()) + if (addContinuousEffects && _isSharedWithSummon && info.getEffected().isPlayer() && isContinuous() && !_isDebuff && info.getEffected().hasServitors()) { info.getEffected().getServitors().values().forEach(s -> applyEffects(effector, s, false, 0)); } @@ -1498,9 +1498,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0, item); } @@ -1517,7 +1517,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1571,7 +1571,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isIrreplacableBuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispelled(); + return !isPassive() && !isToggle() && !_isDebuff && !_irreplacableBuff && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispelled; } public boolean isClanSkill() @@ -1733,20 +1733,20 @@ public final class Skill implements IIdentifiable public Skill getAttachedSkill(L2Character activeChar) { // If character is double casting, return double cast skill. - if ((getDoubleCastSkill() > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) + if ((_doubleCastSkill > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) { return SkillData.getInstance().getSkill(getDoubleCastSkill(), getLevel(), getSubLevel()); } // Default toggle group ID, assume nothing attached. - if ((getAttachToggleGroupId() <= 0) || (getAttachSkills() == null)) + if ((_attachToggleGroupId <= 0) || (_attachSkills == null)) { return null; } //@formatter:off final int toggleSkillId = activeChar.getEffectList().getEffects().stream() - .filter(info -> info.getSkill().getToggleGroupId() == getAttachToggleGroupId()) + .filter(info -> info.getSkill().getToggleGroupId() == _attachToggleGroupId) .mapToInt(info -> info.getSkill().getId()) .findAny().orElse(0); //@formatter:on @@ -1757,7 +1757,7 @@ public final class Skill implements IIdentifiable return null; } - final AttachSkillHolder attachedSkill = getAttachSkills().stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); + final AttachSkillHolder attachedSkill = _attachSkills.stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); // No attached skills for this toggle found. if (attachedSkill == null) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 8e607be078..f5da8aed03 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -99,7 +99,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -160,7 +160,7 @@ public class SkillChannelizer implements Runnable if (o.isCharacter()) { targetList.add((L2Character) o); - ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), _channelizer); } }); } @@ -198,13 +198,13 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer()) + if (character.isPlayable() && _channelizer.isPlayer()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } // Be warned, this method has the possibility to call doDie->abortCast->stopChanneling method. Variable cache above try"+ +" is used in this case to avoid NPEs. - channeledSkill.applyEffects(getChannelizer(), character); + channeledSkill.applyEffects(_channelizer, character); // Reduce shots. if (skill.useSpiritShot()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 84fb8d0f96..3394227e4c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -145,7 +145,7 @@ public final class TeleportHolder // Build html final StringBuilder sb = new StringBuilder(); final StringBuilder sb_f = new StringBuilder(); - for (TeleportLocation loc : getLocations()) + for (TeleportLocation loc : _teleportData) { String finalName = loc.getName(); String confirmDesc = loc.getName(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 66f0ce1b9f..69519245dc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -205,7 +205,7 @@ public abstract class L2ZoneType extends ListenersContainer final Instance world = character.getInstanceWorld(); if (world != null) { - if (world.getTemplateId() != getInstanceTemplateId()) + if (world.getTemplateId() != _instanceTemplateId) { return false; } @@ -214,7 +214,7 @@ public abstract class L2ZoneType extends ListenersContainer return false; } } - else if (getInstanceTemplateId() > 0) + else if (_instanceTemplateId > 0) { return false; } @@ -402,12 +402,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -572,7 +572,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) @@ -605,10 +605,10 @@ public abstract class L2ZoneType extends ListenersContainer { if (_enabledInInstance != null) { - return _enabledInInstance.getOrDefault(instanceId, isEnabled()); + return _enabledInInstance.getOrDefault(instanceId, _enabled); } - return isEnabled(); + return _enabled; } public void oustAllPlayers() @@ -633,7 +633,7 @@ public abstract class L2ZoneType extends ListenersContainer return; } - for (L2Character character : getCharactersInside()) + for (L2Character character : _characterList.values()) { if ((character != null) && character.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 33d3bb8723..6a7479f3af 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public final class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -257,7 +257,7 @@ public final class L2EffectZone extends L2ZoneType { getCharactersInside().forEach(character -> { - if ((character != null) && !character.isDead() && (Rnd.get(100) < getChance())) + if ((character != null) && !character.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index a1a99b7051..95223b63a9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9b786f0b7d..f1e975876e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -252,7 +252,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -533,7 +533,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -603,11 +603,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 8aa642c02a..1c02d43810 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -56,7 +56,7 @@ public final class RequestRecipeItemMakeSelf implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index ba40366a3e..fda43da41c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -79,7 +79,7 @@ public final class RequestRecipeShopMakeItem implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index dad7c7aefa..86324a84a0 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -120,7 +120,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket return; } - final int price = itemInstance.getReferencePrice(); + final long price = itemInstance.getReferencePrice(); if (itemInstance.getReferencePrice() == 0) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_COMBINED); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index b3f8a823c8..ad3f971eda 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -59,7 +59,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); return; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 4fe4ef7d8c..75c44c649d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -54,7 +54,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 97d035b0f3..1d6ef78348 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -62,7 +62,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExShapeShiftingResult.CLOSE); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index a06dff5ebc..9dc3eba861 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -430,7 +430,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java index 1a16f0bd49..934a748fa3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 17f3f7f21b..bda9f2f3e5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -68,7 +68,7 @@ public final class OfflineTradeUtil } default: { - canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isInCraftMode(); + canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isCrafting(); break; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 4911f2826c..e5388f4596 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -240,7 +240,7 @@ public class TaskExecutor */ public void pause() throws UnsupportedOperationException { - if (!canBePaused()) + if (!task.canBePaused()) { throw new UnsupportedOperationException("Pause not supported"); } @@ -276,7 +276,7 @@ public class TaskExecutor */ public void stop() throws UnsupportedOperationException { - if (!canBeStopped()) + if (!task.canBeStopped()) { throw new UnsupportedOperationException("Stop not supported"); } @@ -346,7 +346,7 @@ public class TaskExecutor */ public String getStatusMessage() throws UnsupportedOperationException { - if (!supportsStatusTracking()) + if (!task.supportsStatusTracking()) { throw new UnsupportedOperationException("Status tracking not supported"); } @@ -360,7 +360,7 @@ public class TaskExecutor */ public double getCompleteness() throws UnsupportedOperationException { - if (!supportsCompletenessTracking()) + if (!task.supportsCompletenessTracking()) { throw new UnsupportedOperationException("Completeness tracking not supported"); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java index 85dbd2a34a..7d9ec1824b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java index da20164f21..068a5f1773 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 859128de7b..c90c8127a6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -286,7 +286,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -314,10 +314,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -376,59 +376,59 @@ public abstract class BaseGameServerRegister if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.printf(getBundle().getString("checkingIdInUse") + Config.EOL, _id); + System.out.printf(_bundle.getString("checkingIdInUse") + Config.EOL, _id); if (GameServerTable.getInstance().hasRegisteredGameServerOnId(_id)) { - System.out.println(getBundle().getString("yes")); + System.out.println(_bundle.getString("yes")); if (_force) { - System.out.printf(getBundle().getString("forcingRegistration") + Config.EOL, _id); + System.out.printf(_bundle.getString("forcingRegistration") + Config.EOL, _id); unregisterGameServer(_id); registerGameServer(_id, _outDir); - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, _id); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, _id); } else if (_fallback) { - System.out.println(getBundle().getString("fallingBack")); + System.out.println(_bundle.getString("fallingBack")); final int registeredId = registerFirstAvailable(_outDir); if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.println(getBundle().getString("noAction")); + System.out.println(_bundle.getString("noAction")); } } else { - System.out.println(getBundle().getString("no")); + System.out.println(_bundle.getString("no")); registerGameServer(_id, _outDir); } } } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } catch (IOException e) { - showError(getBundle().getString("ioErrorRegister"), e); + showError(_bundle.getString("ioErrorRegister"), e); } } } @@ -453,14 +453,14 @@ public abstract class BaseGameServerRegister @Override public void run() { - System.out.printf(getBundle().getString("removingGsId") + Config.EOL, _id); + System.out.printf(_bundle.getString("removingGsId") + Config.EOL, _id); try { unregisterGameServer(_id); } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } } } @@ -479,7 +479,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 881d3eb70b..135edbc233 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -530,7 +530,7 @@ public class Q00663_SeductiveWhispers extends Quest @Override public String toString() { - return getSide() == Side.MOON ? "" + getSide().getName() + ": " + getNumber() + "" : "" + getSide().getName() + ": " + getNumber() + ""; + return _side == Side.MOON ? "" + _side.getName() + ": " + _number + "" : "" + _side.getName() + ": " + _number + ""; } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/PacketReader.java index ea90113f43..bdf5c76ac8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java index cad4fb54da..717f999c27 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -608,7 +608,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -648,7 +648,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -680,7 +680,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player)) + if (_actor.isVisibleFor(player)) { if (_clientMoving) { @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (getTarget() instanceof L2Character) && (getIntention() == AI_INTENTION_FOLLOW); + return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); } /** @@ -737,7 +737,7 @@ public abstract class AbstractAI implements Ctrl return; } - final L2Object followTarget = getTarget(); // copy to prevent NPE + final L2Object followTarget = _target; // copy to prevent NPE if (followTarget == null) { if (_actor.isSummon()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8826f4e507..3880807630 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -166,7 +166,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, max_range); } @@ -216,7 +216,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -256,7 +256,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 4f3a018802..0052f4791d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -224,7 +224,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtAttacked(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } @@ -239,7 +239,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtEvaded(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/cache/HtmCache.java index 3127c4156e..265a5a6758 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -66,7 +66,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index 316e1ed757..dd22855ae4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 5aac2716cf..d0cd743b0f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -134,7 +134,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -349,7 +349,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index ff236652e3..c60afbd78a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -48,9 +48,9 @@ public class AttendanceRewardData implements IGameXmlReader { if (Config.ENABLE_ATTENDANCE_REWARDS) { - getRewards().clear(); + _rewards.clear(); parseDatapackFile("data/AttendanceRewards.xml"); - _rewardsCount = getRewards().size(); + _rewardsCount = _rewards.size(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _rewardsCount + " rewards."); } else @@ -73,7 +73,7 @@ public class AttendanceRewardData implements IGameXmlReader } else { - getRewards().add(new ItemHolder(itemId, itemCount)); + _rewards.add(new ItemHolder(itemId, itemCount)); } })); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java index 712d1febdd..6618dcdf1d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java @@ -108,7 +108,7 @@ public final class CastleData implements IGameXmlReader guards.add(new SiegeGuardHolder(castleId, itemId, type, stationary, npcId, npcMaxAmount)); } } - getSiegeGuards().put(castleId, guards); + _siegeGuards.put(castleId, guards); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java index ac3c07c3c9..d5266c07ef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/enums/AttributeType.java @@ -63,7 +63,7 @@ public enum AttributeType */ public AttributeType getOpposite() { - return ATTRIBUTE_TYPES[((getClientId() % 2) == 0) ? (getClientId() + 1) : (getClientId() - 1)]; + return ATTRIBUTE_TYPES[((_clientId % 2) == 0) ? (_clientId + 1) : (_clientId - 1)]; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2615be0ddf..f0275d4660 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 792edf3cba..afc836f427 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -68,7 +68,7 @@ public final class CastleManager implements InstanceListManager if (nearestCastle == null) { double distance; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { distance = castle.getDistance(obj); if (maxDistance > distance) @@ -88,7 +88,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastleByOwner(L2Clan clan) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getOwnerId() == clan.getId()) { @@ -100,7 +100,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(String name) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getName().equalsIgnoreCase(name.trim())) { @@ -112,7 +112,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(int x, int y, int z) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.checkIfInZone(x, y, z)) { @@ -135,7 +135,7 @@ public final class CastleManager implements InstanceListManager public boolean hasOwnedCastle() { boolean hasOwnedCastle = false; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { if (castle.getOwnerId() > 0) { @@ -224,7 +224,7 @@ public final class CastleManager implements InstanceListManager final int castleId = rs.getInt("id"); _castles.put(castleId, new Castle(castleId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCastles().size() + " castles."); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.values().size() + " castles."); } catch (Exception e) { @@ -240,7 +240,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { castle.activateInstance(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index dc63278e16..37f7cd0a21 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -47,7 +47,7 @@ public final class FortManager implements InstanceListManager Fort nearestFort = getFort(obj); if (nearestFort == null) { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { final double distance = fort.getDistance(obj); if (maxDistance > distance) @@ -62,7 +62,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getResidenceId() == fortId) { @@ -74,7 +74,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getOwnerClan() == clan) { @@ -86,7 +86,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -98,7 +98,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.checkIfInZone(x, y, z)) { @@ -131,8 +131,8 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); - for (Fort fort : getForts()) + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.values().size() + " fortress"); + for (Fort fort : _forts.values()) { fort.getSiege().loadSiegeGuard(); } @@ -151,7 +151,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { fort.activateInstance(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 58b75f592d..0b4c7601cb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -102,7 +102,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -115,7 +115,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -128,7 +128,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -141,7 +141,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -159,7 +159,7 @@ public final class MailManager public int getMailsInProgress(int objectId) { int count = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getMailType() == MailType.REGULAR)) { @@ -179,7 +179,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 41216a0555..30581681f4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -244,7 +244,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return (currPetition.getState() == PetitionState.IN_PROCESS); } @@ -252,7 +252,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -283,7 +283,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -302,7 +302,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -312,7 +312,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -330,7 +330,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -363,12 +363,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("

There are no currently pending petitions.
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -379,7 +379,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -419,7 +419,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -440,7 +440,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 964757069c..20b6c07319 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -171,7 +171,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java index 1b0e62c021..83b903b671 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -277,7 +277,7 @@ public final class CharEffectList */ public int getBuffCount() { - return _actives != null ? (_buffCount.intValue() - _hiddenBuffs.get()) : 0; + return _actives != null ? (_buffCount.get() - _hiddenBuffs.get()) : 0; } /** @@ -287,7 +287,7 @@ public final class CharEffectList */ public int getDanceCount() { - return _danceCount.intValue(); + return _danceCount.get(); } /** @@ -297,7 +297,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return _triggerBuffCount.intValue(); + return _triggerBuffCount.get(); } /** @@ -307,7 +307,7 @@ public final class CharEffectList */ public int getToggleCount() { - return _toggleCount.intValue(); + return _toggleCount.get(); } /** @@ -317,7 +317,7 @@ public final class CharEffectList */ public int getDebuffCount() { - return _debuffCount.intValue(); + return _debuffCount.get(); } /** @@ -352,7 +352,7 @@ public final class CharEffectList */ public void stopAllToggles() { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { // Ignore necessary toggles. stopEffects(b -> b.getSkill().isToggle() && !b.getSkill().isNecessaryToggle() && !b.getSkill().isIrreplacableBuff(), true, true); @@ -361,7 +361,7 @@ public final class CharEffectList public void stopAllTogglesOfGroup(int toggleGroup) { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { stopEffects(b -> b.getSkill().isToggle() && (b.getSkill().getToggleGroupId() == toggleGroup), true, true); } @@ -508,7 +508,7 @@ public final class CharEffectList */ public void stopEffectsOnAction() { - if (_hasBuffsRemovedOnAnyAction.intValue() > 0) + if (_hasBuffsRemovedOnAnyAction.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnAnyActionExceptMove(), true, true); } @@ -516,7 +516,7 @@ public final class CharEffectList public void stopEffectsOnDamage() { - if (_hasBuffsRemovedOnDamage.intValue() > 0) + if (_hasBuffsRemovedOnDamage.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnDamage(), true, true); } @@ -535,16 +535,16 @@ public final class CharEffectList { case TRIGGER: { - return (getTriggeredBuffCount() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); + return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); } case DANCE: { - return (getDanceCount() > Config.DANCES_MAX_AMOUNT); + return (_danceCount.get() > Config.DANCES_MAX_AMOUNT); } // case TOGGLE: Do toggles have limit? case DEBUFF: { - return (getDebuffCount() > 24); + return (_debuffCount.get() > 24); } case BUFF: { @@ -1106,7 +1106,7 @@ public final class CharEffectList final Skill skill = info.getSkill(); // Handle hidden buffs. Check if there was such abnormal before so we can continue. - if ((getHiddenBuffsCount() > 0) && _stackedEffects.contains(skill.getAbnormalType())) + if ((_hiddenBuffs.get() > 0) && _stackedEffects.contains(skill.getAbnormalType())) { // If incoming buff isnt hidden, remove any hidden buffs with its abnormal type. if (info.isInUse()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 8de8a2fb0e..2265d6876c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -71,7 +71,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DailyMissionDataHolder.java index ef04df8c87..bc64b48640 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -113,13 +113,13 @@ public class DailyMissionDataHolder public boolean isDisplayable(L2PcInstance player) { // Check if its main class only - if (isMainClassOnly() && (player.isSubClassActive() || player.isDualClassActive())) + if (_isMainClassOnly && (player.isSubClassActive() || player.isDualClassActive())) { return false; } // Check if its dual class only. - if (isDualClassOnly() && !player.isDualClassActive()) + if (_isDualClassOnly && !player.isDualClassActive()) { return false; } @@ -131,13 +131,13 @@ public class DailyMissionDataHolder } final int status = getStatus(player); - if (!isDisplayedWhenNotAvailable() && (status == DailyMissionStatus.NOT_AVAILABLE.getClientId())) + if (!_isDisplayedWhenNotAvailable && (status == DailyMissionStatus.NOT_AVAILABLE.getClientId())) { return false; } // Show only if its repeatable, recently completed or incompleted that has met the checks above. - return (!isOneTime() || getRecentlyCompleted(player) || (status != DailyMissionStatus.COMPLETED.getClientId())); + return (!_isOneTime || getRecentlyCompleted(player) || (status != DailyMissionStatus.COMPLETED.getClientId())); } public void requestReward(L2PcInstance player) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java index 68e1da0a23..8556a75cae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java @@ -110,7 +110,7 @@ public class Fishing public synchronized void startFishing() { - if (isFishing()) + if (_isFishing) { return; } @@ -132,7 +132,7 @@ public class Fishing if (!canFish()) { - if (isFishing()) + if (_isFishing) { _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); } @@ -201,7 +201,7 @@ public class Fishing _baitLocation = calculateBaitLocation(); if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null)) { - if (isFishing()) + if (_isFishing) { // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -262,7 +262,7 @@ public class Fishing private void reelIn(FishingEndReason reason, boolean consumeBait) { - if (!isFishing()) + if (!_isFishing) { return; } @@ -326,7 +326,7 @@ public class Fishing public synchronized void stopFishing(FishingEndType endType) { - if (isFishing()) + if (_isFishing) { reelIn(FishingEndReason.STOP, false); _isFishing = false; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index ec834bcb34..c05e0915be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -177,7 +177,7 @@ public final class L2ArmorSet public int getLowestSetEnchant(L2PcInstance player) { // Player don't have full set - if (getPiecesCount(player, L2ItemInstance::getId) < getMinimumPieces()) + if (getPiecesCount(player, L2ItemInstance::getId) < _minimumPieces) { return 0; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java index 46a329c1a0..091545ed6f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -170,7 +170,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); final ClanRewardBonus availableOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(this); if ((_lastMembersOnlineBonus == null) && (availableOnlineBonus != null)) @@ -242,7 +242,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -278,7 +278,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - LOGGER.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + _name + " without clan leader!"); return ""; } return _leader.getName(); @@ -570,7 +570,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -608,7 +608,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -628,7 +628,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -882,8 +882,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -926,8 +926,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -942,8 +942,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -978,15 +978,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1015,19 +1015,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1071,7 +1071,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1084,12 +1084,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1109,7 +1109,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1146,7 +1146,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1177,7 +1177,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1237,7 +1237,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1364,7 +1364,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1372,7 +1372,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1612,7 +1612,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1765,7 +1765,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1855,7 +1855,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); return null; @@ -1864,7 +1864,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1879,11 +1879,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1949,7 +1949,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1965,7 +1965,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2014,7 +2014,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2026,7 +2026,7 @@ public class L2Clan implements IIdentifiable, INamable LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } - for (L2ClanMember cm : getMembers()) + for (L2ClanMember cm : _members.values()) { if (cm.isOnline()) { @@ -2050,7 +2050,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2090,12 +2090,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2169,7 +2169,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2206,7 +2206,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2238,7 +2238,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2390,22 +2390,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2426,7 +2426,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2439,12 +2439,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2483,7 +2483,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2491,7 +2491,7 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; - switch (getLevel()) + switch (_level) { case 0: { @@ -2589,9 +2589,9 @@ public class L2Clan implements IIdentifiable, INamable case 5: { // Upgrade to 6 - if ((getReputationScore() >= Config.CLAN_LEVEL_6_COST) && (getMembersCount() >= Config.CLAN_LEVEL_6_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_6_COST) && (_members.size() >= Config.CLAN_LEVEL_6_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_6_COST); player.sendPacket(cr); @@ -2602,9 +2602,9 @@ public class L2Clan implements IIdentifiable, INamable case 6: { // Upgrade to 7 - if ((getReputationScore() >= Config.CLAN_LEVEL_7_COST) && (getMembersCount() >= Config.CLAN_LEVEL_7_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_7_COST) && (_members.size() >= Config.CLAN_LEVEL_7_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_7_COST); player.sendPacket(cr); @@ -2615,9 +2615,9 @@ public class L2Clan implements IIdentifiable, INamable case 7: { // Upgrade to 8 - if ((getReputationScore() >= Config.CLAN_LEVEL_8_COST) && (getMembersCount() >= Config.CLAN_LEVEL_8_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_8_COST) && (_members.size() >= Config.CLAN_LEVEL_8_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_8_COST); player.sendPacket(cr); @@ -2628,12 +2628,12 @@ public class L2Clan implements IIdentifiable, INamable case 8: { // Upgrade to 9 - if ((getReputationScore() >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (getMembersCount() >= Config.CLAN_LEVEL_9_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT)) { // itemId 9910 == Blood Oath if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_9_COST); player.sendPacket(cr); @@ -2649,12 +2649,12 @@ public class L2Clan implements IIdentifiable, INamable case 9: { // Upgrade to 10 - if ((getReputationScore() >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (getMembersCount() >= Config.CLAN_LEVEL_10_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (_members.size() >= Config.CLAN_LEVEL_10_REQUIREMENT)) { // itemId 9911 == Blood Alliance if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_10_COST); player.sendPacket(cr); @@ -2670,9 +2670,9 @@ public class L2Clan implements IIdentifiable, INamable case 10: { // Upgrade to 11 - if ((getReputationScore() >= Config.CLAN_LEVEL_11_COST) && (getMembersCount() >= Config.CLAN_LEVEL_11_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_11_COST) && (_members.size() >= Config.CLAN_LEVEL_11_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_11_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINT_S_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION); cr.addInt(Config.CLAN_LEVEL_11_COST); player.sendPacket(cr); @@ -2699,7 +2699,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendItemList(false); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2712,7 +2712,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2722,9 +2722,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2747,7 +2747,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2758,12 +2758,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2780,15 +2780,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2830,7 +2830,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2841,12 +2841,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -3116,7 +3116,7 @@ public class L2Clan implements IIdentifiable, INamable getVariables().set("PREVIOUS_HUNTING_POINTS", getHuntingPoints()); // Reset - getMembers().forEach(L2ClanMember::resetBonus); + _members.values().forEach(L2ClanMember::resetBonus); getVariables().remove("HUNTING_POINTS"); // force store @@ -3134,7 +3134,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_vars == null) { - _vars = new ClanVariables(getId()); + _vars = new ClanVariables(_clanId); if (Config.CLAN_VARIABLES_STORE_INTERVAL > 0) { ThreadPool.scheduleAtFixedRate(this::storeVariables, Config.CLAN_VARIABLES_STORE_INTERVAL, Config.CLAN_VARIABLES_STORE_INTERVAL); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ClanMember.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ClanMember.java index 139c302ce9..1ae5225355 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ClanMember.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2ClanMember.java @@ -855,7 +855,6 @@ public class L2ClanMember private PlayerVariables getVariables() { - final L2PcInstance player = getPlayerInstance(); - return player != null ? player.getVariables() : new PlayerVariables(_objectId); + return _player != null ? _player.getVariables() : new PlayerVariables(_objectId); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index d91e7e0554..df5da1b8ba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Crest.java index dc3c3497a3..24eedf1679 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,42 +94,41 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - final byte[] data = getData(); - if (data != null) + if (_data != null) { for (int i = 0; i <= 4; i++) { if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); - activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); + System.arraycopy(_data, (14336 * i), fullChunk, 0, 14336); + activeChar.sendPacket(new ExPledgeEmblem(_id, fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); - activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); + System.arraycopy(_data, (14336 * i), lastChunk, 0, 8320); + activeChar.sendPacket(new ExPledgeEmblem(_id, lastChunk, 0, i)); } } } - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java index a1eb3d2480..5c086b9d83 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -52,7 +52,7 @@ public class L2Mentee try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT char_name, level, base_class FROM characters WHERE charId = ?")) { - statement.setInt(1, getObjectId()); + statement.setInt(1, _objectId); try (ResultSet rset = statement.executeQuery()) { if (rset.next()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java index 171ad1e543..70a2a9e6e2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Object.java @@ -148,15 +148,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -180,7 +175,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -242,7 +237,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -632,7 +627,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get()); } /** @@ -680,13 +675,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -781,7 +775,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -806,7 +800,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -880,19 +874,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -904,6 +897,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java index 9636853228..d01a52009e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java @@ -168,7 +168,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -195,7 +195,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -260,7 +260,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -279,7 +279,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -294,7 +294,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -305,14 +305,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if (pMember != null) { @@ -333,7 +333,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -357,7 +357,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -439,7 +439,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(target, tacticalSignId)); m.sendPacket(sm); @@ -450,7 +450,7 @@ public class L2Party extends AbstractPlayerGroup // Sign already assigned // If the sign is applied on the same target, remove it _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); + _members.forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); } else { @@ -462,7 +462,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); @@ -502,19 +502,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isInDuel()) @@ -573,25 +573,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(ExCloseMPCC.STATIC_PACKET); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -653,7 +653,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -663,9 +663,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -800,7 +800,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -930,11 +930,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2SiegeClan.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2SiegeClan.java index 2ba2a8a219..57266247c3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2SiegeClan.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2SiegeClan.java @@ -53,12 +53,12 @@ public class L2SiegeClan flag.deleteMe(); - return getFlag().remove(flag); + return _flags.remove(flag); } public void removeFlags() { - for (L2Npc flag : getFlag()) + for (L2Npc flag : _flags) { removeFlag(flag); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java index 1b7cb26b50..f36fed74eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -511,7 +511,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocz = loc.getZ(); setLocation(loc); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -519,9 +519,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -539,16 +539,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } // Set custom Npc server side name and title @@ -670,7 +670,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } public final boolean getRandomWalking() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 97608b326d..4a88a92311 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java index 4b5e290517..3794527a37 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Location.java @@ -190,6 +190,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java index 4eb38cf27b..ef36048457 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -136,16 +136,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -200,12 +200,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + int choice = Rnd.nextInt(getMobs().size()); for (L2ControllableMobInstance mob : getMobs()) { if (--choice == 0) @@ -220,7 +220,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroupTable.java index da1b620a40..121e34e9c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Petition.java index cbed80441a..ff4816d7ef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java index 5799628a4b..e9a73532b4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/TradeList.java @@ -150,11 +150,7 @@ public class TradeList { if (exclItem.getItem().getId() == item.getId()) { - if (item.getCount() <= exclItem.getCount()) - { - return null; - } - return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice()); + return item.getCount() <= exclItem.getCount() ? null : new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice()); } } } @@ -201,7 +197,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -215,13 +211,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -271,7 +267,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -318,7 +314,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -441,11 +437,7 @@ public class TradeList { partnerList.lock(); lock(); - if (!partnerList.validate()) - { - return false; - } - if (!validate()) + if (!partnerList.validate() || !validate()) { return false; } @@ -617,15 +609,15 @@ public class TradeList boolean success = false; // check weight and slots - if ((!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) + if ((!_owner.getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if ((!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) + else if ((!_owner.getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -634,7 +626,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -659,7 +651,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -715,7 +707,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; @@ -880,11 +872,7 @@ public class TradeList // Send inventory update packet _owner.sendInventoryUpdate(ownerIU); player.sendInventoryUpdate(playerIU); - if (ok) - { - return 0; - } - return 2; + return ok ? 0 : 2; } /** @@ -895,12 +883,7 @@ public class TradeList */ public synchronized boolean privateStoreSell(L2PcInstance player, ItemRequest[] requestedItems) { - if (_locked) - { - return false; - } - - if (!_owner.isOnline() || !player.isOnline()) + if (_locked || !_owner.isOnline() || !player.isOnline()) { return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 5a9fc58f63..2787a91e5f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -208,7 +208,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -239,7 +239,7 @@ public class L2Attackable extends L2Npc addDamage(attacker, (int) value, skill); // Check Raidboss attack. Character will be petrified if attacking a raid that's more than 8 levels lower. In retail you deal damage to raid before curse. - if (isRaid() && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) + if (_isRaid && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) { if (attacker.getLevel() > (getLevel() + 8)) { @@ -386,7 +386,7 @@ public class L2Attackable extends L2Npc } // Calculate raidboss points - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final L2PcInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer(); broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); @@ -480,7 +480,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -489,8 +489,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -515,7 +515,7 @@ public class L2Attackable extends L2Npc } clan.addHuntingPoints(attacker, this, finalExp); } - attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, isRaid()), true, false); + attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp); } } @@ -592,7 +592,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -603,8 +603,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -984,7 +984,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1036,7 +1036,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); sm.addString(getName()); @@ -1048,7 +1048,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) + if (Config.CHAMPION_ENABLE && _champion && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY); final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty); @@ -1230,7 +1230,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() != _spoilerObjectId) && !sweeper.isInLooterParty(_spoilerObjectId)) { if (sendMessage) { @@ -1384,7 +1384,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1458,7 +1458,7 @@ public class L2Attackable extends L2Npc if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (isMonster() && !getTemplate().isUndying() && !_isRaid && !_isRaidMinion && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -1683,7 +1683,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b8662c6e57..a5d7f51aa7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -499,13 +499,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public double getCollisionRadius() { - final double defaultCollisionRadius = getTemplate().getCollisionRadius(); + final double defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } public double getCollisionHeight() { - final double defaultCollisionHeight = getTemplate().getCollisionHeight(); + final double defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -530,7 +530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -550,9 +550,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Stop on creature see task and clear the data @@ -584,7 +584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -649,8 +649,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -703,8 +703,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // HP - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); - su.addUpdate(StatusUpdateType.CUR_HP, (int) getCurrentHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); + su.addUpdate(StatusUpdateType.CUR_HP, (int) _status.getCurrentHp()); // MP computeStatusUpdate(su, StatusUpdateType.MAX_MP); @@ -1053,7 +1053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe mpConsume = weaponItem.getReducedMpConsume(); } mpConsume = isAffected(EffectFlag.CHEAPSHOT) ? 0 : mpConsume; - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1065,7 +1065,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } } } @@ -1073,7 +1073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final WeaponType attackType = getAttackType(); final boolean isTwoHanded = (weaponItem != null) && (weaponItem.getBodyPart() == L2Item.SLOT_LR_HAND); - final int timeAtk = Formulas.calculateTimeBetweenAttacks(getPAtkSpd()); + final int timeAtk = Formulas.calculateTimeBetweenAttacks(_stat.getPAtkSpd()); final int timeToHit = Formulas.calculateTimeToHit(timeAtk, weaponType, isTwoHanded, false); _attackEndTime = System.nanoTime() + (TimeUnit.MILLISECONDS.toNanos(timeAtk)); @@ -1196,12 +1196,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackCountMax = (int) getStat().getValue(Stats.ATTACK_COUNT_MAX, 1); - if ((attackCountMax > 1) && !(getStat().getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) + int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1); + if ((attackCountMax > 1) && !(_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) { final double headingAngle = Util.convertHeadingToDegree(getHeading()); - final int maxRadius = getStat().getPhysicalAttackRadius(); - final int physicalAttackAngle = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRadius(); + final int physicalAttackAngle = _stat.getPhysicalAttackAngle(); for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius)) { // Skip main target. @@ -1251,7 +1251,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss) { shld = Formulas.calcShldUse(this, target); - crit = Formulas.calcCrit(getStat().getCriticalHit(), this, target, null); + crit = Formulas.calcCrit(_stat.getCriticalHit(), this, target, null); damage = (int) Formulas.calcAutoAttackDamage(this, target, shld, crit, shotConsumed); if (halfDamage) { @@ -1294,7 +1294,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Try casting the skill - final SkillCaster skillCaster = SkillCaster.castSkill(this, getTarget(), skill, item, castingType, ctrlPressed, shiftPressed); + final SkillCaster skillCaster = SkillCaster.castSkill(this, _target, skill, item, castingType, ctrlPressed, shiftPressed); if ((skillCaster == null) && isPlayer()) { // Skill casting failed, notify player. @@ -1612,7 +1612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); if (isMonster()) { @@ -1676,9 +1676,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Remove all effects, do not broadcast changes. @@ -1696,26 +1696,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -1855,7 +1855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; } public final boolean isConfused() @@ -1915,7 +1915,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return hasBlockActions() || isRooted() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting(); + return hasBlockActions() || isRooted() || _isOverloaded || _isImmobilized || isAlikeDead() || _isTeleporting; } public final boolean isOverloaded() @@ -1934,7 +1934,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2023,7 +2023,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2048,7 +2048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2379,7 +2379,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.STUN); + _effectList.stopEffects(AbnormalType.STUN); } if (!isPlayer()) @@ -2402,11 +2402,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.TRANSFORM); - getEffectList().stopEffects(AbnormalType.CHANGEBODY); + _effectList.stopEffects(AbnormalType.TRANSFORM); + _effectList.stopEffects(AbnormalType.CHANGEBODY); } - if (isTransformed()) + if (_transform.isPresent()) { untransform(); } @@ -2517,7 +2517,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet. - if (isMoving() && (getMoveSpeed() <= 0)) + if (isMoving() && (_stat.getMoveSpeed() <= 0)) { stopMove(null); } @@ -2585,7 +2585,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxCp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp()); } break; } @@ -2597,7 +2597,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); } break; } @@ -2609,7 +2609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxMp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp()); } break; } @@ -2682,7 +2682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2924,7 +2924,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided @@ -2940,7 +2940,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -3147,7 +3147,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -3174,7 +3174,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -3252,7 +3252,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -3381,7 +3381,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -3428,7 +3428,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -3623,7 +3623,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void onHitTimeNotDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3652,7 +3652,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onFirstHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime, int delayForSecondAttack) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3682,7 +3682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onSecondHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime1, int hitTime2, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3970,10 +3970,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Stop all effects of that skill if (oldSkill.isPassive()) { - getEffectList().stopSkillEffects(true, oldSkill); + _effectList.stopSkillEffects(true, oldSkill); } - getStat().recalculateStats(true); + _stat.recalculateStats(true); } if (newSkill.isPassive()) @@ -4008,7 +4008,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) { stopSkillEffects(true, oldSkill.getId()); - getStat().recalculateStats(true); + _stat.recalculateStats(true); } } @@ -4105,7 +4105,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - final int random = (int) getStat().getValue(Stats.RANDOM_DAMAGE); + final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE); return (1 + ((double) Rnd.get(-random, random) / 100)); } @@ -4127,193 +4127,193 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public int getMagicAccuracy() { - return getStat().getMagicAccuracy(); + return _stat.getMagicAccuracy(); } public int getMagicEvasionRate() { - return getStat().getMagicEvasionRate(); + return _stat.getMagicEvasionRate(); } public final double getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(int init) { - return getStat().getCriticalDmg(init); + return _stat.getCriticalDmg(init); } public int getCriticalHit() { - return getStat().getCriticalHit(); + return _stat.getCriticalHit(); } public int getEvasionRate() { - return getStat().getEvasionRate(); + return _stat.getEvasionRate(); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public int getMAtk() { - return getStat().getMAtk(); + return _stat.getMAtk(); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit() { - return getStat().getMCriticalHit(); + return _stat.getMCriticalHit(); } public int getMDef() { - return getStat().getMDef(); + return _stat.getMDef(); } public int getPAtk() { - return getStat().getPAtk(); + return _stat.getPAtk(); } public int getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public int getPDef() { - return getStat().getPDef(); + return _stat.getPDef(); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } public int getLUC() { - return getStat().getLUC(); + return _stat.getLUC(); } public int getCHA() { - return getStat().getCHA(); + return _stat.getCHA(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) @@ -4338,7 +4338,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // RearDamage effect bonus. if (isBehind(target)) { - damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1); } // Counterattacks happen before damage received. @@ -4383,27 +4383,27 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Absorb HP from the damage inflicted double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1); - if ((absorbPercent > 0) && (Rnd.nextDouble() < getStat().getValue(Stats.ABSORB_DAMAGE_CHANCE))) + if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE))) { - int absorbDamage = (int) Math.min(absorbPercent * damage, getMaxRecoverableHp() - getCurrentHp()); + int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp()); if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted. Unconfirmed for skill attacks. if (skill == null) { - absorbPercent = getStat().getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); + absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); if (absorbPercent > 0) { - int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, getMaxRecoverableMp() - getCurrentMp()); + int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp()); if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } } @@ -4448,7 +4448,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - final double damageCap = getStat().getValue(Stats.DAMAGE_LIMIT); + final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT); if (damageCap > 0) { value = Math.min(value, damageCap); @@ -4459,17 +4459,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + getStat().getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; } else { - value *= (100 + getStat().getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; } } if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } else if (isPlayer()) { @@ -4477,7 +4477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } if (attacker != null) @@ -4488,83 +4488,83 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final int getCurrentCpPercent() { - return (int) ((getCurrentCp() * 100) / getMaxCp()); + return (int) ((_status.getCurrentCp() * 100) / _stat.getMaxCp()); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final void setCurrentCp(double newCp, boolean broadcast) { - getStatus().setCurrentCp(newCp, broadcast); + _status.setCurrentCp(newCp, broadcast); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final int getCurrentHpPercent() { - return (int) ((getCurrentHp() * 100) / getMaxHp()); + return (int) ((_status.getCurrentHp() * 100) / _stat.getMaxHp()); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHp(double newHp, boolean broadcast) { - getStatus().setCurrentHp(newHp, broadcast); + _status.setCurrentHp(newHp, broadcast); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final int getCurrentMpPercent() { - return (int) ((getCurrentMp() * 100) / getMaxMp()); + return (int) ((_status.getCurrentMp() * 100) / _stat.getMaxMp()); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } public final void setCurrentMp(double newMp, boolean broadcast) { - getStatus().setCurrentMp(newMp, false); + _status.setCurrentMp(newMp, false); } /** @@ -4577,7 +4577,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); - return (int) getStat().getValue(Stats.WEIGHT_LIMIT, baseLoad); + return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad); } return 0; } @@ -4586,7 +4586,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (isPlayer() || isPet()) { - return (int) getStat().getValue(Stats.WEIGHT_PENALTY, 1); + return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1); } return 0; } @@ -4623,17 +4623,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public AttributeType getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(AttributeType attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(AttributeType defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -4852,8 +4852,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return weapon.getItemType(); } - final WeaponType defaultWeaponType = getTemplate().getBaseAttackType(); - return getTransformation().map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); + final WeaponType defaultWeaponType = _template.getBaseAttackType(); + return _transform.map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); } public final boolean isInCategory(CategoryType type) @@ -5001,7 +5001,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).collect(Collectors.toList()); + return _skillCasters.values().stream().filter(filter).collect(Collectors.toList()); } @SafeVarargs @@ -5012,7 +5012,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).findAny().orElse(null); + return _skillCasters.values().stream().filter(filter).findAny().orElse(null); } /** @@ -5098,7 +5098,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -5128,7 +5128,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override @@ -5200,7 +5200,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean hasAbnormalType(AbnormalType abnormalType) { - return getEffectList().hasAbnormalType(abnormalType); + return _effectList.hasAbnormalType(abnormalType); } public void addBlockActionsAllowedSkill(int skillId) @@ -5267,11 +5267,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public MoveType getMoveType() { - if (isMoving() && isRunning()) + if (isMoving() && _isRunning) { return MoveType.RUNNING; } - else if (isMoving() && !isRunning()) + else if (isMoving() && !_isRunning) { return MoveType.WALKING; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 71cc537769..433cfdd815 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -372,7 +372,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -514,7 +514,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -745,7 +745,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -925,7 +925,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getReputation() >= 0)) @@ -999,10 +999,9 @@ public class L2Npc extends L2Character DecayTaskManager.getInstance().add(this); - final L2Spawn spawn = getSpawn(); - if (spawn != null) + if (_spawn != null) { - final NpcSpawnTemplate npcTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcTemplate = _spawn.getNpcSpawnTemplate(); if (npcTemplate != null) { npcTemplate.notifyNpcDeath(this, killer); @@ -1140,7 +1139,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1228,7 +1227,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1299,7 +1298,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1318,7 +1317,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1394,7 +1393,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic, boolean fish) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1474,7 +1473,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** @@ -1784,10 +1783,9 @@ public class L2Npc extends L2Character return _params; } - final L2Spawn spawn = getSpawn(); - if (spawn != null) // Minions doesn't have L2Spawn object bound + if (_spawn != null) // Minions doesn't have L2Spawn object bound { - final NpcSpawnTemplate npcSpawnTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { final StatsSet params = getTemplate().getParameters(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index a103c9edc4..983a499cad 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -118,15 +118,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -196,7 +196,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if (player == getOwner()) + if (player == _owner) { player.sendPacket(new PetInfo(this, 1)); return; @@ -242,19 +242,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getReputation() { - return getOwner() != null ? getOwner().getReputation() : 0; + return _owner != null ? _owner.getReputation() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -313,8 +313,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -326,7 +325,7 @@ public abstract class L2Summon extends L2Playable final AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -392,7 +391,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); } @@ -434,12 +433,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } @@ -477,7 +476,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -546,7 +545,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, L2ItemInstance item, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -654,7 +653,7 @@ public abstract class L2Summon extends L2Playable if (skill.isBad()) { // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; @@ -673,7 +672,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -695,13 +694,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (crit) { @@ -715,14 +714,14 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } final SystemMessage sm; - if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF))) + if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF))) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } @@ -744,7 +743,7 @@ public abstract class L2Summon extends L2Playable { super.reduceCurrentHp(damage, attacker, skill); - if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) + if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -757,14 +756,13 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); - if ((skill.getTarget(this, false, false, false) == null) && !actingPlayer.getAccessLevel().allowPeaceAttack()) + if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance - actingPlayer.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + _owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // Send a Server->Client packet ActionFailed to the L2PcInstance - actingPlayer.sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -774,18 +772,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -796,10 +794,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } } @@ -807,7 +805,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -842,7 +840,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, isDead() ? 0 : 1)); if (isPet()) @@ -870,7 +868,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -904,7 +902,7 @@ public abstract class L2Summon extends L2Playable */ public void doAttack(L2Object target) { - if (getOwner() != null) + if (_owner != null) { if (target != null) { @@ -912,7 +910,7 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -926,12 +924,12 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(L2Object target, boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - if ((target == null) || (this == target) || (getOwner() == target)) + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -940,7 +938,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -960,28 +958,28 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -994,7 +992,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1014,18 +1012,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1041,14 +1039,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1059,7 +1057,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1071,14 +1069,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1086,13 +1084,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() @@ -1144,7 +1142,7 @@ public abstract class L2Summon extends L2Playable public void sendInventoryUpdate(InventoryUpdate iu) { - final L2PcInstance owner = getOwner(); + final L2PcInstance owner = _owner; if (owner != null) { owner.sendInventoryUpdate(iu); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index fe1f4c81cf..a03a262e08 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -74,7 +74,7 @@ public class PcAppearance { if (_visibleName == null) { - return getOwner().getName(); + return _owner.getName(); } return _visibleName; } @@ -94,7 +94,7 @@ public class PcAppearance { if (_visibleTitle == null) { - return getOwner().getTitle(); + return _owner.getTitle(); } return _visibleTitle; } @@ -220,27 +220,27 @@ public class PcAppearance public int getVisibleClanId() { - return _visibleClanId != -1 ? _visibleClanId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanId(); + return _visibleClanId != -1 ? _visibleClanId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanId(); } public int getVisibleClanCrestId() { - return _visibleClanCrestId != -1 ? _visibleClanCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestId(); + return _visibleClanCrestId != -1 ? _visibleClanCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestId(); } public int getVisibleClanLargeCrestId() { - return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestLargeId(); + return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestLargeId(); } public int getVisibleAllyId() { - return _visibleAllyId != -1 ? _visibleAllyId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyId(); + return _visibleAllyId != -1 ? _visibleAllyId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyId(); } public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 91548e2a10..7aae137ada 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -53,7 +53,7 @@ public class L2DecoyInstance extends L2Character _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; final int skilllevel = getTemplate().getDisplayId() - 13070; - _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); + _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -269,18 +269,18 @@ public class L2DecoyInstance extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index baab09b858..d82f30b44d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class L2DoorInstance extends L2Character { - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isInverted = false; private int _meshindex = 1; @@ -293,7 +293,7 @@ public final class L2DoorInstance extends L2Character { return false; } - else if (getIsAttackableDoor()) + else if (_isAttackableDoor) { return true; } @@ -369,13 +369,13 @@ public final class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - oe = new OnEventTrigger(getEmitter(), !isOpen()); + oe = new OnEventTrigger(getEmitter(), !_open); } else { - oe = new OnEventTrigger(getEmitter(), isOpen()); + oe = new OnEventTrigger(getEmitter(), _open); } } @@ -592,13 +592,13 @@ public final class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), !isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), !_open)); } else { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), _open)); } } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -649,7 +649,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -661,8 +661,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -671,7 +670,7 @@ public final class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 35cb265650..53df3b876a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -75,7 +75,7 @@ public class L2MonsterInstance extends L2Attackable } // Check if the L2MonsterInstance target is aggressive - if (Config.GUARD_ATTACK_AGGRO_MOB && isAggressive() && (attacker instanceof L2GuardInstance)) + if (Config.GUARD_ATTACK_AGGRO_MOB && getTemplate().isAggressive() && (attacker instanceof L2GuardInstance)) { return true; } @@ -108,11 +108,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -173,9 +173,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -229,7 +229,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -238,7 +238,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 790cd68824..aafe0c77ea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -925,7 +925,7 @@ public final class L2PcInstance extends L2Playable public String getAccountName() { - return _client == null ? getAccountNamePlayer() : _client.getAccountName(); + return _client == null ? _accountName : _client.getAccountName(); } public String getAccountNamePlayer() @@ -942,7 +942,7 @@ public final class L2PcInstance extends L2Playable { int result = 0; - if (getClan() != null) + if (_clan != null) { result |= RelationChanged.RELATION_CLAN_MEMBER; if (getClan() == target.getClan()) @@ -961,9 +961,9 @@ public final class L2PcInstance extends L2Playable if ((getParty() != null) && (getParty() == target.getParty())) { result |= RelationChanged.RELATION_HAS_PARTY; - for (int i = 0; i < getParty().getMembers().size(); i++) + for (int i = 0; i < _party.getMembers().size(); i++) { - if (getParty().getMembers().get(i) != this) + if (_party.getMembers().get(i) != this) { continue; } @@ -1017,7 +1017,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getSiegeState() != 0) + if (_siegeState != 0) { result |= RelationChanged.RELATION_INSIEGE; if (getSiegeState() != target.getSiegeState()) @@ -1028,7 +1028,7 @@ public final class L2PcInstance extends L2Playable { result |= RelationChanged.RELATION_ALLY; } - if (getSiegeState() == 1) + if (_siegeState == 1) { result |= RelationChanged.RELATION_ATTACKER; } @@ -1044,7 +1044,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getBlockCheckerArena() != -1) + if (_handysBlockCheckerEventArena != -1) { result |= RelationChanged.RELATION_INSIEGE; final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); @@ -1244,7 +1244,7 @@ public final class L2PcInstance extends L2Playable public boolean isInStoreMode() { - return getPrivateStoreType() != PrivateStoreType.NONE; + return _privateStoreType != PrivateStoreType.NONE; } public boolean isCrafting() @@ -1331,7 +1331,7 @@ public final class L2PcInstance extends L2Playable LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) { @@ -1464,13 +1464,13 @@ public final class L2PcInstance extends L2Playable return; } - final L2Npc target = getLastFolkNPC(); + final L2Npc target = _lastFolkNpc; if ((target != null) && isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false)) { quest.notifyEvent(event, target, this); } - else if (getLastQuestNpcObject() > 0) + else if (_questNpcObject > 0) { final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); @@ -1671,7 +1671,7 @@ public final class L2PcInstance extends L2Playable @Override public void updatePvPFlag(int value) { - if (getPvpFlag() == value) + if (_pvpFlag == value) { return; } @@ -1689,7 +1689,7 @@ public final class L2PcInstance extends L2Playable if (hasSummon()) { final RelationChanged rc = new RelationChanged(); - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, getRelation(this), false); @@ -1716,7 +1716,7 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, relation, isAutoAttackable(player)); @@ -2097,12 +2097,12 @@ public final class L2PcInstance extends L2Playable return; } - final CrystalType expertiseLevel = getExpertiseLevel().plusLevel(getExpertisePenaltyBonus()); + final CrystalType expertiseLevel = _expertiseLevel.plusLevel(_expertisePenaltyBonus); int armorPenalty = 0; int weaponPenalty = 0; - for (L2ItemInstance item : getInventory().getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getItem().getCrystalType().isGreater(expertiseLevel))) + for (L2ItemInstance item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getItem().getCrystalType().isGreater(expertiseLevel))) { if (item.isArmor()) { @@ -2118,7 +2118,7 @@ public final class L2PcInstance extends L2Playable boolean changed = false; - if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) + if ((_expertiseWeaponPenalty != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) { _expertiseWeaponPenalty = weaponPenalty; if (_expertiseWeaponPenalty > 0) @@ -2132,7 +2132,7 @@ public final class L2PcInstance extends L2Playable changed = true; } - if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) + if ((_expertiseArmorPenalty != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) { _expertiseArmorPenalty = armorPenalty; if (_expertiseArmorPenalty > 0) @@ -2176,20 +2176,20 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - final int slot = getInventory().getSlotFromItem(item); + final int slot = _inventory.getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { - items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + items = _inventory.unEquipItemInSlotAndRecord(item.getLocationSlot()); } else { - items = getInventory().unEquipItemInBodySlotAndRecord(slot); + items = _inventory.unEquipItemInBodySlotAndRecord(slot); } } else { - items = getInventory().equipItemAndRecord(item); + items = _inventory.equipItemAndRecord(item); if (item.isEquipped()) { @@ -2301,7 +2301,7 @@ public final class L2PcInstance extends L2Playable */ public void increaseRaidbossPoints(int increasePoints) { - setRaidbossPoints(getRaidbossPoints() + increasePoints); + setRaidbossPoints(_raidbossPoints + increasePoints); } /** @@ -2327,17 +2327,17 @@ public final class L2PcInstance extends L2Playable { if ((getLvlJoinedAcademy() != 0) && (_clan != null) && CategoryData.getInstance().isInCategory(CategoryType.THIRD_CLASS_GROUP, Id)) { - if (getLvlJoinedAcademy() <= 16) + if (_lvlJoinedAcademy <= 16) { _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); } - else if (getLvlJoinedAcademy() >= 39) + else if (_lvlJoinedAcademy >= 39) { _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -2349,7 +2349,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES); // receive graduation gift - getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet + _inventory.addItem("Gift", 8181, 1, this, null); // give academy circlet } if (isSubClassActive()) { @@ -2370,12 +2370,12 @@ public final class L2PcInstance extends L2Playable // Update class icon in party and clan if (isInParty()) { - getParty().broadcastPacket(new PartySmallWindowUpdate(this, true)); + _party.broadcastPacket(new PartySmallWindowUpdate(this, true)); } - if (getClan() != null) + if (_clan != null) { - getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); + _clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); } sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED)); @@ -2524,33 +2524,32 @@ public final class L2PcInstance extends L2Playable } // Add Hero skills if hero - if (isHero()) + if (_hero) { setHero(true); } // Add clan skills - if (getClan() != null) + if (_clan != null) { - final L2Clan clan = getClan(); - clan.addSkillEffects(this); + _clan.addSkillEffects(this); - if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) + if ((_clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) { SiegeManager.getInstance().addSiegeSkills(this); } - if (getClan().getCastleId() > 0) + if (_clan.getCastleId() > 0) { CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this); } - if (getClan().getFortId() > 0) + if (_clan.getFortId() > 0) { FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this); } } // Reload passive skills from armors / jewels / weapons - getInventory().reloadEquippedItems(); + _inventory.reloadEquippedItems(); } /** @@ -2691,13 +2690,12 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info - if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) + if ((_clan != null) && (_clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -2835,7 +2833,7 @@ public final class L2PcInstance extends L2Playable */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().isSitForced()) + if (L2Event.isParticipant(this) && eventStatus.isSitForced()) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -2989,7 +2987,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAdena()) + if (count > _inventory.getAdena()) { if (sendMessage) { @@ -3039,7 +3037,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceBeautyTickets(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getBeautyTickets()) + if (count > _inventory.getBeautyTickets()) { if (sendMessage) { @@ -3133,7 +3131,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAncientAdena()) + if (count > _inventory.getAncientAdena()) { if (sendMessage) { @@ -3539,7 +3537,7 @@ public final class L2PcInstance extends L2Playable { return null; } - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3623,7 +3621,7 @@ public final class L2PcInstance extends L2Playable */ public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) { - final PcInventory inv = getInventory(); + final PcInventory inv = _inventory; if (!inv.validateCapacityByItemId(rewardId, count)) { if (sendMessage) @@ -3825,7 +3823,7 @@ public final class L2PcInstance extends L2Playable return null; } - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -3846,8 +3844,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return null; } @@ -4051,10 +4048,8 @@ public final class L2PcInstance extends L2Playable final boolean needHpUpdate = needHpUpdate(); final boolean needMpUpdate = needMpUpdate(); - final L2Party party = getParty(); - // Check if a party is in progress and party window update is usefull - if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) + if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) { final PartySmallWindowUpdate partyWindow = new PartySmallWindowUpdate(this, false); if (needCpUpdate) @@ -4072,10 +4067,10 @@ public final class L2PcInstance extends L2Playable partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP); partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP); } - party.broadcastToPartyMembers(this, partyWindow); + _party.broadcastToPartyMembers(this, partyWindow); } - if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) + if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) { final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); if ((game != null) && game.isBattleStarted()) @@ -4085,7 +4080,7 @@ public final class L2PcInstance extends L2Playable } // In duel MP updated only with CP or HP - if (isInDuel() && (needCpUpdate || needHpUpdate)) + if (_isInDuel && (needCpUpdate || needHpUpdate)) { DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this)); } @@ -4172,10 +4167,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4213,10 +4207,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4245,15 +4238,15 @@ public final class L2PcInstance extends L2Playable public int getAllyCrestId() { - if (getClanId() == 0) + if (_clanId == 0) { return 0; } - if (getClan().getAllyId() == 0) + if (_clan.getAllyId() == 0) { return 0; } - return getClan().getAllyCrestId(); + return _clan.getAllyCrestId(); } /** @@ -4297,7 +4290,7 @@ public final class L2PcInstance extends L2Playable if ((targetPlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (targetPlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) { - if (isSellingBuffs()) + if (_isSellingBuffs) { SellBuffsManager.getInstance().sendBuffMenu(this, targetPlayer, 0); } @@ -4338,7 +4331,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) { - getParty().distributeItem(this, itemId, itemCount, false, target); + _party.distributeItem(this, itemId, itemCount, false, target); } else if (itemId == Inventory.ADENA_ID) { @@ -4418,7 +4411,7 @@ public final class L2PcInstance extends L2Playable return; } - if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) + if (((isInParty() && (_party.getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -4527,9 +4520,9 @@ public final class L2PcInstance extends L2Playable // Check if a Party is in progress if (isInParty()) { - getParty().distributeItem(this, target); + _party.distributeItem(this, target); } - else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) + else if ((target.getId() == Inventory.ADENA_ID) && (_inventory.getAdenaInstance() != null)) { addAdena("Pickup", target.getCount(), null, true); ItemTable.getInstance().destroyItem("Pickup", target, this, null); @@ -4538,7 +4531,7 @@ public final class L2PcInstance extends L2Playable { addItem("Pickup", target, null, true); // Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts. - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { final L2EtcItem etcItem = target.getEtcItem(); @@ -4587,13 +4580,13 @@ public final class L2PcInstance extends L2Playable } } - return !isSellingBuffs() && !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); + return !_isSellingBuffs && !isAlikeDead() && !_inOlympiadMode && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); } @Override public int getMinShopDistance() { - return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return _waitTypeSitting ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4601,13 +4594,13 @@ public final class L2PcInstance extends L2Playable // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death) if (canOpenPrivateStore()) { - if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) + if ((_privateStoreType == PrivateStoreType.BUY) || (_privateStoreType == PrivateStoreType.BUY_MANAGE)) { setPrivateStoreType(PrivateStoreType.NONE); } - if (getPrivateStoreType() == PrivateStoreType.NONE) + if (_privateStoreType == PrivateStoreType.NONE) { - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -4649,7 +4642,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -4734,7 +4727,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getActiveWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); } /** @@ -4746,7 +4739,7 @@ public final class L2PcInstance extends L2Playable final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { - return getFistsWeaponItem(); + return _fistsWeaponItem; } return (L2Weapon) weapon.getItem(); @@ -4754,12 +4747,12 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance getChestArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); } public L2ItemInstance getLegsArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LEGS); } public L2Armor getActiveChestArmorItem() @@ -4800,7 +4793,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) { return true; } @@ -4822,7 +4815,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) { return true; } @@ -4844,7 +4837,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) { return true; } @@ -4858,7 +4851,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getSecondaryWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); } /** @@ -4868,7 +4861,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -4908,12 +4901,12 @@ public final class L2PcInstance extends L2Playable !(Config.DISABLE_REWARDS_IN_PVP_ZONES && isInsideZone(ZoneId.PVP))) { // pvp - if (Config.REWARD_PVP_ITEM && (getPvpFlag() != 0)) + if (Config.REWARD_PVP_ITEM && (_pvpFlag != 0)) { pk.addItem("PvP Item Reward", Config.REWARD_PVP_ITEM_ID, Config.REWARD_PVP_ITEM_AMOUNT, this, Config.REWARD_PVP_ITEM_MESSAGE); } // pk - if (Config.REWARD_PK_ITEM && (getPvpFlag() == 0)) + if (Config.REWARD_PK_ITEM && (_pvpFlag == 0)) { pk.addItem("PK Item Reward", Config.REWARD_PK_ITEM_ID, Config.REWARD_PK_ITEM_AMOUNT, this, Config.REWARD_PK_ITEM_MESSAGE); } @@ -4924,7 +4917,7 @@ public final class L2PcInstance extends L2Playable if (Config.ANNOUNCE_PK_PVP && (((pk != null) && !pk.isGM()) || fpcKill)) { String msg = ""; - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4938,7 +4931,7 @@ public final class L2PcInstance extends L2Playable Broadcast.toAllOnlinePlayers(msg, false); } } - else if (getPvpFlag() != 0) + else if (_pvpFlag != 0) { msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4954,7 +4947,7 @@ public final class L2PcInstance extends L2Playable } } - if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (getPvpFlag() == 0) && (getReputation() >= 0)) + if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (_pvpFlag == 0) && (getReputation() >= 0)) { killer.setReputation(killer.getReputation() - 150); } @@ -4978,7 +4971,7 @@ public final class L2PcInstance extends L2Playable { CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer); } - else if (isCombatFlagEquipped()) + else if (_combatFlagEquippedId) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -4987,9 +4980,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } else @@ -5002,7 +4995,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && (pk != null)) { final L2Clan pkClan = pk.getClan(); - if ((pkClan != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pkClan != null) && (_clan != null) && !isAcademyMember() && !(pk.isAcademyMember())) { final ClanWar clanWar = _clan.getWarWith(pkClan.getId()); if ((clanWar != null) && AntiFeedManager.getInstance().check(killer, this)) @@ -5044,7 +5037,7 @@ public final class L2PcInstance extends L2Playable getSkillChannelized().abortChannelization(); } - if (getAgathionId() != 0) + if (_agathionId != 0) { setAgathionId(0); } @@ -5072,8 +5065,8 @@ public final class L2PcInstance extends L2Playable } final L2PcInstance pk = killer.getActingPlayer(); - if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) - // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) + if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) + // || _clan.isAtWarWith(((L2PcInstance)killer).getClanId()) )) { return; @@ -5090,7 +5083,7 @@ public final class L2PcInstance extends L2Playable int dropLimit = 0; int dropPercent = 0; - if ((getReputation() < 0) && (getPkKills() >= pkLimit)) + if ((getReputation() < 0) && (_pkKills >= pkLimit)) { isKarmaDrop = true; dropPercent = Config.KARMA_RATE_DROP; @@ -5112,16 +5105,15 @@ public final class L2PcInstance extends L2Playable { int dropCount = 0; int itemDropPercent = 0; - final L2Summon pet = getPet(); - for (L2ItemInstance itemDrop : getInventory().getItems()) + for (L2ItemInstance itemDrop : _inventory.getItems()) { // Don't drop if (itemDrop.isShadowItem() || // Dont drop Shadow Items itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items !itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena (itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items - ((pet != null) && (pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet + ((_pet != null) && (_pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list )) @@ -5133,7 +5125,7 @@ public final class L2PcInstance extends L2Playable { // Set proper chance according to Item type of equipped Item itemDropPercent = itemDrop.getItem().getType2() == L2Item.TYPE2_WEAPON ? dropEquipWeapon : dropEquip; - getInventory().unEquipItemInSlot(itemDrop.getLocationSlot()); + _inventory.unEquipItemInSlot(itemDrop.getLocationSlot()); } else { @@ -5166,80 +5158,78 @@ public final class L2PcInstance extends L2Playable public void onPlayerKill(L2Playable killedPlayable) { - final L2PcInstance player = getActingPlayer(); final L2PcInstance killedPlayer = killedPlayable.getActingPlayer(); // Avoid nulls && check if player != killedPlayer - if ((player == null) || (killedPlayer == null) || (player == killedPlayer)) + if ((killedPlayer == null) || (this == killedPlayer)) { return; } // Cursed weapons progress - if (player.isCursedWeaponEquipped() && killedPlayer.isPlayer()) + if (isCursedWeaponEquipped() && killedPlayer.isPlayer()) { CursedWeaponsManager.getInstance().increaseKills(getCursedWeaponEquippedId()); return; } // Duel support - if (player.isInDuel() && killedPlayer.getActingPlayer().isInDuel()) + if (isInDuel() && killedPlayer.isInDuel()) { return; } // Do nothing if both players are in PVP zone - if (player.isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) + if (isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) { return; } // If both players are in SIEGE zone just increase siege kills/deaths - if (player.isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) + if (isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) { - if ((player.getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (player.getSiegeState() != killedPlayer.getSiegeState())) + if ((getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (getSiegeState() != killedPlayer.getSiegeState())) { - final L2Clan killerClan = player.getClan(); final L2Clan targetClan = killedPlayer.getClan(); - if ((killerClan != null) && (targetClan != null)) + if ((_clan != null) && (targetClan != null)) { - killerClan.addSiegeKill(); + _clan.addSiegeKill(); targetClan.addSiegeDeath(); } } return; } - if (player.checkIfPvP(killedPlayer)) + if (checkIfPvP(killedPlayer)) { // Check if player should get + rep if (killedPlayer.getReputation() < 0) { - final int levelDiff = killedPlayer.getLevel() - player.getLevel(); - if ((player.getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours + final int levelDiff = killedPlayer.getLevel() - getLevel(); + if ((getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours { - player.setReputation(player.getReputation() + Config.REPUTATION_INCREASE); + setReputation(getReputation() + Config.REPUTATION_INCREASE); } } - player.setPvpKills(player.getPvpKills() + 1); + setPvpKills(_pvpKills + 1); } - else if ((getReputation() > 0) && (getPkKills() == 0)) + else if ((getReputation() > 0) && (_pkKills == 0)) { - player.setReputation(0); - player.setPkKills(player.getPkKills() + 1); + setReputation(0); + setPkKills(getPkKills() + 1); } else { // Calculate new karma and increase pk count - player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killedPlayable.isSummon())); - player.setPkKills(player.getPkKills() + 1); + setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); + setPkKills(getPkKills() + 1); } final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); - player.sendPacket(ui); - player.checkItemRestriction(); + sendPacket(ui); + checkItemRestriction(); } public void updatePvPStatus() @@ -5250,7 +5240,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5274,7 +5264,7 @@ public final class L2PcInstance extends L2Playable return; } - if (isInDuel() && (player_target.getDuelId() == getDuelId())) + if (_isInDuel && (player_target.getDuelId() == getDuelId())) { return; } @@ -5288,7 +5278,7 @@ public final class L2PcInstance extends L2Playable { setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5309,10 +5299,10 @@ public final class L2PcInstance extends L2Playable */ public void restoreExp(double restorePercent) { - if (getExpBeforeDeath() > 0) + if (_expBeforeDeath > 0) { // Restore the specified % of lost experience. - getStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100)); + getStat().addExp(Math.round(((_expBeforeDeath - getExp()) * restorePercent) / 100)); setExpBeforeDeath(0); } } @@ -5430,10 +5420,9 @@ public final class L2PcInstance extends L2Playable final List summons = new ArrayList<>(); summons.addAll(getServitors().values()); - final L2PetInstance pet = getPet(); - if (pet != null) + if (_pet != null) { - summons.add(pet); + summons.add(_pet); } return summons; @@ -5830,11 +5819,11 @@ public final class L2PcInstance extends L2Playable */ public boolean isClanLeader() { - if (getClan() == null) + if (_clan == null) { return false; } - return getObjectId() == getClan().getLeaderId(); + return getObjectId() == _clan.getLeaderId(); } /** @@ -5844,22 +5833,22 @@ public final class L2PcInstance extends L2Playable @Override protected boolean checkAndEquipAmmunition(EtcItemType type) { - L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + L2ItemInstance arrows = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (arrows == null) { final L2Weapon weapon = getActiveWeaponItem(); if (type == EtcItemType.ARROW) { - arrows = getInventory().findArrowForBow(weapon); + arrows = _inventory.findArrowForBow(weapon); } else if (type == EtcItemType.BOLT) { - arrows = getInventory().findBoltForCrossBow(weapon); + arrows = _inventory.findBoltForCrossBow(weapon); } if (arrows != null) { // Equip arrows needed in left hand - getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); + _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); sendItemList(false); return true; } @@ -5878,7 +5867,7 @@ public final class L2PcInstance extends L2Playable public boolean disarmWeapons() { // If there is no weapon to disarm then return true. - final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance wpn = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (wpn == null) { return true; @@ -5891,7 +5880,7 @@ public final class L2PcInstance extends L2Playable } // Don't allow disarming a Combat Flag or Territory Ward. - if (isCombatFlagEquipped()) + if (_combatFlagEquippedId) { return false; } @@ -5902,7 +5891,7 @@ public final class L2PcInstance extends L2Playable return false; } - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -5939,10 +5928,10 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -6050,7 +6039,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE); return false; } - else if (isSitting()) + else if (_waitTypeSitting) { // A strider can be ridden only when standing sendPacket(ActionFailed.STATIC_PACKET); @@ -6070,7 +6059,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); return false; } - else if (getInventory().getItemByItemId(9819) != null) + else if (_inventory.getItemByItemId(9819) != null) { sendPacket(ActionFailed.STATIC_PACKET); // FIXME: Wrong Message @@ -6100,7 +6089,7 @@ public final class L2PcInstance extends L2Playable } else if (isMounted()) { - if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) + if ((_mountType == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION); @@ -6249,12 +6238,12 @@ public final class L2PcInstance extends L2Playable public boolean isInCommandChannel() { - return isInParty() && getParty().isInCommandChannel(); + return isInParty() && _party.isInCommandChannel(); } public L2CommandChannel getCommandChannel() { - return (isInCommandChannel()) ? getParty().getCommandChannel() : null; + return (isInCommandChannel()) ? _party.getCommandChannel() : null; } /** @@ -6263,7 +6252,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isGM() { - return getAccessLevel().isGm(); + return _accessLevel.isGm(); } /** @@ -6294,8 +6283,8 @@ public final class L2PcInstance extends L2Playable _accessLevel = accessLevel; - getAppearance().setNameColor(_accessLevel.getNameColor()); - getAppearance().setTitleColor(_accessLevel.getTitleColor()); + _appearance.setNameColor(_accessLevel.getNameColor()); + _appearance.setTitleColor(_accessLevel.getTitleColor()); if (broadcast) { broadcastUserInfo(); @@ -6383,10 +6372,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -6456,32 +6444,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(8, getCurrentCp()); statement.setInt(9, getMaxMp()); statement.setDouble(10, getCurrentMp()); - statement.setInt(11, getAppearance().getFace()); - statement.setInt(12, getAppearance().getHairStyle()); - statement.setInt(13, getAppearance().getHairColor()); - statement.setInt(14, getAppearance().getSex() ? 1 : 0); + statement.setInt(11, _appearance.getFace()); + statement.setInt(12, _appearance.getHairStyle()); + statement.setInt(13, _appearance.getHairColor()); + statement.setInt(14, _appearance.getSex() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); - statement.setInt(18, getFame()); - statement.setInt(19, getRaidbossPoints()); - statement.setInt(20, getPvpKills()); - statement.setInt(21, getPkKills()); - statement.setInt(22, getClanId()); + statement.setInt(18, _fame); + statement.setInt(19, _raidbossPoints); + statement.setInt(20, _pvpKills); + statement.setInt(21, _pkKills); + statement.setInt(22, _clanId); statement.setInt(23, getRace().ordinal()); statement.setInt(24, getClassId().getId()); - statement.setLong(25, getDeleteTimer()); - statement.setInt(26, getCreateItemLevel() > 0 ? 1 : 0); + statement.setLong(25, _deleteTimer); + statement.setInt(26, _createItemLevel > 0 ? 1 : 0); statement.setString(27, getTitle()); - statement.setInt(28, getAppearance().getTitleColor()); + statement.setInt(28, _appearance.getTitleColor()); statement.setInt(29, isOnlineInt()); - statement.setInt(30, getClanPrivileges().getBitmask()); - statement.setInt(31, getWantsPeace()); - statement.setInt(32, getBaseClass()); + statement.setInt(30, _clanPrivileges.getBitmask()); + statement.setInt(31, _wantsPeace); + statement.setInt(32, _baseClass); statement.setInt(33, _nobleLevel); statement.setLong(34, 0); statement.setInt(35, PcStat.MIN_VITALITY_POINTS); - statement.setDate(36, new Date(getCreateDate().getTimeInMillis())); + statement.setDate(36, new Date(_createDate.getTimeInMillis())); statement.executeUpdate(); } catch (Exception e) @@ -7116,32 +7104,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(5, getCurrentCp()); statement.setInt(6, getMaxMp()); statement.setDouble(7, getCurrentMp()); - statement.setInt(8, getAppearance().getFace()); - statement.setInt(9, getAppearance().getHairStyle()); - statement.setInt(10, getAppearance().getHairColor()); - statement.setInt(11, getAppearance().getSex() ? 1 : 0); + statement.setInt(8, _appearance.getFace()); + statement.setInt(9, _appearance.getHairStyle()); + statement.setInt(10, _appearance.getHairColor()); + statement.setInt(11, _appearance.getSex() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); statement.setInt(15, _lastLoc != null ? _lastLoc.getZ() : getZ()); statement.setLong(16, exp); - statement.setLong(17, getExpBeforeDeath()); + statement.setLong(17, _expBeforeDeath); statement.setLong(18, sp); statement.setInt(19, getReputation()); - statement.setInt(20, getFame()); - statement.setInt(21, getRaidbossPoints()); - statement.setInt(22, getPvpKills()); - statement.setInt(23, getPkKills()); - statement.setInt(24, getClanId()); + statement.setInt(20, _fame); + statement.setInt(21, _raidbossPoints); + statement.setInt(22, _pvpKills); + statement.setInt(23, _pkKills); + statement.setInt(24, _clanId); statement.setInt(25, getRace().ordinal()); statement.setInt(26, getClassId().getId()); - statement.setLong(27, getDeleteTimer()); + statement.setLong(27, _deleteTimer); statement.setString(28, getTitle()); - statement.setInt(29, getAppearance().getTitleColor()); + statement.setInt(29, _appearance.getTitleColor()); statement.setInt(30, isOnlineInt()); - statement.setInt(31, getClanPrivileges().getBitmask()); - statement.setInt(32, getWantsPeace()); - statement.setInt(33, getBaseClass()); + statement.setInt(31, _clanPrivileges.getBitmask()); + statement.setInt(32, _wantsPeace); + statement.setInt(33, _baseClass); long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) @@ -7151,29 +7139,29 @@ public final class L2PcInstance extends L2Playable statement.setLong(34, totalOnlineTime); statement.setInt(35, _nobleLevel); - statement.setInt(36, getPowerGrade()); - statement.setInt(37, getPledgeType()); - statement.setInt(38, getLvlJoinedAcademy()); - statement.setLong(39, getApprentice()); - statement.setLong(40, getSponsor()); - statement.setLong(41, getClanJoinExpiryTime()); - statement.setLong(42, getClanCreateExpiryTime()); + statement.setInt(36, _powerGrade); + statement.setInt(37, _pledgeType); + statement.setInt(38, _lvlJoinedAcademy); + statement.setLong(39, _apprentice); + statement.setLong(40, _sponsor); + statement.setLong(41, _clanJoinExpiryTime); + statement.setLong(42, _clanCreateExpiryTime); statement.setString(43, getName()); - statement.setInt(44, getBookMarkSlot()); + statement.setInt(44, _bookmarkslot); statement.setInt(45, getStat().getBaseVitalityPoints()); - statement.setString(46, getLang()); + statement.setString(46, _lang); int factionId = 0; - if (isGood()) + if (_isGood) { factionId = 1; } - if (isEvil()) + if (_isEvil) { factionId = 2; } statement.setInt(47, factionId); - statement.setInt(48, getPcCafePoints()); + statement.setInt(48, _pcCafePoints); statement.setInt(49, getObjectId()); statement.execute(); @@ -7228,7 +7216,7 @@ public final class L2PcInstance extends L2Playable { // Delete all current stored effects for char to avoid dupe delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.execute(); int buff_index = 0; @@ -7294,7 +7282,7 @@ public final class L2PcInstance extends L2Playable statement.setDouble(7, (t != null) && t.hasNotPassed() ? t.getStamp() : 0); statement.setInt(8, 0); // Store type 0, active buffs/debuffs. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7326,7 +7314,7 @@ public final class L2PcInstance extends L2Playable statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); statement.setInt(8, 1); // Restore type 1, skill reuse. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7465,7 +7453,7 @@ public final class L2PcInstance extends L2Playable // Remove or update a L2PcInstance skill from the character_skills table of the database statement.setInt(1, oldSkill.getId()); statement.setInt(2, getObjectId()); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7481,7 +7469,7 @@ public final class L2PcInstance extends L2Playable if (skill != null) { - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) { @@ -7584,7 +7572,7 @@ public final class L2PcInstance extends L2Playable { // Retrieve all skills of this L2PcInstance from the database statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7635,7 +7623,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_SKILL_SAVE)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7673,7 +7661,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement delete = con.prepareStatement(DELETE_SKILL_SAVE)) { delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.executeUpdate(); } } @@ -7711,7 +7699,7 @@ public final class L2PcInstance extends L2Playable isInInventory = true; // Using item Id - L2ItemInstance item = getInventory().getItemByItemId(itemId); + L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { item = getWarehouse().getItemByItemId(itemId); @@ -7763,7 +7751,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_HENNAS)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { int slot; @@ -7872,7 +7860,7 @@ public final class L2PcInstance extends L2Playable { statement.setInt(1, getObjectId()); statement.setInt(2, slot); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7902,7 +7890,7 @@ public final class L2PcInstance extends L2Playable } if (henna.getCancelCount() > 0) { - getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); + _inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(henna.getDyeItemId()); sm.addLong(henna.getCancelCount()); @@ -7971,7 +7959,7 @@ public final class L2PcInstance extends L2Playable statement.setInt(1, getObjectId()); statement.setInt(2, henna.getDyeId()); statement.setInt(3, i); - statement.setInt(4, getClassIndex()); + statement.setInt(4, _classIndex); statement.execute(); } catch (Exception e) @@ -8117,7 +8105,7 @@ public final class L2PcInstance extends L2Playable if (Config.UPDATE_ITEMS_ON_CHAR_STORE) { - getInventory().updateDatabase(); + _inventory.updateDatabase(); getWarehouse().updateDatabase(); } } @@ -8168,7 +8156,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker isn't the L2PcInstance Pet - if ((attacker == this) || (attacker == getPet()) || attacker.hasServitor(attacker.getObjectId())) + if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { return false; } @@ -8186,13 +8174,13 @@ public final class L2PcInstance extends L2Playable } // is AutoAttackable if both players are in the same duel and the duel is still going on - if (attacker.isPlayable() && (getDuelState() == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) + if (attacker.isPlayable() && (_duelState == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { return true; } // Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. - if (isInParty() && getParty().getMembers().contains(attacker)) + if (isInParty() && _party.getMembers().contains(attacker)) { return false; } @@ -8200,14 +8188,14 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) + if (_inOlympiadMode && _OlympiadStart && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) { return true; } return false; } - if (isOnCustomEvent() && (getTeam() == attacker.getTeam())) + if (_isOnCustomEvent && (getTeam() == attacker.getTeam())) { return false; } @@ -8229,7 +8217,7 @@ public final class L2PcInstance extends L2Playable // Get L2PcInstance final L2PcInstance attackerPlayer = attacker.getActingPlayer(); - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) @@ -8262,7 +8250,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker is not in the same clan - if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) + if ((_clan != null) && _clan.isMember(attacker.getObjectId())) { return false; } @@ -8287,10 +8275,10 @@ public final class L2PcInstance extends L2Playable if (attacker instanceof L2DefenderInstance) { - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return ((siege != null) && siege.checkIsAttacker(_clan)); } } @@ -8300,7 +8288,7 @@ public final class L2PcInstance extends L2Playable } // Check if the L2PcInstance has Karma - if ((getReputation() < 0) || (getPvpFlag() > 0)) + if ((getReputation() < 0) || (_pvpFlag > 0)) { return true; } @@ -8394,7 +8382,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (inObserverMode()) + if (_observerMode) { sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(ActionFailed.STATIC_PACKET); @@ -8442,7 +8430,7 @@ public final class L2PcInstance extends L2Playable } // Check if the caster is sitting - if (isSitting()) + if (_waitTypeSitting) { sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SITTING); sendPacket(ActionFailed.STATIC_PACKET); @@ -8478,7 +8466,7 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill final L2Object target = skill.getTarget(this, forceUse, dontMove, true); - final Location worldPosition = getCurrentSkillWorldPosition(); + final Location worldPosition = _currentSkillWorldPosition; if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { @@ -8534,7 +8522,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (getQueuedSkill() != null) + if (_queuedSkill != null) { setQueuedSkill(null, null, false, false); } @@ -8549,14 +8537,14 @@ public final class L2PcInstance extends L2Playable final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel - if (isInParty() && getParty().isInCommandChannel() && (looter != null)) + if (isInParty() && _party.isInCommandChannel() && (looter != null)) { - return getParty().getCommandChannel().getMembers().contains(looter); + return _party.getCommandChannel().getMembers().contains(looter); } if (isInParty() && (looter != null)) { - return getParty().getMembers().contains(looter); + return _party.getMembers().contains(looter); } return false; @@ -8799,7 +8787,7 @@ public final class L2PcInstance extends L2Playable { for (int itemId : _activeSoulShots) { - final L2ItemInstance item = getInventory().getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { removeAutoSoulShot(itemId); @@ -8893,27 +8881,27 @@ public final class L2PcInstance extends L2Playable public void updateActiveBroochJewel() { // Update active Ruby jewel. - if ((getInventory().getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.GREATER_RUBY); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV1); } @@ -8922,27 +8910,27 @@ public final class L2PcInstance extends L2Playable setActiveRubyJewel(null); } // Update active Sapphire jewel. - if ((getInventory().getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.GREATER_SHAPPHIRE); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1); } @@ -9069,10 +9057,9 @@ public final class L2PcInstance extends L2Playable public void enterOlympiadObserverMode(Location loc, int id) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.unSummon(this); + _pet.unSummon(this); } if (hasServitors()) @@ -9090,13 +9077,13 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoCubic(this)); } - if (getParty() != null) + if (_party != null) { - getParty().removePartyMember(this, MessageType.EXPELLED); + _party.removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -9418,12 +9405,12 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; return false; } - if (isInDuel()) + if (_isInDuel) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL; return false; } - if (isInOlympiadMode() || isOnEvent(CeremonyOfChaosEvent.class)) + if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class)) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS; return false; @@ -9438,7 +9425,7 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE; return false; } - if (getPrivateStoreType() != PrivateStoreType.NONE) + if (_privateStoreType != PrivateStoreType.NONE) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE; return false; @@ -9501,10 +9488,9 @@ public final class L2PcInstance extends L2Playable { super.setTeam(team); broadcastUserInfo(); - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.broadcastStatusUpdate(); + _pet.broadcastStatusUpdate(); } if (hasServitors()) { @@ -9541,9 +9527,9 @@ public final class L2PcInstance extends L2Playable for (Skill s : getSkillList()) { - if (getClan() != null) + if (_clan != null) { - isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0); + isDisabled = s.isClanSkill() && (_clan.getReputationScore() < 0); } sl.addSkill(s.getDisplayId(), s.getReuseDelayGroup(), s.getDisplayLevel(), s.getSubLevel(), s.isPassive(), isDisabled, s.isEnchantable()); @@ -9854,7 +9840,7 @@ public final class L2PcInstance extends L2Playable // Remove active item skills before saving char to database // because next time when choosing this class, weared items can // be different - for (L2ItemInstance item : getInventory().getPaperdollItems(L2ItemInstance::isAugmented)) + for (L2ItemInstance item : _inventory.getPaperdollItems(L2ItemInstance::isAugmented)) { if ((item != null) && item.isEquipped()) { @@ -9892,7 +9878,7 @@ public final class L2PcInstance extends L2Playable if (classIndex == 0) { - setClassTemplate(getBaseClass()); + setClassTemplate(_baseClass); } else { @@ -9910,7 +9896,7 @@ public final class L2PcInstance extends L2Playable if (isInParty()) { - getParty().recalculatePartyLevel(); + _party.recalculatePartyLevel(); } // Update the character's change in class status. @@ -10016,7 +10002,7 @@ public final class L2PcInstance extends L2Playable if (_taskRentPet != null) { // if the rent of a wyvern expires while over a flying zone, tp to down before unmounting - if (checkLandingState() && (getMountType() == MountType.WYVERN)) + if (checkLandingState() && (_mountType == MountType.WYVERN)) { teleToLocation(TeleportWhereType.TOWN); } @@ -10105,7 +10091,7 @@ public final class L2PcInstance extends L2Playable { sendMessage("Entering world in Invisible mode."); } - if (isSilenceMode()) + if (_silenceMode) { sendMessage("Entering world in Silence mode."); } @@ -10211,7 +10197,7 @@ public final class L2PcInstance extends L2Playable restoreExp(revivePower); } - public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int power) + public void reviveRequest(L2PcInstance reviver, Skill skill, boolean isPet, int power) { if (isResurrectionBlocked()) { @@ -10220,11 +10206,11 @@ public final class L2PcInstance extends L2Playable if (_reviveRequested == 1) { - if (_revivePet == Pet) + if (_revivePet == isPet) { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } - else if (Pet) + else if (isPet) { reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. } @@ -10234,12 +10220,11 @@ public final class L2PcInstance extends L2Playable } return; } - final L2Summon pet = getPet(); - if ((Pet && (pet != null) && pet.isDead()) || (!Pet && isDead())) + if ((isPet && (_pet != null) && _pet.isDead()) || (!isPet && isDead())) { _reviveRequested = 1; _revivePower = Formulas.calculateSkillResurrectRestorePercent(power, reviver); - _revivePet = Pet; + _revivePet = isPet; if (hasCharmOfCourage()) { @@ -10249,7 +10234,7 @@ public final class L2PcInstance extends L2Playable return; } - final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); + final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100); final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); @@ -10260,8 +10245,7 @@ public final class L2PcInstance extends L2Playable public void reviveAnswer(int answer) { - final L2Summon pet = getPet(); - if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (pet != null) && !pet.isDead())) + if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (_pet != null) && !_pet.isDead())) { return; } @@ -10279,15 +10263,15 @@ public final class L2PcInstance extends L2Playable doRevive(); } } - else if (pet != null) + else if (_pet != null) { if (_revivePower != 0) { - pet.doRevive(_revivePower); + _pet.doRevive(_revivePower); } else { - pet.doRevive(); + _pet.doRevive(); } } } @@ -10356,7 +10340,7 @@ public final class L2PcInstance extends L2Playable @Override public void teleToLocation(ILocational loc, boolean allowRandomOffset) { - if ((getVehicle() != null) && !getVehicle().isTeleporting()) + if ((_vehicle != null) && !_vehicle.isTeleporting()) { setVehicle(null); } @@ -10387,31 +10371,30 @@ public final class L2PcInstance extends L2Playable checkItemRestriction(); - if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !isInOlympiadMode()) + if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !_inOlympiadMode) { setTeleportProtection(true); } // Trained beast is lost after teleport - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.deleteMe(); } - getTrainedBeasts().clear(); + _tamedBeast.clear(); } // Modify the position of the pet if necessary - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.setFollowStatus(false); - pet.teleToLocation(getLocation(), false); - ((L2SummonAI) pet.getAI()).setStartFollowController(true); - pet.setFollowStatus(true); - pet.setInstance(getInstanceWorld()); - pet.updateAndBroadcastStatus(0); + _pet.setFollowStatus(false); + _pet.teleToLocation(getLocation(), false); + ((L2SummonAI) _pet.getAI()).setStartFollowController(true); + _pet.setFollowStatus(true); + _pet.setInstance(getInstanceWorld()); + _pet.updateAndBroadcastStatus(0); } getServitors().values().forEach(s -> @@ -10501,9 +10484,9 @@ public final class L2PcInstance extends L2Playable super.reduceCurrentHp(value, attacker, skill, isDOT, directlyToHp, critical, reflect); // notify the tamed beast of attacks - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.onOwnerGotAttacked(attacker); } @@ -10636,7 +10619,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -10645,8 +10628,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return false; } @@ -10788,7 +10770,7 @@ public final class L2PcInstance extends L2Playable // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) try { - if (!isOnline()) + if (!_isOnline) { LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } @@ -10801,7 +10783,7 @@ public final class L2PcInstance extends L2Playable try { - if (Config.ENABLE_BLOCK_CHECKER_EVENT && (getBlockCheckerArena() != -1)) + if (Config.ENABLE_BLOCK_CHECKER_EVENT && (_handysBlockCheckerEventArena != -1)) { HandysBlockCheckerManager.getInstance().onDisconnect(this); } @@ -10826,7 +10808,7 @@ public final class L2PcInstance extends L2Playable // remove combat flag try { - if (getInventory().getItemByItemId(9819) != null) + if (_inventory.getItemByItemId(9819) != null) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -10835,9 +10817,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } } @@ -10953,13 +10935,13 @@ public final class L2PcInstance extends L2Playable { try { - L2Summon pet = getPet(); + L2Summon pet = _pet; if (pet != null) { pet.setRestoreSummon(true); pet.unSummon(this); // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) - pet = getPet(); + pet = _pet; if (pet != null) { pet.broadcastNpcInfo(0); @@ -10978,12 +10960,12 @@ public final class L2PcInstance extends L2Playable } // returns pet to control item } - if (getClan() != null) + if (_clan != null) { // set the status for pledge member list to OFFLINE try { - final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = _clan.getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -11020,14 +11002,14 @@ public final class L2PcInstance extends L2Playable { // Check if the L2PcInstance is in observer mode to set its position to its position // before entering in observer mode - if (inObserverMode()) + if (_observerMode) { setLocationInvisible(_lastLoc); } - if (getVehicle() != null) + if (_vehicle != null) { - getVehicle().oustPlayer(this); + _vehicle.oustPlayer(this); } } catch (Exception e) @@ -11061,7 +11043,7 @@ public final class L2PcInstance extends L2Playable // Update database with items in its inventory and remove them from the world try { - getInventory().deleteMe(); + _inventory.deleteMe(); } catch (Exception e) { @@ -11084,7 +11066,7 @@ public final class L2PcInstance extends L2Playable try { - getFreight().deleteMe(); + _freight.deleteMe(); } catch (Exception e) { @@ -11112,10 +11094,10 @@ public final class L2PcInstance extends L2Playable } } - if (getClanId() > 0) + if (_clanId > 0) { - getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); - getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan())); + _clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); + _clan.broadcastToOnlineMembers(new ExPledgeCount(_clan)); // ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); } @@ -11149,7 +11131,7 @@ public final class L2PcInstance extends L2Playable try { notifyFriends(L2FriendStatus.MODE_OFFLINE); - getBlockList().playerLogout(); + _blockList.playerLogout(); } catch (Exception e) { @@ -11415,12 +11397,12 @@ public final class L2PcInstance extends L2Playable { _souls -= count; - if (getChargedSouls() < 0) + if (_souls < 0) { _souls = 0; } - if (getChargedSouls() == 0) + if (_souls == 0) { stopSoulTask(); } @@ -11666,10 +11648,10 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = _inventory.getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { - getInventory().unEquipItemInSlot(i); + _inventory.unEquipItemInSlot(i); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); @@ -11819,10 +11801,9 @@ public final class L2PcInstance extends L2Playable } if (hasPet()) { - final L2Summon pet = getPet(); - setCurrentFeed(((L2PetInstance) pet).getCurrentFed()); - _controlItemId = pet.getControlObjectId(); - sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); + setCurrentFeed(_pet.getCurrentFed()); + _controlItemId = _pet.getControlObjectId(); + sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); if (!isDead()) { _mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000); @@ -11831,7 +11812,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -11891,7 +11872,7 @@ public final class L2PcInstance extends L2Playable { final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -11907,7 +11888,7 @@ public final class L2PcInstance extends L2Playable public boolean isHungry() { - return hasPet() && _canFeed && (getCurrentFeed() < ((getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())); + return hasPet() && _canFeed && (_curFeed < ((getPetData(_mountNpcId).getHungryLimit() / 100f) * getPetLevelData(_mountNpcId).getPetMaxFeed())); } public void enteredNoLanding(int delay) @@ -11933,7 +11914,7 @@ public final class L2PcInstance extends L2Playable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(req)) { - statement.setInt(1, getCurrentFeed()); + statement.setInt(1, _curFeed); statement.setInt(2, _controlItemId); statement.executeUpdate(); _controlItemId = 0; @@ -12102,7 +12083,7 @@ public final class L2PcInstance extends L2Playable { return; } - if (getInventory().getInventoryItemCount(13016, 0) == 0) + if (_inventory.getInventoryItemCount(13016, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; @@ -12114,7 +12095,7 @@ public final class L2PcInstance extends L2Playable final TeleportBookmark bookmark = _tpbookmarks.get(id); if (bookmark != null) { - destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(13016).getObjectId(), 1, null, false); teleToLocation(bookmark, false); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -12127,12 +12108,12 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE); return false; } - else if (isInSiege() || (getSiegeState() != 0)) + else if (_isInSiege || (_siegeState != 0)) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_A_LARGE_SCALE_BATTLE_SUCH_AS_A_CASTLE_SIEGE_FORTRESS_SIEGE_OR_CLAN_HALL_SIEGE); return false; } - else if (isInDuel()) + else if (_isInDuel) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL); return false; @@ -12142,7 +12123,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING); return false; } - else if (isInOlympiadMode()) + else if (_inOlympiadMode) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH); return false; @@ -12201,7 +12182,7 @@ public final class L2PcInstance extends L2Playable return; } - if (getInventory().getInventoryItemCount(20033, 0) == 0) + if (_inventory.getInventoryItemCount(20033, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG); return; @@ -12217,7 +12198,7 @@ public final class L2PcInstance extends L2Playable } _tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name)); - destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); @@ -12271,7 +12252,7 @@ public final class L2PcInstance extends L2Playable setXYZ(getBoat().getLocation()); activeChar.sendPacket(new CharInfo(this, isInvisible() && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS))); - activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition())); + activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); } else if (isInAirShip()) { @@ -12289,10 +12270,9 @@ public final class L2PcInstance extends L2Playable rc1.addRelation(this, relation1, isAutoAttackable(activeChar)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc1.addRelation(pet, relation1, isAutoAttackable(activeChar)); + rc1.addRelation(_pet, relation1, isAutoAttackable(activeChar)); } if (hasServitors()) { @@ -12306,10 +12286,9 @@ public final class L2PcInstance extends L2Playable rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this)); if (activeChar.hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this)); + rc2.addRelation(_pet, relation2, activeChar.isAutoAttackable(this)); } if (hasServitors()) { @@ -12318,7 +12297,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(rc2); - switch (getPrivateStoreType()) + switch (_privateStoreType) { case SELL: { @@ -12345,7 +12324,7 @@ public final class L2PcInstance extends L2Playable public void playMovie(MovieHolder holder) { - if (getMovieHolder() != null) + if (_movieHolder != null) { return; } @@ -12361,7 +12340,7 @@ public final class L2PcInstance extends L2Playable public void stopMovie() { - sendPacket(new ExStopScenePlayer(getMovieHolder().getMovie())); + sendPacket(new ExStopScenePlayer(_movieHolder.getMovie())); setMovieHolder(null); } @@ -12439,7 +12418,7 @@ public final class L2PcInstance extends L2Playable public int getBirthdays() { - long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12607,24 +12586,24 @@ public final class L2PcInstance extends L2Playable @Override public double getCollisionRadius() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override public double getCollisionHeight() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -12766,7 +12745,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || (getMovieHolder() != null) || _fishing.isFishing(); + return super.isMovementDisabled() || (_movieHolder != null) || _fishing.isFishing(); } public String getHtmlPrefix() @@ -12876,7 +12855,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return ((_privateStoreType == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); } public void setMultiSocialAction(int id, int targetId) @@ -12976,7 +12955,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); } /** @@ -12986,7 +12965,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder80(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); } public boolean havePetInvItems() @@ -13072,8 +13051,8 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("REPLACE INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?)")) { ps.setInt(1, getObjectId()); - ps.setInt(2, getRecomHave()); - ps.setInt(3, getRecomLeft()); + ps.setInt(2, _recomHave); + ps.setInt(3, _recomLeft); ps.setLong(4, 0); ps.execute(); } @@ -13500,7 +13479,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHair() { - return getVariables().getInt("visualHairId", getAppearance().getHairStyle()); + return getVariables().getInt("visualHairId", _appearance.getHairStyle()); } /** @@ -13508,7 +13487,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHairColor() { - return getVariables().getInt("visualHairColorId", getAppearance().getHairColor()); + return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); } /** @@ -13516,7 +13495,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualFace() { - return getVariables().getInt("visualFaceId", getAppearance().getFace()); + return getVariables().getInt("visualFaceId", _appearance.getFace()); } /** @@ -13607,7 +13586,7 @@ public final class L2PcInstance extends L2Playable */ public CastleSide getPlayerSide() { - if ((getClan() == null) || (getClan().getCastleId() == 0)) + if ((_clan == null) || (_clan.getCastleId() == 0)) { return CastleSide.NEUTRAL; } @@ -13952,7 +13931,7 @@ public final class L2PcInstance extends L2Playable @Override public MoveType getMoveType() { - if (isSitting()) + if (_waitTypeSitting) { return MoveType.SITTING; } @@ -13971,10 +13950,9 @@ public final class L2PcInstance extends L2Playable private void updateOnlineTime() { - final L2Clan clan = getClan(); - if (clan != null) + if (_clan != null) { - clan.addMemberOnlineTime(this); + _clan.addMemberOnlineTime(this); } } @@ -13989,7 +13967,7 @@ public final class L2PcInstance extends L2Playable public GroupType getGroupType() { - return isInParty() ? (getParty().isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; + return isInParty() ? (_party.isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; } public boolean isTrueHero() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 10429b5b5b..f1112eee76 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -83,8 +83,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,skill_sub_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -140,9 +140,9 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - else if (getCurrentFed() > getFeedConsume()) + else if (_curFed > getFeedConsume()) { - setCurrentFed(getCurrentFed() - getFeedConsume()); + setCurrentFed(_curFed - getFeedConsume()); } else { @@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -333,9 +333,9 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - if (getInventory() != null) + if (_inventory != null) { - return getInventory().getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); + return _inventory.getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); } return null; } @@ -622,8 +622,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -639,7 +639,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -702,9 +702,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -756,11 +756,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - statement.setInt(1, getControlObjectId()); + statement.setInt(1, _controlObjectId); statement.execute(); } catch (Exception e) @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -817,7 +817,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -921,7 +921,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -933,7 +933,7 @@ public class L2PetInstance extends L2Summon } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -951,10 +951,10 @@ public class L2PetInstance extends L2Summon statement.setDouble(4, getStatus().getCurrentMp()); statement.setLong(5, getStat().getExp()); statement.setLong(6, getStat().getSp()); - statement.setInt(7, getCurrentFed()); + statement.setInt(7, _curFed); statement.setInt(8, getOwner().getObjectId()); statement.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - statement.setInt(10, getControlObjectId()); + statement.setInt(10, _controlObjectId); statement.executeUpdate(); _respawned = true; @@ -997,7 +997,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1045,7 +1045,7 @@ public class L2PetInstance extends L2Summon continue; } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, skill.getSubLevel()); @@ -1073,7 +1073,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rset = ps1.executeQuery()) { while (rset.next()) @@ -1094,7 +1094,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1147,9 +1147,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1340,13 +1340,13 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1357,7 +1357,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1367,7 +1367,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 42bd49e7f9..8ed3a9f1d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -240,7 +240,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable final Map> servitorEffects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()); if (servitorEffects != null) { - final List effects = servitorEffects.get(getReferenceSkill()); + final List effects = servitorEffects.get(_referenceSkill); if ((effects != null) && !effects.isEmpty()) { for (SummonEffect effect : effects) @@ -294,7 +294,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.execute(); int buff_index = 0; @@ -348,7 +348,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -397,7 +397,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -437,7 +437,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -554,12 +554,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -573,7 +573,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); // Using same task to check if owner is in visible range if (calculateDistance(getOwner(), true, false) > 2000) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java index 285b9af507..aa681dd5f3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java @@ -51,7 +51,7 @@ public class L2ShuttleInstance extends L2Vehicle public void closeDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { @@ -63,7 +63,7 @@ public class L2ShuttleInstance extends L2Vehicle public void openDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index e5e5d055c4..32f94719bb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index a7276d30f8..f1d5b120e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -72,7 +72,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -136,7 +136,7 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - final L2Character activeChar = getActiveChar(); + final L2Character activeChar = _activeChar; if (activeChar.isDead()) { return; @@ -169,14 +169,14 @@ public class CharStatus } if (Formulas.calcRealTargetBreak()) { - getActiveChar().getEffectList().stopEffects(AbnormalType.REAL_TARGET); + _activeChar.getEffectList().stopEffects(AbnormalType.REAL_TARGET); } } if (value > 0) { - final double oldHp = getCurrentHp(); - final double newHp = Math.max(getCurrentHp() - value, activeChar.isUndying() ? 1 : 0); + final double oldHp = _currentHp; + final double newHp = Math.max(_currentHp - value, activeChar.isUndying() ? 1 : 0); setCurrentHp(newHp); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureHpChange(activeChar, oldHp, newHp), activeChar); } @@ -189,7 +189,7 @@ public class CharStatus public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -202,10 +202,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -269,12 +269,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getStat().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getStat().getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -324,7 +324,7 @@ public class CharStatus if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -337,7 +337,7 @@ public class CharStatus hpOrMpWasChanged |= setCurrentMp(newMp, false); if (hpOrMpWasChanged) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -360,12 +360,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getStat().getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -398,7 +398,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -407,10 +407,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE); - final double newMp = getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE); + final double newHp = _currentHp + _activeChar.getStat().getValue(Stats.REGENERATE_HP_RATE); + final double newMp = _currentMp + _activeChar.getStat().getValue(Stats.REGENERATE_MP_RATE); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index ff93cc3463..813634b659 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -48,9 +48,9 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -238,14 +238,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -337,7 +337,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -388,9 +388,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); + setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 80a80f6018..1d84f3da14 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -279,7 +279,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 1ce3ab05ca..6ee4d7e704 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -262,13 +262,13 @@ public final class Transform implements IIdentifiable if (creature.isPlayer()) { - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } if (addSkills) @@ -374,11 +374,11 @@ public final class Transform implements IIdentifiable final L2PcInstance player = creature.getActingPlayer(); final boolean hasTransformSkills = player.hasTransformSkills(); - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index ebee3cd82c..1adc7b039f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setInt(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setInt(6, _repeat); st.execute(); try (ResultSet rset = st.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setLong(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setLong(6, _repeat); st.setLong(7, getId()); st.execute(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/base/SubClass.java index 0e65764560..e318f331ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -140,7 +140,7 @@ public final class SubClass public void incLevel() { - if (!_dualClass && (getLevel() == _maxLevel)) + if (!_dualClass && (_level == _maxLevel)) { return; } @@ -151,7 +151,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java index 03b1a51b6b..8360f7712c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -69,7 +69,7 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() @@ -124,7 +124,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(this::restock, getRestockDelay()); + _restockTask = ThreadPool.schedule(this::restock, _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -133,7 +133,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -151,7 +151,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -161,7 +161,7 @@ public final class Product PreparedStatement statement = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { statement.setInt(1, _buyListId); - statement.setInt(2, getItemId()); + statement.setInt(2, _item.getId()); statement.setLong(3, getCount()); statement.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index ce7a68dcc7..4e95946a36 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -538,9 +538,9 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - getHolder().broadCastPacketToTeam(changePoints); + _holder.broadCastPacketToTeam(changePoints); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java index 4fa38d85d4..9b249a9069 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -72,7 +72,7 @@ public final class Castle extends AbstractResidence private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -96,12 +96,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -158,7 +158,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -185,29 +185,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -223,11 +223,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -244,7 +244,7 @@ public final class Castle extends AbstractResidence initResidenceZone(); initFunctions(); spawnSideNpcs(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -287,7 +287,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -338,7 +338,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -380,7 +380,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -460,7 +460,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -481,7 +481,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, String doorName, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -516,7 +516,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -877,7 +877,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -897,12 +897,12 @@ public final class Castle extends AbstractResidence public final L2DoorInstance getDoor(int doorId) { - return getDoors().stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); } public final L2DoorInstance getDoor(String doorName) { - return getDoors().stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); } public final List getDoors() @@ -957,7 +957,7 @@ public final class Castle extends AbstractResidence public final int getTaxPercent(TaxType type) { final int taxPercent; - switch (getSide()) + switch (_castleSide) { case LIGHT: { @@ -1036,7 +1036,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -1156,7 +1156,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); + final Skill skill = _castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); player.addSkill(skill); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index d41afdb68a..6fc9b45046 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -58,7 +58,7 @@ public final class ClanHall extends AbstractResidence private final ClanHallGrade _grade; private final ClanHallType _type; private final int _minBid; - private final int _lease; + final int _lease; private final int _deposit; private final List _npcs; private final List _doors; @@ -66,8 +66,8 @@ public final class ClanHall extends AbstractResidence private final Location _ownerLocation; private final Location _banishLocation; // Dynamic parameters - private L2Clan _owner = null; - private long _paidUntil = 0; + L2Clan _owner = null; + long _paidUntil = 0; protected ScheduledFuture _checkPaymentTask = null; // Other private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; @@ -137,7 +137,7 @@ public final class ClanHall extends AbstractResidence PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) { statement.setInt(1, getOwnerId()); - statement.setLong(2, getPaidUntil()); + statement.setLong(2, _paidUntil); statement.setInt(3, getResidenceId()); statement.execute(); } @@ -159,7 +159,7 @@ public final class ClanHall extends AbstractResidence public int getCostFailDay() { - final Duration failDay = Duration.between(Instant.ofEpochMilli(getPaidUntil()), Instant.now()); + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); return failDay.isNegative() ? 0 : (int) failDay.toDays(); } @@ -256,13 +256,13 @@ public final class ClanHall extends AbstractResidence _owner = clan; clan.setHideoutId(getResidenceId()); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (getPaidUntil() == 0) + if (_paidUntil == 0) { setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); } final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : getPaidUntil(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else @@ -351,29 +351,28 @@ public final class ClanHall extends AbstractResidence @Override public void run() { - final L2Clan clan = getOwner(); - if (clan != null) + if (_owner != null) { - if (clan.getWarehouse().getAdena() < getLease()) + if (_owner.getWarehouse().getAdena() < _lease) { if (getCostFailDay() > 8) { setOwner(null); - clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + _owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); } else { _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); - clan.broadcastToOnlineMembers(sm); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); } } else { - clan.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, getLease(), null, null); - setPaidUntil(Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), getPaidUntil() - System.currentTimeMillis()); + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java index 826a7beece..a4b57818fa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -75,7 +75,7 @@ public class Duel private boolean _finished = false; private final Map _playerConditions = new ConcurrentHashMap<>(); - private Instance _duelInstance; + Instance _duelInstance; public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId) { @@ -213,9 +213,9 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPool.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - if (getDueldInstance() != null) + if (_duelInstance != null) { - getDueldInstance().destroy(); + _duelInstance.destroy(); } break; } @@ -674,7 +674,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -695,7 +695,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java index 3d030d3183..2433d41209 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -237,7 +237,7 @@ public final class Fort extends AbstractResidence super(fortId); load(); loadFlagPoles(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -506,7 +506,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -781,7 +781,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -873,7 +873,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1001,8 +1001,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1068,7 +1068,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 75de2719fc..c7a8bd6dfa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -70,7 +70,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -101,7 +101,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -115,7 +115,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -184,7 +184,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -205,7 +205,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -228,7 +228,7 @@ public class FortSiege implements Siegable // Fort setting protected Set _commanders = ConcurrentHashMap.newKeySet(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private final Collection _siegeGuards = new LinkedList<>(); ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -248,7 +248,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { _isInProgress = false; // Flag so that siege instance can be started removeFlags(); // Removes all flags. Note: Remove flag before teleporting players @@ -257,22 +257,22 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); int ownerId = -1; - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - ownerId = getFort().getOwnerClan().getId(); + ownerId = _fort.getOwnerClan().getId(); } - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -306,16 +306,16 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -326,24 +326,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -358,7 +358,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -369,7 +369,7 @@ public class FortSiege implements Siegable } } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -391,7 +391,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -411,7 +411,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -421,7 +421,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -441,7 +441,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -470,7 +470,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return (_isInProgress && (_fort.checkIfInZone(x, y, z))); // Fort zone during siege } /** @@ -490,7 +490,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - if ((clan != null) && (getFort().getOwnerClan() == clan)) + if ((clan != null) && (_fort.getOwnerClan() == clan)) { return true; } @@ -504,22 +504,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -540,7 +540,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -550,7 +550,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -583,10 +583,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -614,7 +614,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if ((getFort() != null) && (!_commanders.isEmpty())) + if ((_fort != null) && (!_commanders.isEmpty())) { final L2Spawn spawn = instance.getSpawn(); if (spawn != null) @@ -657,14 +657,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -674,22 +674,22 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } // schedule restoring doors/commanders respawn else if (_siegeRestore == null) { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); } } else { - LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } } @@ -705,7 +705,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -734,7 +734,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player don't have enough adena to register } @@ -754,7 +754,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -788,7 +788,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(query)) { - statement.setInt(1, getFort().getResidenceId()); + statement.setInt(1, _fort.getResidenceId()); if (clanId != 0) { statement.setInt(2, clanId); @@ -796,9 +796,9 @@ public class FortSiege implements Siegable statement.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -843,7 +843,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -896,9 +896,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -927,7 +927,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -948,7 +948,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -991,18 +991,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1038,7 +1038,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1060,8 +1060,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, _fort.getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1085,7 +1085,7 @@ public class FortSiege implements Siegable PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getFort().getResidenceId()); + statement.setInt(2, _fort.getResidenceId()); statement.execute(); addAttacker(clan.getId()); @@ -1151,7 +1151,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1235,7 +1235,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1265,7 +1265,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1288,7 +1288,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public Set getCommanders() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java index a2ad3c924d..32b1d6187a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -92,7 +92,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -160,14 +160,14 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } try { - if (!getIsTimeRegistrationOver()) + if (!_castle.getIsTimeRegistrationOver()) { final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) @@ -186,7 +186,7 @@ public class Siege implements Siegable else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; clearSiegeWaitingClan(); @@ -228,8 +228,8 @@ public class Siege implements Siegable // Castle setting private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); - private final Castle _castle; - private boolean _isInProgress = false; + final Castle _castle; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,18 +246,18 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); if (clan.getId() == _firstOwnerClanId) @@ -267,7 +267,7 @@ public class Siege implements Siegable } else { - getCastle().setTicketBuyCount(0); + _castle.setTicketBuyCount(0); for (L2ClanMember member : clan.getMembers()) { if (member != null) @@ -284,7 +284,7 @@ public class Siege implements Siegable else { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); } @@ -322,7 +322,7 @@ public class Siege implements Siegable clan.clearSiegeDeaths(); } - getCastle().updateClansReputation(); + _castle.updateClansReputation(); removeFlags(); // Removes all flags. Note: Remove flag before teleporting players teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town _isInProgress = false; // Flag so that siege instance can be started @@ -331,14 +331,14 @@ public class Siege implements Siegable clearSiegeClan(); // Clear siege clan from db removeTowers(); // Remove all towers from this castle SiegeGuardManager.getInstance().unspawnSiegeGuard(getCastle()); // Remove all spawned siege guard from this castle - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); } - getCastle().spawnDoor(); // Respawn door to castle - getCastle().getZone().setIsActive(false); - getCastle().getZone().updateZoneStatusForCharactersInside(); - getCastle().getZone().setSiegeInstance(null); + _castle.spawnDoor(); // Respawn door to castle + _castle.getZone().setIsActive(false); + _castle.getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(null); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeFinish(this), getCastle()); @@ -387,9 +387,9 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); // Remove all merc entry from db } @@ -398,13 +398,13 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); return; } - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) @@ -426,7 +426,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -444,7 +444,7 @@ public class Siege implements Siegable } } - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -462,8 +462,8 @@ public class Siege implements Siegable teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town removeDefenderFlags(); // Removes defenders' flags - getCastle().removeUpgrade(); // Remove all castle upgrade - getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) + _castle.removeUpgrade(); // Remove all castle upgrade + _castle.spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) removeTowers(); // Remove all towers from this castle _controlTowerCount = 0; // Each new siege midvictory CT are completely respawned. spawnControlTower(); @@ -483,9 +483,9 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { - _firstOwnerClanId = getCastle().getOwnerId(); + _firstOwnerClanId = _castle.getOwnerId(); if (getAttackerClans().isEmpty()) { @@ -500,7 +500,7 @@ public class Siege implements Siegable final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId); ownerClan.increaseBloodAllianceCount(); } - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); saveCastleSiege(); return; @@ -515,20 +515,20 @@ public class Siege implements Siegable _controlTowerCount = 0; spawnControlTower(); // Spawn control tower spawnFlameTower(); // Spawn control tower - getCastle().spawnDoor(); // Spawn door + _castle.spawnDoor(); // Spawn door spawnSiegeGuard(); // Spawn siege guard SiegeGuardManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground - getCastle().getZone().setSiegeInstance(this); - getCastle().getZone().setIsActive(true); - getCastle().getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(this); + _castle.getZone().setIsActive(true); + _castle.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEndDate = Calendar.getInstance(); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); - ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task + ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); // Notify to scripts. @@ -589,7 +589,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -649,7 +649,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -723,7 +723,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return (_isInProgress && (_castle.checkIfInZone(x, y, z))); // Castle zone during siege } /** @@ -763,21 +763,21 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) { - delete.setInt(1, getCastle().getOwnerId()); + delete.setInt(1, _castle.getOwnerId()); delete.execute(); } } getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -791,10 +791,10 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -821,7 +821,7 @@ public class Siege implements Siegable */ public List getPlayersInZone() { - return getCastle().getZone().getPlayersInside(); + return _castle.getZone().getPlayersInside(); } /** @@ -845,7 +845,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - return getCastle().getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); + return _castle.getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); } /** @@ -872,7 +872,7 @@ public class Siege implements Siegable */ public void listRegisterClan(L2PcInstance player) { - player.sendPacket(new SiegeInfo(getCastle(), player)); + player.sendPacket(new SiegeInfo(_castle, player)); } /** @@ -892,7 +892,7 @@ public class Siege implements Siegable return; } int allyId = 0; - if (getCastle().getOwnerId() != 0) + if (_castle.getOwnerId() != 0) { allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); } @@ -935,9 +935,9 @@ public class Siege implements Siegable public void registerDefender(L2PcInstance player, boolean force) { - if (getCastle().getOwnerId() <= 0) + if (_castle.getOwnerId() <= 0) { - player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC."); + player.sendMessage("You cannot register as a defender because " + _castle.getName() + " is owned by NPC."); return; } @@ -975,7 +975,7 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.setInt(2, clanId); statement.execute(); @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _castle.getName() + ": " + _castle.getSiegeDate().getTime()); loadSiegeClan(); @@ -1028,7 +1028,7 @@ public class Siege implements Siegable { _scheduledStartSiegeTask.cancel(false); } - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } /** @@ -1048,12 +1048,12 @@ public class Siege implements Siegable } case NotOwner: { - players = getPlayersInZone(); + players = _castle.getZone().getPlayersInside(); final Iterator it = players.iterator(); while (it.hasNext()) { final L2PcInstance player = it.next(); - if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId()))) + if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == _castle.getOwnerId()))) { it.remove(); } @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1149,7 +1149,7 @@ public class Siege implements Siegable { player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_5_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE); } - else if (player.getClan().getId() == getCastle().getOwnerId()) + else if (player.getClan().getId() == _castle.getOwnerId()) { player.sendPacket(SystemMessageId.CASTLE_OWNING_CLANS_ARE_AUTOMATICALLY_REGISTERED_ON_THE_DEFENDING_SIDE); } @@ -1243,15 +1243,15 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { - addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER); + addDefender(_castle.getOwnerId(), SiegeClanType.OWNER); } - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); try (ResultSet rs = statement.executeQuery()) { int typeId; @@ -1333,8 +1333,8 @@ public class Siege implements Siegable setNextSiegeDate(); // Set the next set date for 2 weeks from now // Schedule Time registration end getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); - getCastle().setIsTimeRegistrationOver(false); + _castle.getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); + _castle.setIsTimeRegistrationOver(false); saveSiegeDate(); // Save the new date startAutoTask(); // Prepare auto start siege and end registration @@ -1346,16 +1346,16 @@ public class Siege implements Siegable if (_scheduledStartSiegeTask != null) { _scheduledStartSiegeTask.cancel(true); - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ? WHERE id = ?")) { - statement.setLong(1, getSiegeDate().getTimeInMillis()); - statement.setLong(2, getTimeRegistrationOverDate().getTimeInMillis()); - statement.setString(3, String.valueOf(getIsTimeRegistrationOver())); - statement.setInt(4, getCastle().getResidenceId()); + statement.setLong(1, _castle.getSiegeDate().getTimeInMillis()); + statement.setLong(2, _castle.getTimeRegistrationOverDate().getTimeInMillis()); + statement.setString(3, String.valueOf(_castle.getIsTimeRegistrationOver())); + statement.setInt(4, _castle.getResidenceId()); statement.execute(); } catch (Exception e) @@ -1397,7 +1397,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, typeId); statement.execute(); } @@ -1407,7 +1407,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) { statement.setInt(1, typeId); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, clan.getId()); statement.execute(); } @@ -1435,7 +1435,7 @@ public class Siege implements Siegable /** Set the date for the next siege. */ private void setNextSiegeDate() { - final Calendar cal = getCastle().getSiegeDate(); + final Calendar cal = _castle.getSiegeDate(); if (cal.getTimeInMillis() < System.currentTimeMillis()) { cal.setTimeInMillis(System.currentTimeMillis()); @@ -1460,7 +1460,7 @@ public class Siege implements Siegable } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = false; // Allow registration for next siege @@ -1645,7 +1645,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1672,23 +1672,23 @@ public class Siege implements Siegable public final boolean getIsTimeRegistrationOver() { - return getCastle().getIsTimeRegistrationOver(); + return _castle.getIsTimeRegistrationOver(); } @Override public final Calendar getSiegeDate() { - return getCastle().getSiegeDate(); + return _castle.getSiegeDate(); } public final Calendar getTimeRegistrationOverDate() { - return getCastle().getTimeRegistrationOverDate(); + return _castle.getTimeRegistrationOverDate(); } public void endTimeRegistration(boolean automatic) { - getCastle().setIsTimeRegistrationOver(true); + _castle.setIsTimeRegistrationOver(true); if (!automatic) { saveSiegeDate(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java index f09be6765f..ac490ba86d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -129,7 +129,7 @@ public class EventScheduler run(); updateLastRun(); - if (isRepeating()) + if (_repeat) { ThreadPool.schedule(this::startScheduler, 1000); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index eae25b08f7..1d42731b7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() @@ -46,16 +46,16 @@ public final class MovieHolder public void playerEscapeVote(L2PcInstance player) { - if (getVotedPlayers().contains(player) || !getPlayers().contains(player) || !getMovie().isEscapable()) + if (_votedPlayers.contains(player) || !_players.contains(player) || !_movie.isEscapable()) { return; } - getVotedPlayers().add(player); + _votedPlayers.add(player); - if (((getVotedPlayers().size() * 100) / getPlayers().size()) >= 50) + if (((_votedPlayers.size() * 100) / _players.size()) >= 50) { - getPlayers().forEach(L2PcInstance::stopMovie); + _players.forEach(L2PcInstance::stopMovie); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/RecipeHolder.java index 5e33d6f797..cd209d75bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -236,7 +236,7 @@ public class RecipeHolder implements IIdentifiable */ public boolean checkNecessaryIngredients(L2PcInstance player, boolean sendMessage) { - for (ItemHolder ingredient : getMaterials()) + for (ItemHolder ingredient : _materials) { final long count = player.getInventory().getInventoryItemCount(ingredient.getId(), -1); if (count < ingredient.getCount()) @@ -313,7 +313,7 @@ public class RecipeHolder implements IIdentifiable } // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (getMaterials().stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) { return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index a4fde8355e..4bc6353cfa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -487,7 +487,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return Collections.emptyList(); } @@ -502,7 +502,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } return npcs; } @@ -516,7 +516,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return; } @@ -526,7 +526,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } } @@ -810,7 +810,7 @@ public final class Instance implements IIdentifiable, INamable public void setReenterTime(long time) { // Cannot store reenter data for instance without template id. - if ((getTemplateId() == -1) && (time > 0)) + if ((_template.getId() == -1) && (time > 0)) { return; } @@ -824,7 +824,7 @@ public final class Instance implements IIdentifiable, INamable if (player != null) { ps.setInt(1, player.getObjectId()); - ps.setInt(2, getTemplateId()); + ps.setInt(2, _template.getId()); ps.setLong(3, time); ps.addBatch(); } @@ -835,11 +835,11 @@ public final class Instance implements IIdentifiable, INamable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null) { - msg.addInstanceName(getTemplateId()); + msg.addInstanceName(_template.getId()); } else { - msg.addString(getName()); + msg.addString(_template.getName()); } _allowed.forEach(player -> { @@ -995,7 +995,7 @@ public final class Instance implements IIdentifiable, INamable removePlayer(player); if (Config.RESTORE_PLAYER_INSTANCE) { - player.getVariables().set("INSTANCE_RESTORE", getId()); + player.getVariables().set("INSTANCE_RESTORE", _id); } else { @@ -1161,6 +1161,6 @@ public final class Instance implements IIdentifiable, INamable @Override public String toString() { - return getName() + "(" + getId() + ")"; + return _template.getName() + "(" + _id + ")"; } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 409678ea5a..ba6f5482ad 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -788,6 +788,6 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl @Override public String toString() { - return "ID: " + getId() + " Name: " + getName(); + return "ID: " + _templateId + " Name: " + _name; } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 74090bd4ac..8a3ac20ed4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -181,12 +181,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -250,7 +250,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -340,7 +340,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5bb5770412..9e94b591e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -115,9 +115,9 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - statement.setInt(1, getOwnerId()); + statement.setInt(1, _ownerId); statement.setString(2, getBaseLocation().name()); - statement.setInt(3, getMessageId()); + statement.setInt(3, _messageId); try (ResultSet inv = statement.executeQuery()) { while (inv.next()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index c7a3128aa9..9228d151c2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -150,7 +150,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -211,7 +211,7 @@ public class PcInventory extends Inventory { return getItems(i -> { - if (!i.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) + if (!i.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) { return false; } @@ -232,7 +232,7 @@ public class PcInventory extends Inventory { //@formatter:off return _items.values().stream() - .filter(i -> i.isAvailable(getOwner(), false, false)) + .filter(i -> i.isAvailable(_owner, false, false)) .map(tradeList::adjustAvailableItem) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -689,12 +689,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (getOwner().isProcessingItem(item.getObjectId())) + if (_owner.isProcessingItem(item.getObjectId())) { - getOwner().removeRequestsThatProcessesItem(item.getObjectId()); + _owner.removeRequestsThatProcessesItem(item.getObjectId()); } if (item.getId() == ADENA_ID) @@ -720,7 +720,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(true); + _owner.refreshOverloaded(true); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 87c35d5d82..fa6332fb1f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -120,7 +120,7 @@ public class PetInventory extends Inventory { if (item.isEquipped()) { - if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (!item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 4c8db6b288..dbba43acd0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -73,6 +73,6 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index a04975542f..8d988d61be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -89,7 +89,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java index 69f76f8772..39d07bf161 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -411,11 +411,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -430,11 +430,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -528,7 +528,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -585,7 +585,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -776,7 +776,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) { if (isEquipable()) { @@ -789,7 +789,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return false; } - if (isCocRestrictedItem() && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_is_coc_restricted && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 1db19c172a..a0ee0a7895 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -119,7 +119,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 0f9a69fec3..d9baca8329 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -274,7 +274,7 @@ public class AppearanceStone return false; } - switch (getType()) + switch (_type) { case RESTORE: { @@ -383,15 +383,15 @@ public class AppearanceStone return false; } - if (getWeaponType() != WeaponType.NONE) + if (_weaponType != WeaponType.NONE) { - if (!targetItem.isWeapon() || (targetItem.getItemType() != getWeaponType())) + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); return false; } - switch (getHandType()) + switch (_handType) { case ONE_HANDED: { @@ -413,7 +413,7 @@ public class AppearanceStone } } - switch (getMagicType()) + switch (_magicType) { case MAGICAL: { @@ -435,9 +435,9 @@ public class AppearanceStone } } - if (getArmorType() != ArmorType.NONE) + if (_armorType != ArmorType.NONE) { - switch (getArmorType()) + switch (_armorType) { case SHIELD: { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 90ce5868f0..9cd7f326c0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -328,14 +328,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -344,7 +344,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -366,7 +366,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -482,7 +482,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -504,12 +504,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -519,7 +519,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -542,7 +542,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -559,9 +559,9 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isEnchantable(); + return _item.isEnchantable(); } return 0; } @@ -656,7 +656,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -880,7 +880,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public final class L2ItemInstance extends L2Object final L2Summon pet = player.getPet(); return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -963,7 +963,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1139,9 +1139,9 @@ public final class L2ItemInstance extends L2Object { if (isWeapon()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - return getItem().getAttributes().stream().findFirst().orElse(null); + return _item.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1167,9 +1167,9 @@ public final class L2ItemInstance extends L2Object { if (isArmor()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - final AttributeHolder attribute = getItem().getAttribute(element); + final AttributeHolder attribute = _item.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1411,7 +1411,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1433,7 +1433,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1615,11 +1615,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1651,12 +1651,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1838,7 +1838,7 @@ public final class L2ItemInstance extends L2Object player.sendInventoryUpdate(iu); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1852,7 +1852,7 @@ public final class L2ItemInstance extends L2Object { player.getWarehouse().destroyItem("L2ItemInstance", this, player, null); } - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(getId())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId)); } } @@ -1949,32 +1949,32 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isElementable(); + return _item.isElementable(); } return false; } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -1991,7 +1991,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && (getItem().getSkills(ItemSkillType.NORMAL) != null); + return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2004,7 +2004,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2025,7 +2025,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2432,7 +2432,7 @@ public final class L2ItemInstance extends L2Object if (isEnchanted()) { - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(getEnchantLevel()).addItemName(this)); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this)); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/CrystalType.java index f87f2ec4a0..c5937853ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/type/CrystalType.java @@ -88,7 +88,7 @@ public enum CrystalType public CrystalType plusLevel(int level) { - level += getLevel(); + level += _level; if (level >= CrystalType.R99.getLevel()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 4858feb6a9..9a7dbcac0d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/options/Options.java index 813ec8f6db..630038eb77 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/options/Options.java @@ -189,14 +189,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { addSkill(player, holder.getSkill()); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { addSkill(player, holder.getSkill()); } @@ -227,14 +227,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { player.removeSkill(holder.getSkill(), false, false); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { player.removeSkill(holder.getSkill(), false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java index 8564a44f5b..af14dafb6b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2740,7 +2740,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2753,9 +2752,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); @@ -2943,7 +2942,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if (activeChar.getQuestState(getName()) != null) { - final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList packet = new ExQuestNpcLogList(_questId); getNpcLogList(activeChar).forEach(packet::add); activeChar.sendPacket(packet); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 40aa1878fd..5e0a66a375 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + _questName + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -755,7 +755,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 4013de0733..1cf9e26073 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,13 +53,13 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; - private final ScheduledFuture _schedular; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; + private final ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) { @@ -68,7 +68,7 @@ public class QuestTimer _player = player; _npc = npc; _isRepeating = repeating; - _schedular = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); + _scheduler = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); } public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) @@ -87,9 +87,9 @@ public class QuestTimer public void cancel() { _isActive = false; - if (_schedular != null) + if (_scheduler != null) { - _schedular.cancel(false); + _scheduler.cancel(false); } } @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java index 73f5ed97a8..81ec17cf73 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -132,7 +132,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -152,7 +152,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + _residenceId, e); } } @@ -173,7 +173,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN ps.setInt(1, func.getId()); ps.setInt(2, func.getLevel()); ps.setLong(3, func.getExpiration()); - ps.setInt(4, getResidenceId()); + ps.setInt(4, _residenceId); ps.setInt(5, func.getLevel()); ps.setLong(6, func.getExpiration()); @@ -181,7 +181,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + _residenceId, e); } finally { @@ -202,13 +202,13 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ? and id = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.setInt(2, func.getId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + _residenceId, e); } finally { @@ -225,12 +225,12 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + _residenceId, e); } finally { @@ -313,6 +313,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + " (" + getResidenceId() + ")"; + return _name + " (" + _residenceId + ")"; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index ab2394ed74..cac8ecf953 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -333,7 +333,7 @@ public final class BuffInfo } // Call on start. - effect.onStart(getEffector(), getEffected(), getSkill()); + effect.onStart(_effector, _effected, _skill); // If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it. if (effect.getTicks() > 0) @@ -360,7 +360,7 @@ public final class BuffInfo if (_isInUse) { // Callback for on action time event. - continueForever = effect.onActionTime(getEffector(), getEffected(), getSkill()); + continueForever = effect.onActionTime(_effector, _effected, _skill); } if (!continueForever && _skill.isToggle()) @@ -369,7 +369,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -391,7 +391,7 @@ public final class BuffInfo // Instant effects shouldn't call onExit(..). if (!effect.isInstant()) { - effect.onExit(getEffector(), getEffected(), getSkill()); + effect.onExit(_effector, _effected, _skill); } } @@ -403,7 +403,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java index 19a1a61b20..1cea15b228 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -240,15 +240,15 @@ public final class Skill implements IIdentifiable _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -441,7 +441,7 @@ public final class Skill implements IIdentifiable } _magicCriticalRate = set.getDouble("magicCriticalRate", 0); - _buffType = isTriggeredSkill() ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : isDebuff() ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; + _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); } @@ -1054,7 +1054,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getMaxSoulConsumeCount() @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable public boolean isStayAfterDeath() { - return _stayAfterDeath || isIrreplacableBuff() || isNecessaryToggle(); + return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle; } public boolean isBad() @@ -1333,7 +1333,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isIgnoringSkillEffects(getId(), getLevel())) + if (effected.isIgnoringSkillEffects(_id, _level)) { return; } @@ -1357,7 +1357,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1368,19 +1368,19 @@ public final class Skill implements IIdentifiable } // Check for mesmerizing debuffs and increase resist level. - if (isDebuff() && (getBasicProperty() != BasicProperty.NONE) && effected.hasBasicPropertyResist()) + if (_isDebuff && (_basicProperty != BasicProperty.NONE) && effected.hasBasicPropertyResist()) { - final BasicPropertyResist resist = effected.getBasicPropertyResist(getBasicProperty()); + final BasicPropertyResist resist = effected.getBasicPropertyResist(_basicProperty); resist.increaseResistLevel(); } } // Support for buff sharing feature including healing herbs. - if (isSharedWithSummon() && effected.isPlayer() && effected.hasServitors() && !isTransformation()) + if (_isSharedWithSummon && effected.isPlayer() && effected.hasServitors() && !isTransformation()) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - effected.getServitors().values().forEach(s -> applyEffects(effector, s, isRecoveryHerb(), 0)); + effected.getServitors().values().forEach(s -> applyEffects(effector, s, _isRecoveryHerb, 0)); } } } @@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1413,7 +1413,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && isSharedWithSummon() && info.getEffected().isPlayer() && isContinuous() && !isDebuff() && info.getEffected().hasServitors()) + if (addContinuousEffects && _isSharedWithSummon && info.getEffected().isPlayer() && isContinuous() && !_isDebuff && info.getEffected().hasServitors()) { info.getEffected().getServitors().values().forEach(s -> applyEffects(effector, s, false, 0)); } @@ -1498,9 +1498,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0, item); } @@ -1517,7 +1517,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1571,7 +1571,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isIrreplacableBuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispelled(); + return !isPassive() && !isToggle() && !_isDebuff && !_irreplacableBuff && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispelled; } public boolean isClanSkill() @@ -1733,20 +1733,20 @@ public final class Skill implements IIdentifiable public Skill getAttachedSkill(L2Character activeChar) { // If character is double casting, return double cast skill. - if ((getDoubleCastSkill() > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) + if ((_doubleCastSkill > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) { return SkillData.getInstance().getSkill(getDoubleCastSkill(), getLevel(), getSubLevel()); } // Default toggle group ID, assume nothing attached. - if ((getAttachToggleGroupId() <= 0) || (getAttachSkills() == null)) + if ((_attachToggleGroupId <= 0) || (_attachSkills == null)) { return null; } //@formatter:off final int toggleSkillId = activeChar.getEffectList().getEffects().stream() - .filter(info -> info.getSkill().getToggleGroupId() == getAttachToggleGroupId()) + .filter(info -> info.getSkill().getToggleGroupId() == _attachToggleGroupId) .mapToInt(info -> info.getSkill().getId()) .findAny().orElse(0); //@formatter:on @@ -1757,7 +1757,7 @@ public final class Skill implements IIdentifiable return null; } - final AttachSkillHolder attachedSkill = getAttachSkills().stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); + final AttachSkillHolder attachedSkill = _attachSkills.stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); // No attached skills for this toggle found. if (attachedSkill == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 8e607be078..f5da8aed03 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -99,7 +99,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -160,7 +160,7 @@ public class SkillChannelizer implements Runnable if (o.isCharacter()) { targetList.add((L2Character) o); - ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), _channelizer); } }); } @@ -198,13 +198,13 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer()) + if (character.isPlayable() && _channelizer.isPlayer()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } // Be warned, this method has the possibility to call doDie->abortCast->stopChanneling method. Variable cache above try"+ +" is used in this case to avoid NPEs. - channeledSkill.applyEffects(getChannelizer(), character); + channeledSkill.applyEffects(_channelizer, character); // Reduce shots. if (skill.useSpiritShot()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 84fb8d0f96..3394227e4c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -145,7 +145,7 @@ public final class TeleportHolder // Build html final StringBuilder sb = new StringBuilder(); final StringBuilder sb_f = new StringBuilder(); - for (TeleportLocation loc : getLocations()) + for (TeleportLocation loc : _teleportData) { String finalName = loc.getName(); String confirmDesc = loc.getName(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 66f0ce1b9f..69519245dc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -205,7 +205,7 @@ public abstract class L2ZoneType extends ListenersContainer final Instance world = character.getInstanceWorld(); if (world != null) { - if (world.getTemplateId() != getInstanceTemplateId()) + if (world.getTemplateId() != _instanceTemplateId) { return false; } @@ -214,7 +214,7 @@ public abstract class L2ZoneType extends ListenersContainer return false; } } - else if (getInstanceTemplateId() > 0) + else if (_instanceTemplateId > 0) { return false; } @@ -402,12 +402,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -572,7 +572,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) @@ -605,10 +605,10 @@ public abstract class L2ZoneType extends ListenersContainer { if (_enabledInInstance != null) { - return _enabledInInstance.getOrDefault(instanceId, isEnabled()); + return _enabledInInstance.getOrDefault(instanceId, _enabled); } - return isEnabled(); + return _enabled; } public void oustAllPlayers() @@ -633,7 +633,7 @@ public abstract class L2ZoneType extends ListenersContainer return; } - for (L2Character character : getCharactersInside()) + for (L2Character character : _characterList.values()) { if ((character != null) && character.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 33d3bb8723..6a7479f3af 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public final class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -257,7 +257,7 @@ public final class L2EffectZone extends L2ZoneType { getCharactersInside().forEach(character -> { - if ((character != null) && !character.isDead() && (Rnd.get(100) < getChance())) + if ((character != null) && !character.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index a1a99b7051..95223b63a9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9b786f0b7d..f1e975876e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -252,7 +252,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -533,7 +533,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -603,11 +603,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 10ce97b46c..2d55d432bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -438,7 +438,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java index 1a16f0bd49..934a748fa3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 4911f2826c..e5388f4596 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -240,7 +240,7 @@ public class TaskExecutor */ public void pause() throws UnsupportedOperationException { - if (!canBePaused()) + if (!task.canBePaused()) { throw new UnsupportedOperationException("Pause not supported"); } @@ -276,7 +276,7 @@ public class TaskExecutor */ public void stop() throws UnsupportedOperationException { - if (!canBeStopped()) + if (!task.canBeStopped()) { throw new UnsupportedOperationException("Stop not supported"); } @@ -346,7 +346,7 @@ public class TaskExecutor */ public String getStatusMessage() throws UnsupportedOperationException { - if (!supportsStatusTracking()) + if (!task.supportsStatusTracking()) { throw new UnsupportedOperationException("Status tracking not supported"); } @@ -360,7 +360,7 @@ public class TaskExecutor */ public double getCompleteness() throws UnsupportedOperationException { - if (!supportsCompletenessTracking()) + if (!task.supportsCompletenessTracking()) { throw new UnsupportedOperationException("Completeness tracking not supported"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java index 85dbd2a34a..7d9ec1824b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java index da20164f21..068a5f1773 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 859128de7b..c90c8127a6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -286,7 +286,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -314,10 +314,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -376,59 +376,59 @@ public abstract class BaseGameServerRegister if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.printf(getBundle().getString("checkingIdInUse") + Config.EOL, _id); + System.out.printf(_bundle.getString("checkingIdInUse") + Config.EOL, _id); if (GameServerTable.getInstance().hasRegisteredGameServerOnId(_id)) { - System.out.println(getBundle().getString("yes")); + System.out.println(_bundle.getString("yes")); if (_force) { - System.out.printf(getBundle().getString("forcingRegistration") + Config.EOL, _id); + System.out.printf(_bundle.getString("forcingRegistration") + Config.EOL, _id); unregisterGameServer(_id); registerGameServer(_id, _outDir); - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, _id); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, _id); } else if (_fallback) { - System.out.println(getBundle().getString("fallingBack")); + System.out.println(_bundle.getString("fallingBack")); final int registeredId = registerFirstAvailable(_outDir); if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.println(getBundle().getString("noAction")); + System.out.println(_bundle.getString("noAction")); } } else { - System.out.println(getBundle().getString("no")); + System.out.println(_bundle.getString("no")); registerGameServer(_id, _outDir); } } } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } catch (IOException e) { - showError(getBundle().getString("ioErrorRegister"), e); + showError(_bundle.getString("ioErrorRegister"), e); } } } @@ -453,14 +453,14 @@ public abstract class BaseGameServerRegister @Override public void run() { - System.out.printf(getBundle().getString("removingGsId") + Config.EOL, _id); + System.out.printf(_bundle.getString("removingGsId") + Config.EOL, _id); try { unregisterGameServer(_id); } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } } } @@ -479,7 +479,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg b/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg new file mode 100644 index 0000000000..d55d5ae3a1 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg @@ -0,0 +1,9 @@ +#Olympiad Properties +#Sat Jun 23 03:04:27 EEST 2018 +CurrentCycle=1 +NextWeeklyChange_DateFormat=30 \u0399\u03BF\u03C5\u03BD 2018 2\:40\:38 \u03C0\u03BC +NextWeeklyChange=1530315638161 +OlympiadEnd=1530435600161 +OlympiadEnd_DateFormat=1 \u0399\u03BF\u03C5\u03BB 2018 12\:00\:00 \u03BC\u03BC +Period=0 +ValdationEnd=0 diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/RecipeController.java index 191f6f9189..66af531489 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/RecipeController.java @@ -205,7 +205,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -315,7 +315,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -459,7 +459,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); _activeMakers.remove(_player); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendPacket(new ItemList(_target, false)); } @@ -594,7 +594,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player); } @@ -725,7 +725,7 @@ public class RecipeController if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage("No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 3490e386f2..f4069e79d0 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -744,7 +744,7 @@ abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if ((_actor instanceof L2PcInstance) && (((L2PcInstance) _actor).getPet() != null)) { @@ -775,7 +775,7 @@ abstract class AbstractAI implements Ctrl return; } - final boolean isAutoAttacking = isAutoAttacking(); + final boolean isAutoAttacking = _clientAutoAttacking; if (_actor instanceof L2PcInstance) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8f823521e6..acd330d945 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking() || _actor.isAllSkillsDisabled()) + if (_isThinking || _actor.isAllSkillsDisabled()) { return; } @@ -84,7 +84,7 @@ public class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -163,7 +163,7 @@ public class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getAttackTarget(), max_range); } @@ -211,7 +211,7 @@ public class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -250,7 +250,7 @@ public class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index bfa7b00930..6becd2bacd 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -1004,7 +1004,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable return; } - for (L2Character aggroed : me.getAggroListRP().keySet()) + for (L2Character aggroed : me.getAggroList().keySet()) { me.addDamageHate(aggroed, 0, aggro); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java index ee33d5b511..6980adc4b4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java @@ -76,7 +76,7 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable return; } - if (isWalkingToNextPoint()) + if (_walkingToNextPoint) { checkArrived(); return; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 85d3db9359..f1d157906a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -831,7 +831,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable return; } - for (L2Character aggroed : me.getAggroListRP().keySet()) + for (L2Character aggroed : me.getAggroList().keySet()) { me.addDamageHate(aggroed, 0, aggro); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/CrestCache.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/CrestCache.java index bd5953c118..91f6159664 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/CrestCache.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/CrestCache.java @@ -135,7 +135,7 @@ public class CrestCache } } - LOGGER.info("Cache[Crest]: " + String.format("%.3f", getMemoryUsage()) + "MB on " + getLoadedFiles() + " files loaded."); + LOGGER.info("Cache[Crest]: " + String.format("%.3f", getMemoryUsage()) + "MB on " + _loadedFiles + " files loaded."); } public void convertOldPedgeFiles() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/HtmCache.java index 4b62fd8bdb..d04956a3ff 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -67,7 +67,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index f2f857acc4..a4ba30aa4e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -123,12 +123,12 @@ public class Topic public void deleteMe(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?"); - statement.setInt(1, getID()); + statement.setInt(1, _id); statement.setInt(2, f.getID()); statement.execute(); statement.close(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/MobGroupTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/MobGroupTable.java index fcaef96ccc..b8970578e3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/MobGroupTable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/MobGroupTable.java @@ -78,7 +78,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java index f0720ae1ae..6e46bd766d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java @@ -71,7 +71,7 @@ public class NodeLoc extends AbstractNodeLoc public boolean canGoAll() { - return canGoNorth() && canGoEast() && canGoSouth() && canGoWest(); + return _goNorth && _goEast && _goSouth && _goWest; } @Override @@ -113,19 +113,19 @@ public class NodeLoc extends AbstractNodeLoc result = (prime * result) + _y; int nswe = 0; - if (canGoNorth()) + if (_goNorth) { nswe |= Cell.NSWE_NORTH; } - if (canGoEast()) + if (_goEast) { nswe |= Cell.NSWE_EAST; } - if (canGoSouth()) + if (_goSouth) { nswe |= Cell.NSWE_SOUTH; } - if (canGoWest()) + if (_goWest) { nswe |= Cell.NSWE_WEST; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java index 7162652b2c..a0a034330f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java @@ -424,7 +424,7 @@ public class AutoAnnouncementHandler _isActive = activeValue; - if (isActive()) + if (_isActive) { AutoAnnouncementRunner acr = new AutoAnnouncementRunner(_defaultId); _chatTask = ThreadPool.scheduleAtFixedRate(acr, _defaultDelay, _defaultDelay); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java index e2d2d27aac..5312ca9ecc 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoChatHandler.java @@ -544,7 +544,7 @@ public class AutoChatHandler implements SpawnListener _isActive = activeValue; - if (!isGlobal()) + if (!_globalChat) { for (AutoChatDefinition chatDefinition : _chatDefinitions.values()) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Fishing.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Fishing.java index 35b39195a3..1ca347191e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Fishing.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Fishing.java @@ -115,7 +115,7 @@ public class Fishing implements ISkillHandler return; } - if (player.isInCraftMode() || player.isInStoreMode()) + if (player.isCrafting() || player.isInStoreMode()) { player.sendPacket(SystemMessageId.CANNOT_FISH_WHILE_USING_RECIPE_BOOK); // if(!player.isGM()) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java index 808d66e1df..20df289420 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java @@ -55,7 +55,7 @@ public class OfflineShop implements IUserCommandHandler } // Message like L2OFF - if ((!player.isInStoreMode() && (!player.isInCraftMode())) || !player.isSitting()) + if ((!player.isInStoreMode() && (!player.isCrafting())) || !player.isSitting()) { player.sendMessage("You are not running a private store or private work shop."); player.sendPacket(ActionFailed.STATIC_PACKET); @@ -150,7 +150,7 @@ public class OfflineShop implements IUserCommandHandler player.removeSkill(SkillTable.getInstance().getInfo(4289, 1)); } - if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isInCraftMode() && Config.OFFLINE_CRAFT_ENABLE)) + if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE)) { // Sleep effect, not official feature but however L2OFF features (like offline trade) if (Config.OFFLINE_SLEEP_EFFECT) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java index d5956d58ba..f16fe69bdb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java @@ -51,7 +51,7 @@ public class OfflineShop implements IVoicedCommandHandler } // Message like L2OFF - if ((!player.isInStoreMode() && (!player.isInCraftMode())) || !player.isSitting()) + if ((!player.isInStoreMode() && (!player.isCrafting())) || !player.isSitting()) { player.sendMessage("You are not running a private store or private work shop."); player.sendPacket(ActionFailed.STATIC_PACKET); @@ -146,7 +146,7 @@ public class OfflineShop implements IVoicedCommandHandler player.removeSkill(SkillTable.getInstance().getInfo(4289, 1)); } - if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isInCraftMode() && Config.OFFLINE_CRAFT_ENABLE)) + if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE)) { // Sleep effect, not official feature but however L2OFF features (like offline trade) if (Config.OFFLINE_SLEEP_EFFECT) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 02f29e0b1a..119004dcbd 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -29,7 +29,6 @@ import com.l2jmobius.commons.util.PrimeFinder; * @author Olympic * @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $ */ - public class BitSetIDFactory extends IdFactory { private static Logger LOGGER = Logger.getLogger(BitSetIDFactory.class.getName()); @@ -148,7 +147,7 @@ public class BitSetIDFactory extends IdFactory protected synchronized int usedIdCount() { - return (size() - FIRST_OID); + return (_freeIdCount.get() - FIRST_OID); } protected synchronized boolean reachingBitSetCapacity() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/AuctionManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/AuctionManager.java index d3d5c74687..2e917f4f8c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/AuctionManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/AuctionManager.java @@ -144,7 +144,7 @@ public class AuctionManager } statement.close(); rs.close(); - LOGGER.info("Loaded: " + getAuctions().size() + " auction(s)"); + LOGGER.info("Loaded: " + _auctions.size() + " auction(s)"); } catch (Exception e) @@ -159,7 +159,7 @@ public class AuctionManager final int index = getAuctionIndex(auctionId); if (index >= 0) { - return getAuctions().get(index); + return _auctions.get(index); } return null; @@ -169,9 +169,9 @@ public class AuctionManager { Auction auction; - for (int i = 0; i < getAuctions().size(); i++) + for (int i = 0; i < _auctions.size(); i++) { - auction = getAuctions().get(i); + auction = _auctions.get(i); if ((auction != null) && (auction.getId() == auctionId)) { return i; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 2d2864c5c5..35352d27b4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -61,8 +61,8 @@ public class CastleManorManager protected static final int MANOR_REFRESH_MIN = Config.ALT_MANOR_REFRESH_MIN; // protected static final long MAINTENANCE_PERIOD = Config.ALT_MANOR_MAINTENANCE_PERIOD / 60000; // 6 mins - private boolean _underMaintenance; - private boolean _disabled; + boolean _underMaintenance; + boolean _disabled; public static CastleManorManager getInstance() { @@ -522,13 +522,13 @@ public class CastleManorManager LOGGER.info("Manor System: Under maintenance mode started"); } } - else if (isUnderMaintenance()) // 20:00 - 20:06 + else if (_underMaintenance) // 20:00 - 20:06 { if ((H != MANOR_REFRESH) || (M >= (MANOR_REFRESH_MIN + MAINTENANCE_PERIOD))) { setUnderMaintenance(false); LOGGER.info("Manor System: Next period started"); - if (isDisabled()) + if (_disabled) { return; } @@ -547,7 +547,7 @@ public class CastleManorManager { APPROVE = 1; LOGGER.info("Manor System: Next period approved"); - if (isDisabled()) + if (_disabled) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java index c64d7cbf49..e7860b0922 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -111,8 +111,8 @@ public class ClanHallManager rs.close(); statement.close(); - LOGGER.info("Loaded: " + getClanHalls().size() + " clan halls"); - LOGGER.info("Loaded: " + getFreeClanHalls().size() + " free clan halls"); + LOGGER.info("Loaded: " + _clanHall.size() + " clan halls"); + LOGGER.info("Loaded: " + _freeClanHall.size() + " free clan halls"); _loaded = true; } catch (Exception e) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java index ee3ac3b94b..02a616c765 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java @@ -73,13 +73,13 @@ public class CoupleManager while (rs.next()) { - getCouples().add(new Wedding(rs.getInt("id"))); + _couples.add(new Wedding(rs.getInt("id"))); } statement.close(); rs.close(); - LOGGER.info("Loaded: " + getCouples().size() + " couples(s)"); + LOGGER.info("Loaded: " + _couples.size() + " couples(s)"); } catch (Exception e) { @@ -94,7 +94,7 @@ public class CoupleManager final int index = getCoupleIndex(coupleId); if (index >= 0) { - return getCouples().get(index); + return _couples.get(index); } return null; } @@ -109,7 +109,7 @@ public class CoupleManager final int _player2id = player2.getObjectId(); Wedding _new = new Wedding(player1, player2); - getCouples().add(_new); + _couples.add(_new); player1.setPartnerId(_player2id); player2.setPartnerId(_player1id); player1.setCoupleId(_new.getId()); @@ -121,7 +121,7 @@ public class CoupleManager public void deleteCouple(int coupleId) { final int index = getCoupleIndex(coupleId); - Wedding wedding = getCouples().get(index); + Wedding wedding = _couples.get(index); if (wedding != null) { @@ -140,14 +140,14 @@ public class CoupleManager player2.setCoupleId(0); } wedding.divorce(); - getCouples().remove(index); + _couples.remove(index); } } public final int getCoupleIndex(int coupleId) { int i = 0; - for (Wedding temp : getCouples()) + for (Wedding temp : _couples) { if ((temp != null) && (temp.getId() == coupleId)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index fd97393921..525d735047 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -65,9 +65,9 @@ public class FortManager double closestDistance = 99999999; double distance; Fort fort; - for (int i = 0; i < getForts().size(); i++) + for (int i = 0; i < _forts.size(); i++) { - fort = getForts().get(i); + fort = _forts.get(i); if (fort == null) { continue; @@ -97,13 +97,13 @@ public class FortManager while (rs.next()) { - getForts().add(new Fort(rs.getInt("id"))); + _forts.add(new Fort(rs.getInt("id"))); } rs.close(); statement.close(); - LOGGER.info("Loaded: " + getForts().size() + " fortress"); + LOGGER.info("Loaded: " + _forts.size() + " fortress"); } catch (Exception e) { @@ -116,7 +116,7 @@ public class FortManager // Property - Public public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts) { if (f.getFortId() == fortId) { @@ -128,7 +128,7 @@ public class FortManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts) { if (f.getOwnerId() == clan.getClanId()) { @@ -140,7 +140,7 @@ public class FortManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -152,7 +152,7 @@ public class FortManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts) { if (f.checkIfInZone(x, y, z)) { @@ -170,9 +170,9 @@ public class FortManager public final int getFortIndex(int fortId) { Fort fort; - for (int i = 0; i < getForts().size(); i++) + for (int i = 0; i < _forts.size(); i++) { - fort = getForts().get(i); + fort = _forts.get(i); if ((fort != null) && (fort.getFortId() == fortId)) { return i; @@ -189,9 +189,9 @@ public class FortManager public final int getFortIndex(int x, int y, int z) { Fort fort; - for (int i = 0; i < getForts().size(); i++) + for (int i = 0; i < _forts.size(); i++) { - fort = getForts().get(i); + fort = _forts.get(i); if ((fort != null) && fort.checkIfInZone(x, y, z)) { return i; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java index 2441f170aa..8f2ecfff00 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java @@ -146,13 +146,13 @@ public class FortSiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Delete From fort_siege_guards Where fortId = ? And isHired = 1"); - statement.setInt(1, getFort().getFortId()); + statement.setInt(1, _fort.getFortId()); statement.execute(); statement.close(); } catch (Exception e1) { - LOGGER.warning("Error deleting hired siege guard for fort " + getFort().getName() + ":" + e1); + LOGGER.warning("Error deleting hired siege guard for fort " + _fort.getName() + ":" + e1); } } @@ -165,7 +165,7 @@ public class FortSiegeGuardManager try { loadSiegeGuard(); - for (L2Spawn spawn : getSiegeGuardSpawn()) + for (L2Spawn spawn : _siegeGuardSpawn) { if (spawn != null) { @@ -175,7 +175,7 @@ public class FortSiegeGuardManager } catch (Throwable t) { - LOGGER.warning("Error spawning siege guards for fort " + getFort().getName() + ":" + t); + LOGGER.warning("Error spawning siege guards for fort " + _fort.getName() + ":" + t); } } @@ -185,7 +185,7 @@ public class FortSiegeGuardManager */ public void unspawnSiegeGuard() { - for (L2Spawn spawn : getSiegeGuardSpawn()) + for (L2Spawn spawn : _siegeGuardSpawn) { if (spawn == null) { @@ -196,7 +196,7 @@ public class FortSiegeGuardManager spawn.getLastSpawn().doDie(spawn.getLastSpawn()); } - getSiegeGuardSpawn().clear(); + _siegeGuardSpawn.clear(); } // ========================================================= @@ -210,7 +210,7 @@ public class FortSiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("SELECT * FROM fort_siege_guards Where fortId = ? "); - statement.setInt(1, getFort().getFortId()); + statement.setInt(1, _fort.getFortId()); ResultSet rs = statement.executeQuery(); L2Spawn spawn1; @@ -242,7 +242,7 @@ public class FortSiegeGuardManager } catch (Exception e1) { - LOGGER.warning("Error loading siege guard for fort " + getFort().getName() + ":" + e1); + LOGGER.warning("Error loading siege guard for fort " + _fort.getName() + ":" + e1); } } @@ -261,7 +261,7 @@ public class FortSiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Insert Into fort_siege_guards (fortId, npcId, x, y, z, heading, respawnDelay, isHired) Values (?, ?, ?, ?, ?, ?, ?, ?)"); - statement.setInt(1, getFort().getFortId()); + statement.setInt(1, _fort.getFortId()); statement.setInt(2, npcId); statement.setInt(3, x); statement.setInt(4, y); @@ -281,7 +281,7 @@ public class FortSiegeGuardManager } catch (Exception e1) { - LOGGER.warning("Error adding siege guard for fort " + getFort().getName() + ":" + e1); + LOGGER.warning("Error adding siege guard for fort " + _fort.getName() + ":" + e1); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 6574116a1d..5d6aa72bb9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -1115,7 +1115,7 @@ public class FourSepulchersManager extends GrandBossManager } } - if (!isEntryTime()) + if (!_inEntryTime) { showHtmlFile(player, npcId + "-NE.htm", npc, null); return; @@ -1232,7 +1232,7 @@ public class FourSepulchersManager extends GrandBossManager public void spawnMysteriousBox(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1247,7 +1247,7 @@ public class FourSepulchersManager extends GrandBossManager public void spawnMonster(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1423,7 +1423,7 @@ public class FourSepulchersManager extends GrandBossManager public void spawnKeyBox(L2NpcInstance activeChar) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1445,7 +1445,7 @@ public class FourSepulchersManager extends GrandBossManager public void spawnExecutionerOfHalisha(L2NpcInstance activeChar) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1467,7 +1467,7 @@ public class FourSepulchersManager extends GrandBossManager public void spawnArchonOfHalisha(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1498,7 +1498,7 @@ public class FourSepulchersManager extends GrandBossManager public void spawnEmperorsGraveNpc(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1544,7 +1544,7 @@ public class FourSepulchersManager extends GrandBossManager public void spawnShadow(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java index dd671506ce..ad4968bd75 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -679,7 +679,7 @@ public class MercTicketManager public void reload() { - getDroppedTickets().clear(); + _droppedTickets.clear(); load(); } @@ -733,7 +733,7 @@ public class MercTicketManager dropticket.dropMe(null, x, y, z); dropticket.setDropTime(0); // avoids it from beeing removed by the auto item destroyer L2World.getInstance().storeObject(dropticket); - getDroppedTickets().add(dropticket); + _droppedTickets.add(dropticket); } break; } @@ -742,7 +742,7 @@ public class MercTicketManager statement.close(); rs.close(); - LOGGER.info("Loaded: " + getDroppedTickets().size() + " Mercenary Tickets"); + LOGGER.info("Loaded: " + _droppedTickets.size() + " Mercenary Tickets"); } catch (Exception e) { @@ -778,9 +778,9 @@ public class MercTicketManager int count = 0; L2ItemInstance ticket; - for (int i = 0; i < getDroppedTickets().size(); i++) + for (int i = 0; i < _droppedTickets.size(); i++) { - ticket = getDroppedTickets().get(i); + ticket = _droppedTickets.get(i); if ((ticket != null) && (ticket.getItemId() == itemId)) { count++; @@ -815,9 +815,9 @@ public class MercTicketManager int count = 0; L2ItemInstance ticket; - for (int i = 0; i < getDroppedTickets().size(); i++) + for (int i = 0; i < _droppedTickets.size(); i++) { - ticket = getDroppedTickets().get(i); + ticket = _droppedTickets.get(i); if ((ticket != null) && (getTicketCastleId(ticket.getItemId()) == castleId)) { count++; @@ -906,16 +906,16 @@ public class MercTicketManager public void deleteTickets(int castleId) { int i = 0; - while (i < getDroppedTickets().size()) + while (i < _droppedTickets.size()) { - L2ItemInstance item = getDroppedTickets().get(i); + L2ItemInstance item = _droppedTickets.get(i); if ((item != null) && (getTicketCastleId(item.getItemId()) == castleId)) { item.decayMe(); L2World.getInstance().removeObject(item); // remove from the list - getDroppedTickets().remove(i); + _droppedTickets.remove(i); } else { @@ -950,7 +950,7 @@ public class MercTicketManager new SiegeGuardManager(castle).removeMerc(npcId, item.getX(), item.getY(), item.getZ()); } - getDroppedTickets().remove(item); + _droppedTickets.remove(item); } public int[] getItemIds() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 8f94acd82d..84fb8a6cb4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -44,8 +44,8 @@ public final class PetitionManager protected static final Logger LOGGER = Logger.getLogger(PetitionManager.class.getName()); private static PetitionManager _instance; - private final Map _pendingPetitions; - private final Map _completedPetitions; + final Map _pendingPetitions; + final Map _completedPetitions; private enum PetitionState { @@ -128,37 +128,37 @@ public final class PetitionManager setState(endState); // _endTime = System.currentTimeMillis(); - if ((getResponder() != null) && (getResponder().isOnline() == 1)) + if ((_responder != null) && (_responder.isOnline() == 1)) { if (endState == PetitionState.Responder_Reject) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = new SystemMessage(SystemMessageId.PETITION_ENDED_WITH_S1); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.Petitioner_Cancel) { // Receipt No. petition cancelled. sm = new SystemMessage(SystemMessageId.RECENT_NO_S1_CANCELED); - sm.addNumber(getId()); - getResponder().sendPacket(sm); + sm.addNumber(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. - if ((getPetitioner() != null) && (getPetitioner().isOnline() == 1)) + if ((_petitioner != null) && (_petitioner.isOnline() == 1)) { - getPetitioner().sendPacket(SystemMessageId.THIS_END_THE_PETITION_PLEASE_PROVIDE_FEEDBACK); + _petitioner.sendPacket(SystemMessageId.THIS_END_THE_PETITION_PLEASE_PROVIDE_FEEDBACK); } - getCompletedPetitions().put(getId(), this); - return getPendingPetitions().remove(getId()) != null; + _completedPetitions.put(_id, this); + return _pendingPetitions.remove(_id) != null; } public String getContent() @@ -203,24 +203,24 @@ public final class PetitionManager public void sendPetitionerPacket(L2GameServerPacket responsePacket) { - if ((getPetitioner() == null) || (getPetitioner().isOnline() == 0)) + if ((_petitioner == null) || (_petitioner.isOnline() == 0)) { // endPetitionConsultation(PetitionState.Petitioner_Missing); return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(L2GameServerPacket responsePacket) { - if ((getResponder() == null) || (getResponder().isOnline() == 0)) + if ((_responder == null) || (_responder.isOnline() == 0)) { endPetitionConsultation(PetitionState.Responder_Missing); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -230,7 +230,7 @@ public final class PetitionManager public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } @@ -247,17 +247,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info("PetitionManager: Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info("PetitionManager: Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -268,7 +268,7 @@ public final class PetitionManager return false; } - Petition currPetition = getPendingPetitions().get(petitionId); + Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -295,7 +295,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -315,7 +315,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -342,7 +342,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -370,7 +370,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -382,7 +382,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -395,7 +395,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -413,7 +413,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -436,7 +436,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return currPetition.getState() == PetitionState.In_Process; } @@ -444,7 +444,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -475,7 +475,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -494,7 +494,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -504,7 +504,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -522,7 +522,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -558,7 +558,7 @@ public final class PetitionManager final StringBuilder htmlContent = new StringBuilder("
Current Petitions

There are no currently pending petitions.
"); final SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM HH:mm z"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -567,7 +567,7 @@ public final class PetitionManager htmlContent.append(""); } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -600,7 +600,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -621,7 +621,7 @@ public final class PetitionManager return; } - Petition currPetition = getPendingPetitions().get(petitionId); + Petition currPetition = _pendingPetitions.get(petitionId); StringBuilder htmlContent = new StringBuilder(""); SimpleDateFormat dateFormat = new SimpleDateFormat("EEE dd MMM HH:mm z"); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index ebdb5602da..1326e1b3da 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -142,13 +142,13 @@ public class SiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Delete From castle_siege_guards Where castleId = ? And isHired = 1"); - statement.setInt(1, getCastle().getCastleId()); + statement.setInt(1, _castle.getCastleId()); statement.execute(); statement.close(); } catch (Exception e1) { - LOGGER.warning("Error deleting hired siege guard for castle " + getCastle().getName() + ":" + e1); + LOGGER.warning("Error deleting hired siege guard for castle " + _castle.getName() + ":" + e1); } } @@ -159,7 +159,7 @@ public class SiegeGuardManager public void spawnSiegeGuard() { loadSiegeGuard(); - for (L2Spawn spawn : getSiegeGuardSpawn()) + for (L2Spawn spawn : _siegeGuardSpawn) { if (spawn != null) { @@ -174,7 +174,7 @@ public class SiegeGuardManager */ public void unspawnSiegeGuard() { - for (L2Spawn spawn : getSiegeGuardSpawn()) + for (L2Spawn spawn : _siegeGuardSpawn) { if (spawn == null) { @@ -185,7 +185,7 @@ public class SiegeGuardManager spawn.getLastSpawn().doDie(spawn.getLastSpawn()); } - getSiegeGuardSpawn().clear(); + _siegeGuardSpawn.clear(); } // ========================================================= @@ -199,8 +199,8 @@ public class SiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("SELECT * FROM castle_siege_guards Where castleId = ? And isHired = ?"); - statement.setInt(1, getCastle().getCastleId()); - if (getCastle().getOwnerId() > 0) + statement.setInt(1, _castle.getCastleId()); + if (_castle.getOwnerId() > 0) { statement.setInt(2, 1); } @@ -239,7 +239,7 @@ public class SiegeGuardManager } catch (Exception e1) { - LOGGER.warning("Error loading siege guard for castle " + getCastle().getName() + ":" + e1); + LOGGER.warning("Error loading siege guard for castle " + _castle.getName() + ":" + e1); } } @@ -258,7 +258,7 @@ public class SiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Insert Into castle_siege_guards (castleId, npcId, x, y, z, heading, respawnDelay, isHired) Values (?, ?, ?, ?, ?, ?, ?, ?)"); - statement.setInt(1, getCastle().getCastleId()); + statement.setInt(1, _castle.getCastleId()); statement.setInt(2, npcId); statement.setInt(3, x); statement.setInt(4, y); @@ -278,7 +278,7 @@ public class SiegeGuardManager } catch (Exception e1) { - LOGGER.warning("Error adding siege guard for castle " + getCastle().getName() + ":" + e1); + LOGGER.warning("Error adding siege guard for castle " + _castle.getName() + ":" + e1); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 69ad25499f..981cff77cd 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -64,7 +64,7 @@ public class CursedWeapon private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; private L2PcInstance _player = null; @@ -208,7 +208,7 @@ public class CursedWeapon @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java index 9ec2cd0e4c..368febba26 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -183,7 +183,7 @@ public class L2Clan try { restore(); - getWarehouse().restore(); + _warehouse.restore(); } catch (Exception e) { @@ -290,7 +290,7 @@ public class L2Clan activeChar.sendPacket(ActionFailed.STATIC_PACKET); return; } - if (!getLeader().isOnline()) + if (!_leader.isOnline()) { return; } @@ -305,19 +305,13 @@ public class L2Clan return; } - // L2PcInstance exLeader = getLeader().getPlayerInstance(); + // L2PcInstance exLeader = _leader.getPlayerInstance(); if (setLeader(member)) { SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_S1); sm.addString(member.getName()); broadcastToOnlineMembers(sm); } - - // SiegeManager.getInstance().removeSiegeSkills(exLeader); - - /* - * if(getLevel() >= 4) { SiegeManager.getInstance().addSiegeSkills(newLeader); } - */ } /** @@ -518,7 +512,7 @@ public class L2Clan { case 0: { - switch (getLevel()) + switch (_level) { case 4: { @@ -769,20 +763,20 @@ public class L2Clan { PreparedStatement statement = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=? WHERE clan_id=?"); statement.setInt(1, getLeaderId()); - statement.setInt(2, getAllyId()); - statement.setString(3, getAllyName()); - statement.setInt(4, getReputationScore()); - statement.setLong(5, getAllyPenaltyExpiryTime()); - statement.setInt(6, getAllyPenaltyType()); - statement.setLong(7, getCharPenaltyExpiryTime()); - statement.setLong(8, getDissolvingExpiryTime()); - statement.setInt(9, getClanId()); + statement.setInt(2, _allyId); + statement.setString(3, _allyName); + statement.setInt(4, _reputationScore); + statement.setLong(5, _allyPenaltyExpiryTime); + statement.setInt(6, _allyPenaltyType); + statement.setLong(7, _charPenaltyExpiryTime); + statement.setLong(8, _dissolvingExpiryTime); + statement.setInt(9, _clanId); statement.execute(); statement.close(); if (Config.DEBUG) { - LOGGER.info("New clan leader saved in db: " + getClanId()); + LOGGER.info("New clan leader saved in db: " + _clanId); } } catch (Exception e) @@ -796,22 +790,22 @@ public class L2Clan try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id) values (?,?,?,?,?,?,?,?,?,?)"); - statement.setInt(1, getClanId()); - statement.setString(2, getName()); - statement.setInt(3, getLevel()); - statement.setInt(4, getHasCastle()); - statement.setInt(5, getAllyId()); - statement.setString(6, getAllyName()); + statement.setInt(1, _clanId); + statement.setString(2, _name); + statement.setInt(3, _level); + statement.setInt(4, _hasCastle); + statement.setInt(5, _allyId); + statement.setString(6, _allyName); statement.setInt(7, getLeaderId()); - statement.setInt(8, getCrestId()); - statement.setInt(9, getCrestLargeId()); - statement.setInt(10, getAllyCrestId()); + statement.setInt(8, _crestId); + statement.setInt(9, _crestLargeId); + statement.setInt(10, _allyCrestId); statement.execute(); statement.close(); if (Config.DEBUG) { - LOGGER.info("New clan saved in db: " + getClanId()); + LOGGER.info("New clan saved in db: " + _clanId); } } catch (Exception e) @@ -834,7 +828,7 @@ public class L2Clan if (Config.DEBUG) { - LOGGER.info("clan member removed in db: " + getClanId()); + LOGGER.info("clan member removed in db: " + _clanId); } statement = con.prepareStatement("UPDATE characters SET apprentice=0 WHERE apprentice=?"); @@ -860,7 +854,7 @@ public class L2Clan L2ClanMember member; PreparedStatement statement = con.prepareStatement("SELECT clan_name,clan_level,hasCastle,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,reputation_score,auction_bid_at,ally_penalty_expiry_time,ally_penalty_type,char_penalty_expiry_time,dissolving_expiry_time FROM clan_data where clan_id=?"); - statement.setInt(1, getClanId()); + statement.setInt(1, _clanId); ResultSet clanData = statement.executeQuery(); if (clanData.next()) @@ -872,14 +866,14 @@ public class L2Clan setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -888,14 +882,14 @@ public class L2Clan setCrestId(clanData.getInt("crest_id")); - if (getCrestId() != 0) + if (_crestId != 0) { setHasCrest(true); } setCrestLargeId(clanData.getInt("crest_large_id")); - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { setHasCrestLarge(true); } @@ -907,7 +901,7 @@ public class L2Clan final int leaderId = clanData.getInt("leader_id"); PreparedStatement statement2 = con.prepareStatement("SELECT char_name,level,classid,obj_Id,title,power_grade,subpledge,apprentice,sponsor FROM characters WHERE clanid=?"); - statement2.setInt(1, getClanId()); + statement2.setInt(1, _clanId); ResultSet clanMembers = statement2.executeQuery(); while (clanMembers.next()) @@ -931,9 +925,9 @@ public class L2Clan clanData.close(); statement.close(); - if (Config.DEBUG && (getName() != null)) + if (Config.DEBUG && (_name != null)) { - LOGGER.info("Restored clan data for \"" + getName() + "\" from database."); + LOGGER.info("Restored clan data for \"" + _name + "\" from database."); } restoreSubPledges(); @@ -1048,7 +1042,7 @@ public class L2Clan try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("SELECT skill_id,skill_level FROM clan_skills WHERE clan_id=?"); - statement.setInt(1, getClanId()); + statement.setInt(1, _clanId); ResultSet rset = statement.executeQuery(); @@ -1129,7 +1123,7 @@ public class L2Clan statement = con.prepareStatement("UPDATE clan_skills SET skill_level=? WHERE skill_id=? AND clan_id=?"); statement.setInt(1, newSkill.getLevel()); statement.setInt(2, oldSkill.getId()); - statement.setInt(3, getClanId()); + statement.setInt(3, _clanId); statement.execute(); statement.close(); } @@ -1138,7 +1132,7 @@ public class L2Clan try { statement = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name) VALUES (?,?,?,?)"); - statement.setInt(1, getClanId()); + statement.setInt(1, _clanId); statement.setInt(2, newSkill.getId()); statement.setInt(3, newSkill.getLevel()); statement.setString(4, newSkill.getName()); @@ -1150,7 +1144,7 @@ public class L2Clan statement = con.prepareStatement("UPDATE clan_skills SET skill_level=? WHERE skill_id=? AND clan_id=?"); statement.setInt(1, newSkill.getLevel()); statement.setInt(2, newSkill.getId()); - statement.setInt(3, getClanId()); + statement.setInt(3, _clanId); statement.execute(); statement.close(); } @@ -1230,7 +1224,7 @@ public class L2Clan public void broadcastToOnlineAllyMembers(L2GameServerPacket packet) { - if (getAllyId() == 0) + if (_allyId == 0) { return; } @@ -1521,7 +1515,7 @@ public class L2Clan try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("SELECT sub_pledge_id,name,leader_name FROM clan_subpledges WHERE clan_id=?"); - statement.setInt(1, getClanId()); + statement.setInt(1, _clanId); ResultSet rset = statement.executeQuery(); while (rset.next()) @@ -1621,7 +1615,7 @@ public class L2Clan // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < 5000) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < 10000) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < 5000) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < 10000) && (pledgeType > SUBUNIT_ROYAL2)))) { SystemMessage sp = new SystemMessage(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW); player.sendPacket(sp); @@ -1632,7 +1626,7 @@ public class L2Clan try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_name) values (?,?,?,?)"); - statement.setInt(1, getClanId()); + statement.setInt(1, _clanId); statement.setInt(2, pledgeType); statement.setString(3, subPledgeName); @@ -1653,12 +1647,12 @@ public class L2Clan if (pledgeType != -1) { - setReputationScore(getReputationScore() - 2500, true); + setReputationScore(_reputationScore - 2500, true); } if (Config.DEBUG) { - LOGGER.info("New sub_clan saved in db: " + getClanId() + "; " + pledgeType); + LOGGER.info("New sub_clan saved in db: " + _clanId + "; " + pledgeType); } } catch (Exception e) @@ -1723,7 +1717,7 @@ public class L2Clan PreparedStatement statement = con.prepareStatement("UPDATE clan_subpledges SET leader_name=?, name=? WHERE clan_id=? AND sub_pledge_id=?"); statement.setString(1, getSubPledge(pledgeType).getLeaderName()); statement.setString(2, getSubPledge(pledgeType).getName()); - statement.setInt(3, getClanId()); + statement.setInt(3, _clanId); statement.setInt(4, pledgeType); statement.execute(); @@ -1731,7 +1725,7 @@ public class L2Clan if (Config.DEBUG) { - LOGGER.info("New subpledge leader saved in db: " + getClanId()); + LOGGER.info("New subpledge leader saved in db: " + _clanId); } } catch (Exception e) @@ -1745,8 +1739,8 @@ public class L2Clan try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?"); - statement.setInt(1, getClanId()); - // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); + statement.setInt(1, _clanId); + // LOGGER.warning("clanPrivs restore for ClanId : "+_clanId); ResultSet rset = statement.executeQuery(); // Go though the recordset of this SQL query @@ -1801,7 +1795,7 @@ public class L2Clan try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?"); - statement.setInt(1, getClanId()); + statement.setInt(1, _clanId); statement.setInt(2, rank); statement.setInt(3, 0); statement.setInt(4, privs); @@ -1838,7 +1832,7 @@ public class L2Clan try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)"); - statement.setInt(1, getClanId()); + statement.setInt(1, _clanId); statement.setInt(2, rank); statement.setInt(3, 0); statement.setInt(4, privs); @@ -1970,7 +1964,7 @@ public class L2Clan { PreparedStatement statement = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?"); statement.setInt(1, id); - statement.setInt(2, getClanId()); + statement.setInt(2, _clanId); statement.execute(); statement.close(); } @@ -2013,7 +2007,7 @@ public class L2Clan return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MUST_WAIT_BEFORE_ACCEPTING_A_NEW_MEMBER); sm.addString(target.getName()); @@ -2051,7 +2045,7 @@ public class L2Clan if (pledgeType == 0) { SystemMessage sm = new SystemMessage(SystemMessageId.S1_CLAN_IS_FULL); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2238,28 +2232,28 @@ public class L2Clan return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.ALREADY_JOINED_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLY_YOU_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if (getAllyPenaltyExpiryTime() > System.currentTimeMillis()) + if (_allyPenaltyExpiryTime > System.currentTimeMillis()) { - if (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY) + if (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY) { player.sendPacket(SystemMessageId.CANT_CREATE_ALLIANCE_10_DAYS_DISOLUTION); return; } } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_CREATE_ALLY_WHILE_DISSOLVING); return; @@ -2296,7 +2290,7 @@ public class L2Clan return; } - setAllyId(getClanId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2309,13 +2303,13 @@ public class L2Clan public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES); return; } - if (!player.isClanLeader() || (getClanId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER); return; @@ -2360,7 +2354,7 @@ public class L2Clan return; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.CANNOT_RISE_LEVEL_WHILE_DISSOLUTION_IN_PROGRESS); return; @@ -2368,7 +2362,7 @@ public class L2Clan boolean increaseClanLevel = false; - switch (getLevel()) + switch (_level) { case 0: { @@ -2467,9 +2461,9 @@ public class L2Clan } case 5: { - if ((getReputationScore() >= 10000) && (getMembersCount() >= 30)) + if ((_reputationScore >= 10000) && (_members.size() >= 30)) { - setReputationScore(getReputationScore() - 10000, true); + setReputationScore(_reputationScore - 10000, true); SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP); cr.addNumber(10000); player.sendPacket(cr); @@ -2479,9 +2473,9 @@ public class L2Clan } case 6: { - if ((getReputationScore() >= 20000) && (getMembersCount() >= 80)) + if ((_reputationScore >= 20000) && (_members.size() >= 80)) { - setReputationScore(getReputationScore() - 20000, true); + setReputationScore(_reputationScore - 20000, true); SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP); cr.addNumber(20000); player.sendPacket(cr); @@ -2491,9 +2485,9 @@ public class L2Clan } case 7: { - if ((getReputationScore() >= 40000) && (getMembersCount() >= 120)) + if ((_reputationScore >= 40000) && (_members.size() >= 120)) { - setReputationScore(getReputationScore() - 40000, true); + setReputationScore(_reputationScore - 40000, true); SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP); cr.addNumber(40000); player.sendPacket(cr); @@ -2522,7 +2516,7 @@ public class L2Clan ItemList il = new ItemList(player, false); player.sendPacket(il); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); } public void changeLevel(int level) @@ -2531,7 +2525,7 @@ public class L2Clan { PreparedStatement statement = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?"); statement.setInt(1, level); - statement.setInt(2, getClanId()); + statement.setInt(2, _clanId); statement.execute(); statement.close(); } @@ -2542,9 +2536,9 @@ public class L2Clan setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - L2PcInstance leader = getLeader().getPlayerInstance(); + L2PcInstance leader = _leader.getPlayerInstance(); if (3 < level) { @@ -2578,7 +2572,7 @@ public class L2Clan setAllyCrestId(crestId); PreparedStatement statement = con.prepareStatement("UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"); statement.setInt(1, crestId); - statement.setInt(2, getClanId()); + statement.setInt(2, _clanId); statement.executeUpdate(); statement.close(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index 9d5c54e527..983d690e4e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class L2CommandChannel { - private final List _partys; + private final List _parties; private L2PcInstance _commandLeader = null; private int _channelLvl; @@ -46,8 +46,8 @@ public class L2CommandChannel public L2CommandChannel(L2PcInstance leader) { _commandLeader = leader; - _partys = new ArrayList<>(); - _partys.add(leader.getParty()); + _parties = new ArrayList<>(); + _parties.add(leader.getParty()); _channelLvl = leader.getParty().getLevel(); leader.getParty().setCommandChannel(this); leader.getParty().broadcastToPartyMembers(new SystemMessage(SystemMessageId.COMMAND_CHANNEL_FORMED)); @@ -65,7 +65,7 @@ public class L2CommandChannel return; } - _partys.add(party); + _parties.add(party); if (party.getLevel() > _channelLvl) { @@ -88,10 +88,10 @@ public class L2CommandChannel return; } - _partys.remove(party); + _parties.remove(party); _channelLvl = 0; - for (L2Party pty : _partys) + for (L2Party pty : _parties) { if (pty.getLevel() > _channelLvl) { @@ -102,7 +102,7 @@ public class L2CommandChannel party.setCommandChannel(null); party.broadcastToPartyMembers(new ExCloseMPCC()); - if (_partys.size() < 2) + if (_parties.size() < 2) { broadcastToChannelMembers(new SystemMessage(SystemMessageId.COMMAND_CHANNEL_DISBANDED)); disbandChannel(); @@ -114,16 +114,16 @@ public class L2CommandChannel */ public void disbandChannel() { - if (_partys != null) + if (_parties != null) { - for (L2Party party : _partys) + for (L2Party party : _parties) { if (party != null) { removeParty(party); } } - _partys.clear(); + _parties.clear(); } } @@ -134,7 +134,7 @@ public class L2CommandChannel { int count = 0; - for (L2Party party : _partys) + for (L2Party party : _parties) { if (party != null) { @@ -150,9 +150,9 @@ public class L2CommandChannel */ public void broadcastToChannelMembers(L2GameServerPacket gsp) { - if ((_partys != null) && !_partys.isEmpty()) + if ((_parties != null) && !_parties.isEmpty()) { - for (L2Party party : _partys) + for (L2Party party : _parties) { if (party != null) { @@ -164,9 +164,9 @@ public class L2CommandChannel public void broadcastCSToChannelMembers(CreatureSay gsp, L2PcInstance broadcaster) { - if ((_partys != null) && !_partys.isEmpty()) + if ((_parties != null) && !_parties.isEmpty()) { - for (L2Party party : _partys) + for (L2Party party : _parties) { if (party != null) { @@ -181,7 +181,7 @@ public class L2CommandChannel */ public List getPartys() { - return _partys; + return _parties; } /** @@ -190,7 +190,7 @@ public class L2CommandChannel public List getMembers() { final List members = new ArrayList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getPartyMembers()); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropCategory.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropCategory.java index ea2c8cc18d..1e345c86da 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropCategory.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropCategory.java @@ -69,7 +69,7 @@ public class L2DropCategory public boolean isSweep() { - return getCategoryType() == -1; + return _categoryType == -1; } // this returns the chance for the category to be visited in order to check if @@ -77,7 +77,7 @@ public class L2DropCategory // (but may return 0 or many drops) public int getCategoryChance() { - if (getCategoryType() >= 0) + if (_categoryType >= 0) { return _categoryChance; } @@ -86,7 +86,7 @@ public class L2DropCategory public int getCategoryBalancedChance() { - if (getCategoryType() >= 0) + if (_categoryType >= 0) { return _categoryBalancedChance; } @@ -107,7 +107,7 @@ public class L2DropCategory { List drops = new ArrayList<>(); int subCatChance = 0; - for (L2DropData drop : getAllDrops()) + for (L2DropData drop : _drops) { if ((drop.getItemId() == 57) || (drop.getItemId() == 6360) || (drop.getItemId() == 6361) || (drop.getItemId() == 6362)) { @@ -148,7 +148,7 @@ public class L2DropCategory { final int randomIndex = Rnd.get(getCategoryBalancedChance()); int sum = 0; - for (L2DropData drop : getAllDrops()) + for (L2DropData drop : _drops) { sum += Math.min((drop.getChance() * (raid ? 1 : Config.RATE_DROP_ITEMS)), L2DropData.MAX_CHANCE); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropData.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropData.java index d561fbe902..58f82ce613 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropData.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2DropData.java @@ -157,10 +157,10 @@ public class L2DropData @Override public String toString() { - String out = "ItemID: " + getItemId() + " Min: " + getMinDrop() + " Max: " + getMaxDrop() + " Chance: " + (getChance() / 10000.0) + "%"; + String out = "ItemID: " + _itemId + " Min: " + _minDrop + " Max: " + _maxDrop + " Chance: " + (_chance / 10000.0) + "%"; if (isQuestDrop()) { - out += " QuestID: " + getQuestID() + " StateID's: " + Arrays.toString(getStateIDs()); + out += " QuestID: " + _questID + " StateID's: " + Arrays.toString(_stateID); } return out; @@ -185,6 +185,6 @@ public class L2DropData @Override public int hashCode() { - return getItemId(); + return _itemId; } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Effect.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Effect.java index 3b7323d3ba..66c9c406ae 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Effect.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Effect.java @@ -131,7 +131,7 @@ public abstract class L2Effect // period, seconds private final int _period; private int _periodStartTicks; - private int _periodfirsttime; + int _periodfirsttime; // function templates private final FuncTemplate[] _funcTemplates; @@ -164,7 +164,7 @@ public abstract class L2Effect { try { - if (getPeriodfirsttime() == 0) + if (_periodfirsttime == 0) { setPeriodStartTicks(GameTimeController.getGameTicks()); } @@ -317,7 +317,7 @@ public abstract class L2Effect public boolean isHerbEffect() { - if (getSkill().getName().contains("Herb")) + if (_skill.getName().contains("Herb")) { return true; } @@ -437,7 +437,7 @@ public abstract class L2Effect { if (_abnormalEffect != 0) { - getEffected().startAbnormalEffect(_abnormalEffect); + _effected.startAbnormalEffect(_abnormalEffect); } } @@ -449,7 +449,7 @@ public abstract class L2Effect { if (_abnormalEffect != 0) { - getEffected().stopAbnormalEffect(_abnormalEffect); + _effected.stopAbnormalEffect(_abnormalEffect); } } @@ -488,11 +488,11 @@ public abstract class L2Effect onStart(); - if (_skill.isPvpSkill() && (getEffected() != null) && (getEffected() instanceof L2PcInstance) && getShowIcon()) + if (_skill.isPvpSkill() && (_effected != null) && (_effected instanceof L2PcInstance) && _template.showIcon) { SystemMessage smsg = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT); smsg.addString(_skill.getName()); - getEffected().sendPacket(smsg); + _effected.sendPacket(smsg); } if (_count > 1) @@ -511,7 +511,7 @@ public abstract class L2Effect { if (_count-- > 0) { - if (getInUse()) + if (_inUse) { // effect has to be in use if (onActionTime()) { @@ -532,26 +532,26 @@ public abstract class L2Effect onExit(); // If the time left is equal to zero, send the message - if ((getEffected() != null) && (getEffected() instanceof L2PcInstance) && getShowIcon() && !getEffected().isDead()) + if ((_effected != null) && (_effected instanceof L2PcInstance) && _template.showIcon && !_effected.isDead()) { // Like L2OFF message S1_HAS_BEEN_ABORTED for toogle skills - if (getSkill().isToggle()) + if (_skill.isToggle()) { final SystemMessage smsg3 = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ABORTED); - smsg3.addString(getSkill().getName()); - getEffected().sendPacket(smsg3); + smsg3.addString(_skill.getName()); + _effected.sendPacket(smsg3); } else if (_cancelEffect) { SystemMessage smsg3 = new SystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED); - smsg3.addString(getSkill().getName()); - getEffected().sendPacket(smsg3); + smsg3.addString(_skill.getName()); + _effected.sendPacket(smsg3); } else if (_count == 0) { SystemMessage smsg3 = new SystemMessage(SystemMessageId.S1_HAS_WORN_OFF); smsg3.addString(_skill.getName()); - getEffected().sendPacket(smsg3); + _effected.sendPacket(smsg3); } } @@ -570,9 +570,9 @@ public abstract class L2Effect for (FuncTemplate t : _funcTemplates) { final Env env = new Env(); - env.player = getEffector(); - env.target = getEffected(); - env.skill = getSkill(); + env.player = _effector; + env.target = _effected; + env.skill = _skill; final Func f = t.getFunc(env, this); // effect is owner if (f != null) { @@ -601,42 +601,40 @@ public abstract class L2Effect return; } - if (!getShowIcon()) + if (!_template.showIcon) { return; } - final L2Skill sk = getSkill(); - if (task._rate > 0) { - if (sk.isPotion()) + if (_skill.isPotion()) { - mi.addEffect(sk.getId(), getLevel(), sk.getBuffDuration() - (getTaskTime() * 1000), false); + mi.addEffect(_skill.getId(), _skill.getLevel(), _skill.getBuffDuration() - (getTaskTime() * 1000), false); } - else if (!sk.isToggle()) + else if (!_skill.isToggle()) { - if (sk.is_Debuff()) + if (_skill.is_Debuff()) { - mi.addEffect(sk.getId(), getLevel(), (_count * _period) * 1000, true); + mi.addEffect(_skill.getId(), _skill.getLevel(), (_count * _period) * 1000, true); } else { - mi.addEffect(sk.getId(), getLevel(), (_count * _period) * 1000, false); + mi.addEffect(_skill.getId(), _skill.getLevel(), (_count * _period) * 1000, false); } } else { - mi.addEffect(sk.getId(), getLevel(), -1, true); + mi.addEffect(_skill.getId(), _skill.getLevel(), -1, true); } } - else if (sk.getSkillType() == SkillType.DEBUFF) + else if (_skill.getSkillType() == SkillType.DEBUFF) { - mi.addEffect(sk.getId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS) + 1000, true); + mi.addEffect(_skill.getId(), _skill.getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS) + 1000, true); } else { - mi.addEffect(sk.getId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS) + 1000, false); + mi.addEffect(_skill.getId(), _skill.getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS) + 1000, false); } } @@ -655,8 +653,7 @@ public abstract class L2Effect return; } - L2Skill sk = getSkill(); - ps.addPartySpelledEffect(sk.getId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS)); + ps.addPartySpelledEffect(_skill.getId(), _skill.getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS)); } public final void addOlympiadSpelledIcon(ExOlympiadSpelledInfo os) @@ -674,13 +671,12 @@ public abstract class L2Effect return; } - L2Skill sk = getSkill(); - os.addEffect(sk.getId(), getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS)); + os.addEffect(_skill.getId(), _skill.getLevel(), (int) future.getDelay(TimeUnit.MILLISECONDS)); } public int getLevel() { - return getSkill().getLevel(); + return _skill.getLevel(); } public int getPeriodfirsttime() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java index 47ed2db4e6..524c6a181e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Object.java @@ -271,19 +271,11 @@ public abstract class L2Object assert getPosition().getWorldRegion() != null; } - L2WorldRegion reg = getPosition().getWorldRegion(); - - synchronized (this) - { - _isVisible = false; - getPosition().setWorldRegion(null); - } - - // this can synchronize on others instances, so it's out of - // synchronized, to avoid deadlocks // Remove the L2Object from the world - L2World.getInstance().removeVisibleObject(this, reg); + _isVisible = false; + L2World.getInstance().removeVisibleObject(this, getPosition().getWorldRegion()); L2World.getInstance().removeObject(this); + getPosition().setWorldRegion(null); if (Config.SAVE_DROPPED_ITEM) { @@ -616,7 +608,7 @@ public abstract class L2Object @Override public String toString() { - return "" + getObjectId(); + return "" + _objectId; } public boolean isCharacter() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Party.java index 3ab9a1247a..a444c061c3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Party.java @@ -102,7 +102,7 @@ public class L2Party { _members = new ArrayList<>(); _itemDistribution = itemDistribution; - getPartyMembers().add(leader); + _members.add(leader); _partyLvl = leader.getLevel(); } @@ -112,7 +112,7 @@ public class L2Party */ public int getMemberCount() { - return getPartyMembers().size(); + return _members.size(); } /** @@ -163,7 +163,7 @@ public class L2Party { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -186,9 +186,9 @@ public class L2Party */ private L2PcInstance getCheckedNextLooter(int ItemId, L2Character target) { - for (int i = 0; i < getMemberCount(); i++) + for (int i = 0; i < _members.size(); i++) { - if (++_itemLastLoot >= getMemberCount()) + if (++_itemLastLoot >= _members.size()) { _itemLastLoot = 0; } @@ -196,7 +196,7 @@ public class L2Party L2PcInstance member; try { - member = getPartyMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -286,7 +286,7 @@ public class L2Party */ public void broadcastToPartyMembers(L2GameServerPacket msg) { - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -297,7 +297,7 @@ public class L2Party public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -310,7 +310,7 @@ public class L2Party public void broadcastCSToPartyMembers(CreatureSay msg, L2PcInstance broadcaster) { - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if ((member == null) || (broadcaster == null)) { @@ -332,7 +332,7 @@ public class L2Party */ public void broadcastToPartyMembers(L2PcInstance player, L2GameServerPacket msg) { - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if ((member != null) && !member.equals(player)) { @@ -347,7 +347,7 @@ public class L2Party */ public synchronized void addPartyMember(L2PcInstance player) { - if (getPartyMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -365,14 +365,14 @@ public class L2Party broadcastToPartyMembers(new PartySmallWindowAdd(player, this)); // add player to party, adjust party level - getPartyMembers().add(player); + _members.add(player); if (player.getLevel() > _partyLvl) { _partyLvl = player.getLevel(); } // update partySpelled - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -424,10 +424,10 @@ public class L2Party public synchronized void removePartyMember(L2PcInstance player, boolean sendMessage) { - if (getPartyMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); - getPartyMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isFestivalParticipant()) @@ -464,7 +464,7 @@ public class L2Party player.sendPacket(new ExCloseMPCC()); } - if (isLeader && (getPartyMembers().size() > 1)) + if (isLeader && (_members.size() > 1)) { SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_BECOME_A_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -472,18 +472,18 @@ public class L2Party broadcastToPartyMembersNewLeader(); } - if (getPartyMembers().size() == 1) + if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getChannelLeader().equals(getLeader())) + if (_commandChannel.getChannelLeader().equals(getLeader())) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -518,7 +518,7 @@ public class L2Party if ((player != null) && !player.isInDuel()) { - if (getPartyMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -528,10 +528,10 @@ public class L2Party { // Swap party members L2PcInstance temp; - final int p1 = getPartyMembers().indexOf(player); + final int p1 = _members.indexOf(player); temp = getLeader(); - getPartyMembers().set(0, getPartyMembers().get(p1)); - getPartyMembers().set(p1, temp); + _members.set(0, _members.get(p1)); + _members.set(p1, temp); SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_BECOME_A_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -567,7 +567,7 @@ public class L2Party */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -663,7 +663,7 @@ public class L2Party public void distributeAdena(L2PcInstance player, int adena, L2Character target) { // Get all the party members - final List membersList = getPartyMembers(); + final List membersList = _members; // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) @@ -797,11 +797,11 @@ public class L2Party { int newLevel = 0; - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getPartyMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2PetData.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2PetData.java index d4c9d56c0b..666eb52bf1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2PetData.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2PetData.java @@ -440,17 +440,17 @@ public class L2PetData @Override public String toString() { - return "PetID: " + getPetID() + " \tPetLevel: " + getPetLevel() + " \t" + + return "PetID: " + _petId + " \tPetLevel: " + _petLevel + " \t" + // PET_EXP + ": " + getPetExp() + " \t" + - PET_MAX_EXP + ": " + getPetMaxExp() + " \t" + + PET_MAX_EXP + ": " + _petMaxExp + " \t" + // PET_HP + ": " + getPetHP() + " \t" + - PET_MAX_HP + ": " + getPetMaxHP() + " \t" + + PET_MAX_HP + ": " + _petMaxHP + " \t" + // PET_MP + ": " + getPetMP() + " \t" + - PET_MAX_MP + ": " + getPetMaxMP() + " \t" + PET_PATK + ": " + getPetPAtk() + " \t" + PET_PDEF + ": " + getPetPDef() + " \t" + PET_MATK + ": " + getPetMAtk() + " \t" + PET_MDEF + ": " + getPetMDef() + " \t" + PET_ACCURACY + ": " + getPetAccuracy() + " \t" + PET_EVASION + ": " + getPetEvasion() + " \t" + PET_CRITICAL + ": " + getPetCritical() + " \t" + PET_SPEED + ": " + getPetSpeed() + " \t" + PET_ATK_SPEED + ": " + getPetAtkSpeed() + " \t" + PET_CAST_SPEED + ": " + getPetCastSpeed() + " \t" + + PET_MAX_MP + ": " + _petMaxMP + " \t" + PET_PATK + ": " + _petPAtk + " \t" + PET_PDEF + ": " + _petPDef + " \t" + PET_MATK + ": " + _petMAtk + " \t" + PET_MDEF + ": " + _petMDef + " \t" + PET_ACCURACY + ": " + _petAccuracy + " \t" + PET_EVASION + ": " + _petEvasion + " \t" + PET_CRITICAL + ": " + _petCritical + " \t" + PET_SPEED + ": " + _petSpeed + " \t" + PET_ATK_SPEED + ": " + _petAtkSpeed + " \t" + PET_CAST_SPEED + ": " + _petCastSpeed + " \t" + // PET_FEED + ": " + getPetFeed() + " \t" + - PET_MAX_FEED + ": " + getPetMaxFeed() + " \t" + PET_FEED_BATTLE + ": " + getPetFeedBattle() + " \t" + PET_FEED_NORMAL + ": " + getPetFeedNormal() + " \t" + + PET_MAX_FEED + ": " + _petMaxFeed + " \t" + PET_FEED_BATTLE + ": " + _petFeedBattle + " \t" + PET_FEED_NORMAL + ": " + _petFeedNormal + " \t" + // PET_LOAD + ": " + getPetLoad() + " \t" + - PET_MAX_LOAD + ": " + getPetMaxLoad() + " \t" + PET_REGEN_HP + ": " + getPetRegenHP() + " \t" + PET_REGEN_MP + ": " + getPetRegenMP(); + PET_MAX_LOAD + ": " + _petMaxLoad + " \t" + PET_REGEN_HP + ": " + _petRegenHP + " \t" + PET_REGEN_MP + ": " + _petRegenMP; } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java index b61740d0bc..85cf44760c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java @@ -744,7 +744,7 @@ public abstract class L2Skill public final boolean hasEffectWhileCasting() { - return getSkillType() == SkillType.SIGNET_CASTTIME; + return _skillType == SkillType.SIGNET_CASTTIME; } public final BaseStats getSavevs() @@ -1148,17 +1148,17 @@ public abstract class L2Skill public final boolean useSoulShot() { - return (getSkillType() == SkillType.PDAM) || (getSkillType() == SkillType.STUN) || (getSkillType() == SkillType.CHARGEDAM) || (getSkillType() == SkillType.BLOW); + return (_skillType == SkillType.PDAM) || (_skillType == SkillType.STUN) || (_skillType == SkillType.CHARGEDAM) || (_skillType == SkillType.BLOW); } public final boolean useSpiritShot() { - return isMagic(); + return _magic; } public final boolean useFishShot() { - return (getSkillType() == SkillType.PUMPING) || (getSkillType() == SkillType.REELING); + return (_skillType == SkillType.PUMPING) || (_skillType == SkillType.REELING); } public final int getWeaponsAllowed() @@ -1353,7 +1353,7 @@ public abstract class L2Skill return true; } final SystemMessage message = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED); - message.addSkillName(getId()); + message.addSkillName(_id); activeChar.sendPacket(message); return false; @@ -1361,7 +1361,7 @@ public abstract class L2Skill public final boolean getWeaponDependancy(L2Character activeChar, boolean chance) { - final int weaponsAllowed = getWeaponsAllowed(); + final int weaponsAllowed = _weaponsAllowed; // check to see if skill has a weapon dependency. if (weaponsAllowed == 0) { @@ -1467,7 +1467,7 @@ public abstract class L2Skill if (activeChar instanceof L2PcInstance) { // to avoid attacks during oly start period - if (isOffensive() && (((L2PcInstance) activeChar).isInOlympiadMode() && !((L2PcInstance) activeChar).isOlympiadStart())) + if (_isOffensive && (((L2PcInstance) activeChar).isInOlympiadMode() && !((L2PcInstance) activeChar).isOlympiadStart())) { activeChar.sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_INCORRECT)); return null; @@ -1476,7 +1476,7 @@ public abstract class L2Skill final List targetList = new ArrayList<>(); - if (isPotion()) + if (_ispotion) { return new L2Character[] { @@ -1484,21 +1484,13 @@ public abstract class L2Skill }; } - // Get the target type of the skill - // (ex : ONE, SELF, HOLY, PET, AURA, AURA_CLOSE, AREA, MULTIFACE, PARTY, CLAN, CORPSE_PLAYER, CORPSE_MOB, CORPSE_CLAN, UNLOCKABLE, ITEM, UNDEAD) - final SkillTargetType targetType = getTargetType(); - - // Get the type of the skill - // (ex : PDAM, MDAM, DOT, BLEED, POISON, HEAL, HOT, MANAHEAL, MANARECHARGE, AGGDAMAGE, BUFF, DEBUFF, STUN, ROOT, RESURRECT, PASSIVE...) - final SkillType skillType = getSkillType(); - - switch (targetType) + switch (_targetType) { // The skill can only be used on the L2Character targeted, or on the caster itself case TARGET_ONE: { boolean canTargetSelf = false; - switch (skillType) + switch (_skillType) { case BUFF: case HEAL: @@ -1524,7 +1516,7 @@ public abstract class L2Skill } } - switch (skillType) + switch (_skillType) { case CONFUSION: case DEBUFF: @@ -1548,7 +1540,7 @@ public abstract class L2Skill } } - switch (skillType) + switch (_skillType) { case AGGDEBUFF: case DEBUFF: @@ -1579,7 +1571,7 @@ public abstract class L2Skill } // Like L2OFF Shield stun can't be used on Npc - if ((getId() == 92) && (target instanceof L2NpcInstance) && !(target instanceof L2MonsterInstance)) + if ((_id == 92) && (target instanceof L2NpcInstance) && !(target instanceof L2MonsterInstance)) { activeChar.sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_INCORRECT)); return null; @@ -1665,7 +1657,7 @@ public abstract class L2Skill } case TARGET_AURA: { - final int radius = getSkillRadius(); + final int radius = _skillRadius; final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); L2PcInstance src = null; if (activeChar instanceof L2PcInstance) @@ -1684,7 +1676,7 @@ public abstract class L2Skill continue; } // Like L2OFF you can cast the skill on peace zone but hasn't any effect - if (isOffensive() && L2Character.isInsidePeaceZone(target, activeChar)) + if (_isOffensive && L2Character.isInsidePeaceZone(target, activeChar)) { continue; } @@ -1792,13 +1784,13 @@ public abstract class L2Skill { // Like L2OFF players can use TARGET_AREA skills on NPC in peacezone if ((!(target instanceof L2Attackable) && !(target instanceof L2Playable) && !(target instanceof L2NpcInstance)) || // Target is not L2Attackable or L2PlayableInstance or L2NpcInstance - ((getCastRange() >= 0) && ((target == activeChar) || target.isAlikeDead()))) // target is null or self or dead/faking + ((_castRange >= 0) && ((target == activeChar) || target.isAlikeDead()))) // target is null or self or dead/faking { activeChar.sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_INCORRECT)); return null; } L2Character cha; - if (getCastRange() >= 0) + if (_castRange >= 0) { cha = target; if (!onlyFirst) @@ -1827,7 +1819,7 @@ public abstract class L2Skill { src = ((L2Summon) activeChar).getOwner(); } - final int radius = getSkillRadius(); + final int radius = _skillRadius; final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); for (L2Object obj : activeChar.getKnownList().getKnownObjects().values()) { @@ -1852,7 +1844,7 @@ public abstract class L2Skill { continue; } - if (isOffensive() && L2Character.isInsidePeaceZone(activeChar, target)) + if (_isOffensive && L2Character.isInsidePeaceZone(activeChar, target)) { continue; } @@ -1994,7 +1986,7 @@ public abstract class L2Skill target }; } - final int radius = getSkillRadius(); + final int radius = _skillRadius; L2PcInstance src = null; if (activeChar instanceof L2PcInstance) { @@ -2121,7 +2113,7 @@ public abstract class L2Skill continue; } } - if (!partyMember.isDead() && Util.checkIfInRange(getSkillRadius(), activeChar, partyMember, true)) + if (!partyMember.isDead() && Util.checkIfInRange(_skillRadius, activeChar, partyMember, true)) { L2PcInstance src = null; if (activeChar instanceof L2PcInstance) @@ -2183,10 +2175,10 @@ public abstract class L2Skill { if (activeChar instanceof L2PcInstance) { - final int radius = getSkillRadius(); + final int radius = _skillRadius; L2PcInstance player = (L2PcInstance) activeChar; L2Clan clan = player.getClan(); - if (targetType != SkillTargetType.TARGET_CORPSE_ALLY) // if corpose, the caster is not included + if (_targetType != SkillTargetType.TARGET_CORPSE_ALLY) // if corpose, the caster is not included { if (player.isInOlympiadMode()) { @@ -2227,7 +2219,7 @@ public abstract class L2Skill continue; } final L2PcInstance playerTarget = (L2PcInstance) newTarget; - if (playerTarget.isDead() && (targetType != SkillTargetType.TARGET_CORPSE_ALLY)) + if (playerTarget.isDead() && (_targetType != SkillTargetType.TARGET_CORPSE_ALLY)) { continue; } @@ -2267,17 +2259,17 @@ public abstract class L2Skill * trg._inEventDM || trg._inEventTvT || trg._inEventVIP) && (!src._inEvent && !src._inEventCTF && !src._inEventDM && !src._inEventTvT && !src._inEventVIP)) ){ continue; } } */ L2Summon pet = ((L2PcInstance) newTarget).getPet(); - if ((pet != null) && Util.checkIfInRange(radius, activeChar, pet, true) && !onlyFirst && (((targetType == SkillTargetType.TARGET_CORPSE_ALLY) && pet.isDead()) || ((targetType == SkillTargetType.TARGET_ALLY) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) + if ((pet != null) && Util.checkIfInRange(radius, activeChar, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.TARGET_CORPSE_ALLY) && pet.isDead()) || ((_targetType == SkillTargetType.TARGET_ALLY) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) { targetList.add(pet); } - if (targetType == SkillTargetType.TARGET_CORPSE_ALLY) + if (_targetType == SkillTargetType.TARGET_CORPSE_ALLY) { if (!((L2PcInstance) newTarget).isDead()) { continue; } - if ((getSkillType() == SkillType.RESURRECT) && ((L2PcInstance) newTarget).isInsideZone(ZoneId.SIEGE)) + if ((_skillType == SkillType.RESURRECT) && ((L2PcInstance) newTarget).isInsideZone(ZoneId.SIEGE)) { continue; } @@ -2312,10 +2304,10 @@ public abstract class L2Skill { if (activeChar instanceof L2PcInstance) { - final int radius = getSkillRadius(); + final int radius = _skillRadius; L2PcInstance player = (L2PcInstance) activeChar; L2Clan clan = player.getClan(); - if (targetType != SkillTargetType.TARGET_CORPSE_CLAN) + if (_targetType != SkillTargetType.TARGET_CORPSE_CLAN) { if (player.isInOlympiadMode()) { @@ -2365,17 +2357,17 @@ public abstract class L2Skill * player._inEventTvT)) { continue; } if((newTarget._inEventCTF && !player._inEventCTF) || (!newTarget._inEventCTF && player._inEventCTF)) { continue; } if((newTarget._inEventDM && !player._inEventDM) || (!newTarget._inEventDM && player._inEventDM)) { continue; } } */ L2Summon pet = newTarget.getPet(); - if ((pet != null) && Util.checkIfInRange(radius, activeChar, pet, true) && !onlyFirst && (((targetType == SkillTargetType.TARGET_CORPSE_CLAN) && pet.isDead()) || ((targetType == SkillTargetType.TARGET_CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) + if ((pet != null) && Util.checkIfInRange(radius, activeChar, pet, true) && !onlyFirst && (((_targetType == SkillTargetType.TARGET_CORPSE_CLAN) && pet.isDead()) || ((_targetType == SkillTargetType.TARGET_CLAN) && !pet.isDead())) && player.checkPvpSkill(newTarget, this)) { targetList.add(pet); } - if (targetType == SkillTargetType.TARGET_CORPSE_CLAN) + if (_targetType == SkillTargetType.TARGET_CORPSE_CLAN) { if (!newTarget.isDead()) { continue; } - if (getSkillType() == SkillType.RESURRECT) + if (_skillType == SkillType.RESURRECT) { // check target is not in a active siege zone Siege siege = SiegeManager.getInstance().getSiege(newTarget); @@ -2427,7 +2419,7 @@ public abstract class L2Skill { if ((newTarget instanceof L2NpcInstance) && npc.getFactionId().equals(((L2NpcInstance) newTarget).getFactionId())) { - if (!Util.checkIfInRange(getCastRange(), activeChar, newTarget, true)) + if (!Util.checkIfInRange(_castRange, activeChar, newTarget, true)) { continue; } @@ -2460,7 +2452,7 @@ public abstract class L2Skill if ((player != null) && ((targetPlayer != null) || (targetPet != null))) { boolean condGood = true; - if (getSkillType() == SkillType.RESURRECT) + if (_skillType == SkillType.RESURRECT) { // check target is not in a active siege zone if (target.isInsideZone(ZoneId.SIEGE)) @@ -2551,7 +2543,7 @@ public abstract class L2Skill src = (L2PcInstance) activeChar; } L2PcInstance trg = null; - final int radius = getSkillRadius(); + final int radius = _skillRadius; if (activeChar.getKnownList() != null) { for (L2Object obj : activeChar.getKnownList().getKnownObjects().values()) @@ -2572,7 +2564,7 @@ public abstract class L2Skill { continue; } - if (isOffensive() && L2Character.isInsidePeaceZone(activeChar, obj)) + if (_isOffensive && L2Character.isInsidePeaceZone(activeChar, obj)) { continue; } @@ -2708,8 +2700,8 @@ public abstract class L2Skill case TARGET_AREA_UNDEAD: { L2Character cha; - final int radius = getSkillRadius(); - if ((getCastRange() >= 0) && ((target instanceof L2NpcInstance) || (target instanceof L2SummonInstance)) && target.isUndead() && !target.isAlikeDead()) + final int radius = _skillRadius; + if ((_castRange >= 0) && ((target instanceof L2NpcInstance) || (target instanceof L2SummonInstance)) && target.isUndead() && !target.isAlikeDead()) { cha = target; if (!onlyFirst) @@ -2854,7 +2846,7 @@ public abstract class L2Skill { if ((newTarget instanceof L2NpcInstance) && npc.getFactionId().equals(((L2NpcInstance) newTarget).getFactionId())) { - if (!Util.checkIfInRange(getCastRange(), activeChar, newTarget, true)) + if (!Util.checkIfInRange(_castRange, activeChar, newTarget, true)) { continue; } @@ -2936,7 +2928,7 @@ public abstract class L2Skill public boolean hasEffects() { - return (getEffectTemplates() != null) && (getEffectTemplates().length > 0); + return (_effectTemplates != null) && (_effectTemplates.length > 0); } public final L2Effect[] getEffects(L2Character effector, L2Character effected) @@ -2951,7 +2943,7 @@ public abstract class L2Skill return _emptyEffectSet; } - if (getEffectTemplates() == null) + if (_effectTemplates == null) { return _emptyEffectSet; } @@ -2961,7 +2953,7 @@ public abstract class L2Skill return _emptyEffectSet; } - if ((getSkillType() == SkillType.BUFF) && effected.isBlockBuff()) + if ((_skillType == SkillType.BUFF) && effected.isBlockBuff()) { return _emptyEffectSet; } @@ -2976,7 +2968,7 @@ public abstract class L2Skill } /* - * if(getSkillType()==SkillType.BUFF) for(L2Effect ef: effector.getAllEffects()) { if(ef!=null && ef.getSkill()!=null){ if(ef.getSkill().getId() == getId() && ef.getSkill().getLevel() > getLevel()) return _emptyEffectSet; } } + * if(_skillType==SkillType.BUFF) for(L2Effect ef: effector.getAllEffects()) { if(ef!=null && ef.getSkill()!=null){ if(ef.getSkill().getId() == getId() && ef.getSkill().getLevel() > getLevel()) return _emptyEffectSet; } } */ final Env env = new Env(); @@ -2985,7 +2977,7 @@ public abstract class L2Skill env.skill = this; env.skillMastery = skillMastery; - for (EffectTemplate et : getEffectTemplates()) + for (EffectTemplate et : _effectTemplates) { boolean success = true; if (et.effectPower > -1) @@ -3100,7 +3092,7 @@ public abstract class L2Skill public final void attach(EffectTemplate effect) { - if (getEffectTemplates() == null) + if (_effectTemplates == null) { setEffectTemplates(new EffectTemplate[] { @@ -3109,9 +3101,9 @@ public abstract class L2Skill } else { - final int len = getEffectTemplates().length; + final int len = _effectTemplates.length; EffectTemplate[] tmp = new EffectTemplate[len + 1]; - System.arraycopy(getEffectTemplates(), 0, tmp, 0, len); + System.arraycopy(_effectTemplates, 0, tmp, 0, len); tmp[len] = effect; setEffectTemplates(tmp); } @@ -3145,12 +3137,12 @@ public abstract class L2Skill return false; } - if (getEffectTemplates() == null) + if (_effectTemplates == null) { return false; } - for (EffectTemplate et : getEffectTemplates()) + for (EffectTemplate et : _effectTemplates) { if (et.abnormalEffect == abnormalEffect) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2TradeList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2TradeList.java index 5f93fd6ec9..79801bf91e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2TradeList.java @@ -80,7 +80,7 @@ public class L2TradeList { if (price < (item.getReferencePrice() / 2)) { - LOGGER.warning("L2TradeList " + getListId() + " itemId " + itemID + " has an ADENA sell price lower then reference price.. Automatically Updating it.."); + LOGGER.warning("L2TradeList " + _listId + " itemId " + itemID + " has an ADENA sell price lower then reference price.. Automatically Updating it.."); price = item.getReferencePrice(); } item.setPriceToSell(price); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 65d58bbd0f..7ee8907b2e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -285,7 +285,7 @@ public final class L2WorldRegion public Boolean areNeighborsEmpty() { // if this region is occupied, return false. - if (isActive() && (_allPlayable.size() > 0)) + if (_active && (_allPlayable.size() > 0)) { return false; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/MobGroup.java index 8c5da83124..774e29db69 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -138,16 +138,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = Rnd.nextInt(2) == 0 ? -1 : 1; final int signY = Rnd.nextInt(2) == 0 ? -1 : 1; @@ -205,12 +205,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - final int choice = Rnd.nextInt(getActiveMobCount()); + final int choice = Rnd.nextInt(getMobs().size()); return getMobs().get(choice); } @@ -219,7 +219,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PartyMatchRoom.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PartyMatchRoom.java index 9271bee1fc..3d59ca763e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PartyMatchRoom.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PartyMatchRoom.java @@ -63,7 +63,7 @@ public class PartyMatchRoom public void deleteMember(L2PcInstance player) { - if (player != getOwner()) + if (player != _members.get(0)) // owner { _members.remove(player); notifyMembersAboutExit(player); @@ -81,7 +81,7 @@ public class PartyMatchRoom public void notifyMembersAboutExit(L2PcInstance player) { - for (L2PcInstance _member : getPartyMembers()) + for (L2PcInstance _member : _members) { final SystemMessage sm = new SystemMessage(SystemMessageId.S1_LEFT_PARTY_ROOM); sm.addString(player.getName()); @@ -117,7 +117,7 @@ public class PartyMatchRoom } // Broadcast change - for (L2PcInstance member : getPartyMembers()) + for (L2PcInstance member : _members) { member.sendPacket(new ExManagePartyRoomMember(newLeader, this, 1)); member.sendPacket(new ExManagePartyRoomMember(oldLeader, this, 1)); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PcInventory.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PcInventory.java index a36dbde8bf..322f2896c4 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PcInventory.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PcInventory.java @@ -120,7 +120,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.getItem().isSellable() && item.isAvailable(getOwner(), false, allowEquipped)))) + if (!isDuplicate && (!onlyAvailable || (item.getItem().isSellable() && item.isAvailable(_owner, false, allowEquipped)))) { list.add(item); } @@ -167,7 +167,7 @@ public class PcInventory extends Inventory } } - if (!isDuplicate && (!onlyAvailable || (item.getItem().isSellable() && item.isAvailable(getOwner(), false, allowEquipped)))) + if (!isDuplicate && (!onlyAvailable || (item.getItem().isSellable() && item.isAvailable(_owner, false, allowEquipped)))) { list.add(item); } @@ -228,7 +228,7 @@ public class PcInventory extends Inventory for (L2ItemInstance item : _items) { - if ((item != null) && item.isAvailable(getOwner(), allowAdena, false)) + if ((item != null) && item.isAvailable(_owner, allowAdena, false)) { list.add(item); } @@ -267,7 +267,7 @@ public class PcInventory extends Inventory for (L2ItemInstance item : _items) { - if (item.isAvailable(getOwner(), false, false)) + if (item.isAvailable(_owner, false, false)) { final TradeItem adjItem = tradeList.adjustAvailableItem(item); if (adjItem != null) @@ -626,12 +626,12 @@ public class PcInventory extends Inventory protected void removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (item.equals(getOwner().getActiveEnchantItem())) + if (item.equals(_owner.getActiveEnchantItem())) { - getOwner().setActiveEnchantItem(null); + _owner.setActiveEnchantItem(null); } if (item.getItemId() == ADENA_ID) @@ -653,7 +653,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(); + _owner.refreshOverloaded(); } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java index dc660369a6..aad326f68c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java @@ -330,7 +330,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, int count, int price) { - if (isLocked()) + if (_locked) { Util.handleIllegalPlayerAction(_owner, "Player " + _owner.getName() + " Attempt to modify locked TradeList! ", Config.DEFAULT_PUNISH); LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); @@ -361,7 +361,7 @@ public class TradeList } // GM items trade restriction (valid for trade and private sell) - if ((getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) + if ((_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) { return null; } @@ -404,7 +404,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, int count, int price, int enchant) { - if (isLocked()) + if (_locked) { Util.handleIllegalPlayerAction(_owner, "Player " + _owner.getName() + " Attempt to modify locked TradeList! Banned ", Config.DEFAULT_PUNISH); LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); @@ -456,7 +456,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, int count) { - if (isLocked()) + if (_locked) { Util.handleIllegalPlayerAction(_owner, "Player " + _owner.getName() + " Attempt to modify locked TradeList! Banned ", Config.DEFAULT_PUNISH); LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); @@ -770,12 +770,12 @@ public class TradeList if (!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()) || !partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())) { partnerList.getOwner().sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED); - getOwner().sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED); + _owner.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED); } else if (!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())) || !partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))) { partnerList.getOwner().sendPacket(SystemMessageId.SLOTS_FULL); - getOwner().sendPacket(SystemMessageId.SLOTS_FULL); + _owner.sendPacket(SystemMessageId.SLOTS_FULL); } else { @@ -784,7 +784,7 @@ public class TradeList InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -820,7 +820,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 4ce7631376..65f767ef0a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -283,15 +283,6 @@ public class L2Attackable extends L2NpcInstance */ private final Map _aggroList = new ConcurrentHashMap<>(); - /** - * Use this to Read or Put Object to this Map - * @return - */ - public final Map getAggroListRP() - { - return _aggroList; - } - /** * Use this to Remove Object from this Map This Should be Synchronized While Interacting over This Map - ie u cant Interacting and removing object at once * @return @@ -650,7 +641,7 @@ public class L2Attackable extends L2NpcInstance try { - if (getAggroListRP().isEmpty()) + if (_aggroList.isEmpty()) { return; } @@ -663,10 +654,10 @@ public class L2Attackable extends L2NpcInstance L2Character attacker, ddealer; // While Interacting over This Map Removing Object is Not Allowed - synchronized (getAggroList()) + synchronized (_aggroList) { // Go through the _aggroList of the L2Attackable - for (AggroInfo info : getAggroListRP().values()) + for (AggroInfo info : _aggroList.values()) { if (info == null) { @@ -725,7 +716,7 @@ public class L2Attackable extends L2NpcInstance // Manage drop of Special Events created by GM for a defined period doEventDrop((maxDealer != null) && (maxDealer.isOnline() == 1) ? maxDealer : lastAttacker); - if (!getMustRewardExpSP()) + if (!_mustGiveExpSp) { return; } @@ -808,7 +799,7 @@ public class L2Attackable extends L2NpcInstance if (attacker instanceof L2PcInstance) { final L2PcInstance player = (L2PcInstance) attacker; - if (isOverhit() && (attacker == getOverhitAttacker())) + if (_overhit && (attacker == _overhitAttacker)) { player.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -959,7 +950,7 @@ public class L2Attackable extends L2NpcInstance { final L2PcInstance player = (L2PcInstance) attacker; - if (isOverhit() && (attacker == getOverhitAttacker())) + if (_overhit && (attacker == _overhitAttacker)) { player.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -1007,14 +998,14 @@ public class L2Attackable extends L2NpcInstance } // Get the AggroInfo of the attacker L2Character from the _aggroList of the L2Attackable - AggroInfo ai = getAggroListRP().get(attacker); + AggroInfo ai = _aggroList.get(attacker); if (ai == null) { ai = new AggroInfo(attacker); ai._damage = 0; ai._hate = 0; - getAggroListRP().put(attacker, ai); + _aggroList.put(attacker, ai); } // If aggro is negative, its comming from SEE_SPELL, buffs use constant 150 @@ -1090,9 +1081,9 @@ public class L2Attackable extends L2NpcInstance ((L2AttackableAI) getAI()).setGlobalAggro(-25); return; } - for (L2Character aggroed : getAggroListRP().keySet()) + for (L2Character aggroed : _aggroList.keySet()) { - AggroInfo ai = getAggroListRP().get(aggroed); + AggroInfo ai = _aggroList.get(aggroed); if (ai == null) { return; @@ -1113,7 +1104,7 @@ public class L2Attackable extends L2NpcInstance return; } - AggroInfo ai = getAggroListRP().get(target); + AggroInfo ai = _aggroList.get(target); if (ai == null) { @@ -1146,7 +1137,7 @@ public class L2Attackable extends L2NpcInstance return; } - AggroInfo ai = getAggroListRP().get(target); + AggroInfo ai = _aggroList.get(target); if (ai == null) { @@ -1163,7 +1154,7 @@ public class L2Attackable extends L2NpcInstance */ public L2Character getMostHated() { - if (getAggroListRP().isEmpty() || isAlikeDead()) + if (_aggroList.isEmpty() || isAlikeDead()) { return null; } @@ -1173,10 +1164,10 @@ public class L2Attackable extends L2NpcInstance int maxHate = 0; // While Interating over This Map Removing Object is Not Allowed - synchronized (getAggroList()) + synchronized (_aggroList) { // Go through the aggroList of the L2Attackable - for (AggroInfo ai : getAggroListRP().values()) + for (AggroInfo ai : _aggroList.values()) { if (ai == null) { @@ -1212,8 +1203,8 @@ public class L2Attackable extends L2NpcInstance */ /* * public L2Character getMostDamager(){ if(getAggroListRP().isEmpty() || isAlikeDead()) return null; //L2Character mostDamager = null; int maxDamage = 0; // While Interating over This Map Removing Object is Not Allowed synchronized (getAggroList()) { // Go through the aggroList of the - * L2Attackable for(AggroInfo ai : getAggroListRP().values()) { if(ai == null) { continue; } if(ai._attacker.isAlikeDead() || !getKnownList().knowsObject(ai._attacker) || !ai._attacker.isVisible() || ai._attacker instanceof L2PcInstance && ((L2PcInstance)ai._attacker).isOffline() ) { ai._damage - * = 0; } if(ai._damage > maxDamage) { _mostDamager = ai._attacker; maxDamage = ai._damage; } } } return _mostDamager; } + * L2Attackable for(AggroInfo ai : _aggroList.values()) { if(ai == null) { continue; } if(ai._attacker.isAlikeDead() || !getKnownList().knowsObject(ai._attacker) || !ai._attacker.isVisible() || ai._attacker instanceof L2PcInstance && ((L2PcInstance)ai._attacker).isOffline() ) { ai._damage = 0; } + * if(ai._damage > maxDamage) { _mostDamager = ai._attacker; maxDamage = ai._damage; } } } return _mostDamager; } */ /** * Return the hate level of the L2Attackable against this L2Character contained in _aggroList.
@@ -1223,7 +1214,7 @@ public class L2Attackable extends L2NpcInstance */ public int getHating(L2Character target) { - if (getAggroListRP().isEmpty()) + if (_aggroList.isEmpty()) { return 0; } @@ -1233,7 +1224,7 @@ public class L2Attackable extends L2NpcInstance return 0; } - final AggroInfo ai = getAggroListRP().get(target); + final AggroInfo ai = _aggroList.get(target); if (ai == null) { @@ -1243,14 +1234,14 @@ public class L2Attackable extends L2NpcInstance if ((ai._attacker instanceof L2PcInstance) && (((L2PcInstance) ai._attacker).getAppearance().getInvisible() || ((L2PcInstance) ai._attacker).isSpawnProtected() || ((L2PcInstance) ai._attacker).isTeleportProtected() || ai._attacker.isInvul())) { // Remove Object Should Use This Method and Can be Blocked While Interating - getAggroList().remove(target); + _aggroList.remove(target); return 0; } if (!ai._attacker.isVisible()) { - getAggroList().remove(target); + _aggroList.remove(target); return 0; } @@ -1940,7 +1931,7 @@ public class L2Attackable extends L2NpcInstance if (cat.isSweep()) { // according to sh1ny, seeded mobs CAN be spoiled and swept. - if (isSpoil()/* && !isSeeded() */) + if (isSpoil()/* && !_seeded */) { List sweepList = new ArrayList<>(); @@ -1970,7 +1961,7 @@ public class L2Attackable extends L2NpcInstance } else { - if (isSeeded()) + if (_seeded) { L2DropData drop = cat.dropSeedAllowedDropsOnly(); @@ -2580,7 +2571,7 @@ public class L2Attackable extends L2NpcInstance */ public boolean noTarget() { - return getAggroListRP().isEmpty(); + return _aggroList.isEmpty(); } /** @@ -2591,7 +2582,7 @@ public class L2Attackable extends L2NpcInstance */ public boolean containsTarget(L2Character player) { - return getAggroListRP().containsKey(player); + return _aggroList.containsKey(player); } /** @@ -2600,7 +2591,7 @@ public class L2Attackable extends L2NpcInstance */ public void clearAggroList() { - getAggroList().clear(); + _aggroList.clear(); } /** @@ -2817,7 +2808,7 @@ public class L2Attackable extends L2NpcInstance if (!isBossMob) { // Fail if this L2Attackable isn't absorbed or there's no one in its _absorbersList - if (!isAbsorbed() /* || _absorbersList == null */) + if (!_absorbed /* || _absorbersList == null */) { resetAbsorbList(); return; @@ -3147,7 +3138,7 @@ public class L2Attackable extends L2NpcInstance public long calculateOverhitExp(long normalExp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = (getOverhitDamage() * 100) / getMaxHp(); + double overhitPercentage = (_overhitDamage * 100) / getMaxHp(); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 88fa2b8276..7535cca4ae 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -407,7 +407,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // to avoid that a spell affecting a L2NPCInstance, affects others L2NPCInstance of the same type too. _skills = ((L2NpcTemplate) template).getSkills(); - for (Map.Entry skill : getSkills().entrySet()) + for (Map.Entry skill : _skills.entrySet()) { addStatFuncs(skill.getValue().getStatFuncs(null, this)); } @@ -439,9 +439,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ protected void initCharStatusUpdateValues() { - _hpUpdateInterval = getMaxHp() / 352.0; // MAX_HP div MAX_HP_BAR_PX - _hpUpdateIncCheck = getMaxHp(); - _hpUpdateDecCheck = getMaxHp() - _hpUpdateInterval; + _hpUpdateInterval = getStat().getMaxHp() / 352.0; // MAX_HP div MAX_HP_BAR_PX + _hpUpdateIncCheck = getStat().getMaxHp(); + _hpUpdateDecCheck = getStat().getMaxHp() - _hpUpdateInterval; } // ========================================================= @@ -481,7 +481,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public void onTeleported() { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -665,16 +665,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ protected boolean needHpUpdate(int barPixels) { - final double currentHp = getCurrentHp(); + final double currentHp = getStatus().getCurrentHp(); - if ((currentHp <= 1.0) || (getMaxHp() < barPixels)) + if ((currentHp <= 1.0) || (getStat().getMaxHp() < barPixels)) { return true; } if ((currentHp <= _hpUpdateDecCheck) || (currentHp >= _hpUpdateIncCheck)) { - if (currentHp == getMaxHp()) + if (currentHp == getStat().getMaxHp()) { _hpUpdateIncCheck = currentHp + 1; _hpUpdateDecCheck = currentHp - _hpUpdateInterval; @@ -722,7 +722,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (Config.DEBUG) { - LOGGER.info("Broadcast Status Update for " + getObjectId() + "(" + getName() + "). HP: " + getCurrentHp()); + LOGGER.info("Broadcast Status Update for " + getObjectId() + "(" + getName() + "). HP: " + getStatus().getCurrentHp()); } // Create the Server->Client packet StatusUpdate with current HP and MP @@ -734,8 +734,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder else { su = new StatusUpdate(getObjectId()); - su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp()); - su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp()); + su.addAttribute(StatusUpdate.CUR_HP, (int) getStatus().getCurrentHp()); + su.addAttribute(StatusUpdate.CUR_MP, (int) getStatus().getCurrentMp()); } // Go through the StatusListener @@ -812,7 +812,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder z1 = getZ(); L2TownZone Town; Town = TownManager.getInstance().getTown(x1, y1, z1); - if ((Town != null) && isinTownWar()) + if ((Town != null) && _inTownWar) { if ((Town.getTownId() == Config.TW_TOWN_ID) && !Config.TW_ALL_TOWNS) { @@ -1132,7 +1132,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ if ((target instanceof L2GrandBossInstance) && (((L2GrandBossInstance) target).getNpcId() == 29022)) { - if (Math.abs(getClientZ() - target.getZ()) > 200) + if (Math.abs(_clientZ - target.getZ()) > 200) { sendPacket(new SystemMessage(SystemMessageId.CANT_SEE_TARGET)); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); @@ -1183,7 +1183,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder final int saMpConsume = (int) getStat().calcStat(Stats.MP_CONSUME, 0, null, null); final int mpConsume = saMpConsume == 0 ? weaponItem.getMpConsume() : saMpConsume; - if (getCurrentMp() < mpConsume) + if (getStatus().getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1222,7 +1222,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // Reduce the current CP if TIREDNESS configuration is activated if (Config.ALT_GAME_TIREDNESS) { - setCurrentCp(getCurrentCp() - 10); + setCurrentCp(getStatus().getCurrentCp() - 10); } final int timeAtk = calculateTimeBetweenAttacks(target, weaponItem); @@ -1368,7 +1368,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder broadcastPacket(attack); fireEvent(EventType.ATTACK.name, new Object[] { - getTarget() + _target }); } @@ -1376,7 +1376,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if ((this instanceof L2MonsterInstance) && (((L2MonsterInstance) this).getNpcId() == 27181)) { final int rndNum = Rnd.get(100); - final L2PcInstance gettarget = (L2PcInstance) getTarget(); + final L2PcInstance gettarget = (L2PcInstance) _target; if ((rndNum < 5) && (gettarget != null)) { @@ -1560,15 +1560,15 @@ public abstract class L2Character extends L2Object implements ISkillsHolder final int maxRadius = (int) getStat().calcStat(Stats.POWER_ATTACK_RANGE, 66, null, null); final int maxAngleDiff = (int) getStat().calcStat(Stats.POWER_ATTACK_ANGLE, 120, null, null); - if (getTarget() == null) + if (_target == null) { return false; } - angleTarget = Util.calculateAngleFrom(this, getTarget()); + angleTarget = Util.calculateAngleFrom(this, _target); setHeading((int) ((angleTarget / 9.0) * 1610.0)); - angleChar = Util.convertHeadingToDegree(getHeading()); + angleChar = Util.convertHeadingToDegree(_heading); double attackpercent = 85; final int attackcountmax = (int) getStat().calcStat(Stats.ATTACK_COUNT_MAX, 3, null, null); int attackcount = 0; @@ -1725,14 +1725,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } // Check if the skill is a magic spell and if the L2Character is not muted - if (skill.isMagic() && isMuted() && !skill.isPotion()) + if (skill.isMagic() && _isMuted && !skill.isPotion()) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; } // Check if the skill is psychical and if the L2Character is not psychical_muted - if (!skill.isMagic() && isPsychicalMuted() && !skill.isPotion()) + if (!skill.isMagic() && _isPsychicalMuted && !skill.isPotion()) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -1841,7 +1841,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } else { - target = (L2Character) getTarget(); + target = (L2Character) _target; } if (target == null) @@ -1953,7 +1953,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // Init the reuse time of the skill // int reuseDelay = (int)(skill.getReuseDelay() * getStat().getMReuseRate(skill)); - // reuseDelay *= 333.0 / (skill.isMagic() ? getMAtkSpd() : getPAtkSpd()); + // reuseDelay *= 333.0 / (skill.isMagic() ? getStat().getMAtkSpd() : getStat().getPAtkSpd()); int reuseDelay = skill.getReuseDelay(); if ((activeChar instanceof L2PcInstance) && Formulas.getInstance().calcSkillMastery(activeChar)) @@ -1971,7 +1971,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder reuseDelay *= getStat().getPReuseRate(skill); } - reuseDelay *= 333.0 / (skill.isMagic() ? getMAtkSpd() : getPAtkSpd()); + reuseDelay *= 333.0 / (skill.isMagic() ? getStat().getMAtkSpd() : getStat().getPAtkSpd()); } // To turn local player in target direction @@ -2083,7 +2083,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder getStatus().reduceMp(calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, initmpcons, null, null)); } - su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp()); + su.addAttribute(StatusUpdate.CUR_MP, (int) getStatus().getCurrentMp()); sendPacket(su); } @@ -2124,7 +2124,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // Create a task MagicUseTask to launch the MagicSkill at the end of the casting time (hitTime) // For client animation reasons (party buffs especially) 200 ms before! - if ((getForceBuff() != null) || effectWhileCasting) + if ((_forceBuff != null) || effectWhileCasting) { if (skill.isPotion()) { @@ -2217,7 +2217,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // killing is only possible one time synchronized (this) { - if (isKilledAlready()) + if (_isKilledAlready) { return false; } @@ -2228,7 +2228,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder setTarget(null); // Stop fear to avoid possible bug with char position after death - if (isAfraid()) + if (_isAfraid) { stopFear(null); } @@ -2372,7 +2372,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); @@ -2381,14 +2381,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder ((L2Playable) this).stopPhoenixBlessing(null); // Like L2OFF Soul of The Phoenix and Salvation restore all hp,cp,mp. - _status.setCurrentCp(getMaxCp()); - _status.setCurrentHp(getMaxHp()); - _status.setCurrentMp(getMaxMp()); + _status.setCurrentCp(getStat().getMaxCp()); + _status.setCurrentHp(getStat().getMaxHp()); + _status.setCurrentMp(getStat().getMaxMp()); } else { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentCp(getStat().getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentHp(getStat().getMaxHp() * Config.RESPAWN_RESTORE_HP); } } // Start broadcast status @@ -2608,7 +2608,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final boolean isAlikeDead() { - return isFakeDeath() || (getCurrentHp() <= 0.01); + return _isFakeDeath || (getStatus().getCurrentHp() <= 0.01); } /** @@ -2617,7 +2617,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final boolean isAllSkillsDisabled() { - return _allSkillsDisabled || isImmobileUntilAttacked() || isStunned() || isSleeping() || isParalyzed(); + return _allSkillsDisabled || _isImmobileUntilAttacked || _isStunned || _isSleeping || _isParalyzed; } /** @@ -2626,7 +2626,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public boolean isAttackingDisabled() { - return isImmobileUntilAttacked() || isStunned() || isSleeping() || isFallsdown() || (_attackEndTime > GameTimeController.getGameTicks()) || isFakeDeath() || isParalyzed() || isAttackDisabled(); + return _isImmobileUntilAttacked || _isStunned || _isSleeping || _isFallsdown || (_attackEndTime > GameTimeController.getGameTicks()) || _isFakeDeath || _isParalyzed || _isAttackDisabled; } /** @@ -2662,7 +2662,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final boolean isDead() { - return !isFakeDeath() && (getCurrentHp() < 0.5); + return !_isFakeDeath && (getStatus().getCurrentHp() < 0.5); } /** @@ -2843,7 +2843,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public boolean isMovementDisabled() { - return isImmobileUntilAttacked() || isStunned() || isRooted() || isSleeping() || isOverloaded() || isParalyzed() || isImobilised() || isFakeDeath() || isFallsdown(); + return _isImmobileUntilAttacked || _isStunned || _isRooted || _isSleeping || _isOverloaded || _isParalyzed || isImobilised() || _isFakeDeath || _isFallsdown; } /** @@ -2852,7 +2852,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final boolean isOutOfControl() { - return isConfused() || isAfraid() || isBlocked(); + return _isConfused || _isAfraid || _blocked; } /** @@ -2987,7 +2987,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final void setRunning() { - if (!isRunning()) + if (!_isRunning) { setIsRunning(true); } @@ -3242,7 +3242,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final void setWalking() { - if (isRunning()) + if (_isRunning) { setIsRunning(false); } @@ -3534,12 +3534,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // LOGGER.fine("Checking pvp time: " + getlastPvpAttack()); // "lastattack: " _lastAttackTime "currenttime: " // System.currentTimeMillis()); - if (System.currentTimeMillis() > getPvpFlagLasts()) + if (System.currentTimeMillis() > _pvpFlagLasts) { // LOGGER.fine("Stopping PvP"); stopPvPFlag(); } - else if (System.currentTimeMillis() > (getPvpFlagLasts() - 5000)) + else if (System.currentTimeMillis() > (_pvpFlagLasts - 5000)) { updatePvPFlag(2); } @@ -4102,7 +4102,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final void startStunning() { - if (isStunned()) + if (_isStunned) { return; } @@ -4523,7 +4523,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final void stopStunning(L2Effect effect) { - if (!isStunned()) + if (!_isStunned) { return; } @@ -4722,31 +4722,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder { int ae = _AbnormalEffects; - if (isStunned()) + if (_isStunned) { ae |= ABNORMAL_EFFECT_STUN; } - if (isRooted()) + if (_isRooted) { ae |= ABNORMAL_EFFECT_ROOT; } - if (isSleeping()) + if (_isSleeping) { ae |= ABNORMAL_EFFECT_SLEEP; } - if (isConfused()) + if (_isConfused) { ae |= ABNORMAL_EFFECT_CONFUSED; } - if (isMuted()) + if (_isMuted) { ae |= ABNORMAL_EFFECT_MUTED; } - if (isAfraid()) + if (_isAfraid) { ae |= ABNORMAL_EFFECT_AFRAID; } - if (isPsychicalMuted()) + if (_isPsychicalMuted) { ae |= ABNORMAL_EFFECT_MUTED; } @@ -5505,7 +5505,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder su = new StatusUpdate(getObjectId()); } - su.addAttribute(StatusUpdate.ATK_SPD, getPAtkSpd()); + su.addAttribute(StatusUpdate.ATK_SPD, getStat().getPAtkSpd()); } else if (stat == Stats.MAGIC_ATTACK_SPEED) { @@ -5514,12 +5514,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder su = new StatusUpdate(getObjectId()); } - su.addAttribute(StatusUpdate.CAST_SPD, getMAtkSpd()); + su.addAttribute(StatusUpdate.CAST_SPD, getStat().getMAtkSpd()); } // else if (stat==Stats.MAX_HP) // // { // if (su == null) su = new StatusUpdate(getObjectId()); - // su.addAttribute(StatusUpdate.MAX_HP, getMaxHp()); + // su.addAttribute(StatusUpdate.MAX_HP, getStat().getMaxHp()); // } else if (stat == Stats.MAX_CP) { @@ -5530,13 +5530,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder su = new StatusUpdate(getObjectId()); } - su.addAttribute(StatusUpdate.MAX_CP, getMaxCp()); + su.addAttribute(StatusUpdate.MAX_CP, getStat().getMaxCp()); } } // else if (stat==Stats.MAX_MP) // { // if (su == null) su = new StatusUpdate(getObjectId()); - // su.addAttribute(StatusUpdate.MAX_MP, getMaxMp()); + // su.addAttribute(StatusUpdate.MAX_MP, getStat().getMaxMp()); // } else if (stat == Stats.RUN_SPEED) { @@ -5909,9 +5909,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder _skillCast = null; } - if (getForceBuff() != null) + if (_forceBuff != null) { - getForceBuff().onCastAbort(); + _forceBuff.onCastAbort(); } final L2Effect mog = getFirstEffect(L2Effect.EffectType.SIGNET_GROUND); @@ -6331,7 +6331,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -6409,7 +6409,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInWater && !(this instanceof L2BoatInstance) && !(this instanceof L2NpcWalkerInstance) && !_cursorKeyMovement) + if (!_isFlying && !isInWater && !(this instanceof L2BoatInstance) && !(this instanceof L2NpcWalkerInstance) && !_cursorKeyMovement) { final boolean isInBoat = (this instanceof L2PcInstance) && ((L2PcInstance) this).isInBoat(); if (isInBoat) @@ -6477,7 +6477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } // Pathfinding checks. - if (((originalDistance - distance) > 30) && !isAfraid() && !isInBoat) + if (((originalDistance - distance) > 30) && !_isAfraid && !isInBoat) { // Path calculation // Overrides previous movement check @@ -6527,7 +6527,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } // If no distance to go through, the movement is cancelled - if ((distance < 1) && ((Config.PATHFINDING > 0) || (this instanceof L2Playable) || isAfraid() || (this instanceof L2RiftInvaderInstance))) + if ((distance < 1) && ((Config.PATHFINDING > 0) || (this instanceof L2Playable) || _isAfraid || (this instanceof L2RiftInvaderInstance))) { if (this instanceof L2Summon) { @@ -6539,7 +6539,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInWater) && !verticalMovementOnly) + if ((_isFlying || isInWater) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -7279,7 +7279,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (absorbPercent > 0) { - final int maxCanAbsorb = (int) (getMaxHp() - getCurrentHp()); + final int maxCanAbsorb = (int) (getStat().getMaxHp() - getStatus().getCurrentHp()); int absorbDamage = (int) ((absorbPercent / 100.) * damage); if (absorbDamage > maxCanAbsorb) @@ -7289,7 +7289,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(getStatus().getCurrentHp() + absorbDamage); // Custom messages - nice but also more network load /* @@ -7416,7 +7416,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder public void breakCast() { // damage can only cancel magical skills - if (isCastingNow() && canAbortCast() && (getLastSkillCast() != null) && getLastSkillCast().isMagic()) + if (isCastingNow() && canAbortCast() && (_lastSkillCast != null) && _lastSkillCast.isMagic()) { // Abort the cast of the L2Character and send Server->Client MagicSkillCanceld/ActionFailed packet. abortCast(); @@ -7769,7 +7769,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } else { - atkSpd = getPAtkSpd(); + atkSpd = getStat().getPAtkSpd(); } return Formulas.getInstance().calcPAtkSpd(this, target, atkSpd); @@ -7852,7 +7852,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (newSkill != null) { // Replace oldSkill by newSkill or Add the newSkill - oldSkill = getSkills().put(newSkill.getId(), newSkill); + oldSkill = _skills.put(newSkill.getId(), newSkill); // If an old skill has been replaced, remove all its Func objects if (oldSkill != null) @@ -7998,7 +7998,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder public L2Skill removeSkill(int skillId, boolean cancelEffect) { // Remove the skill from the L2Character _skills - final L2Skill oldSkill = getSkills().remove(skillId); + final L2Skill oldSkill = _skills.remove(skillId); // Remove all its Func objects from the L2Character calculator set if (oldSkill != null) { @@ -8014,9 +8014,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } // Stop casting if this skill is used right now - if ((getLastSkillCast() != null) && isCastingNow()) + if ((_lastSkillCast != null) && isCastingNow()) { - if (oldSkill.getId() == getLastSkillCast().getId()) + if (oldSkill.getId() == _lastSkillCast.getId()) { abortCast(); } @@ -8052,7 +8052,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public final L2Skill[] getAllSkills() { - return getSkills().values().toArray(new L2Skill[getSkills().values().size()]); + return _skills.values().toArray(new L2Skill[_skills.values().size()]); } /** @@ -8082,7 +8082,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder @Override public int getSkillLevel(int skillId) { - final L2Skill skill = getSkills().get(skillId); + final L2Skill skill = _skills.get(skillId); return (skill == null) ? 0 : skill.getLevel(); } @@ -8095,7 +8095,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder @Override public final L2Skill getKnownSkill(int skillId) { - return getSkills().get(skillId); + return _skills.get(skillId); } /** @@ -8512,12 +8512,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder return; } - if (getForceBuff() != null) + if (_forceBuff != null) { _skillCast = null; enableAllSkills(); - getForceBuff().onCastAbort(); + _forceBuff.onCastAbort(); return; } @@ -8616,7 +8616,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder getStatus().reduceMp(calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume, null, null)); } - su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp()); + su.addAttribute(StatusUpdate.CUR_MP, (int) getStatus().getCurrentMp()); isSendStatus = true; } @@ -8627,14 +8627,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder consumeHp = calcStat(Stats.HP_CONSUME_RATE, skill.getHpConsume(), null, null); - if ((consumeHp + 1) >= getCurrentHp()) + if ((consumeHp + 1) >= getStatus().getCurrentHp()) { - consumeHp = getCurrentHp() - 1.0; + consumeHp = getStatus().getCurrentHp() - 1.0; } getStatus().reduceHp(consumeHp, this); - su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp()); + su.addAttribute(StatusUpdate.CUR_HP, (int) getStatus().getCurrentHp()); isSendStatus = true; } @@ -8712,18 +8712,18 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // Like L2OFF if the skill is BLOW the player doesn't auto attack // If on XML skill nextActionAttack = true the char auto attack // If CTRL is pressed the autoattack is aborted (like L2OFF) - if ((skilldat != null) && !skilldat.isCtrlPressed() && skill.nextActionIsAttack() && (getTarget() != null) && (getTarget() instanceof L2Character)) + if ((skilldat != null) && !skilldat.isCtrlPressed() && skill.nextActionIsAttack() && (_target != null) && (_target instanceof L2Character)) { - getAI().setIntention(AI_INTENTION_ATTACK, getTarget()); + getAI().setIntention(AI_INTENTION_ATTACK, _target); } } - else if (skill.nextActionIsAttack() && (getTarget() != null) && (getTarget() instanceof L2Character)) + else if (skill.nextActionIsAttack() && (_target != null) && (_target instanceof L2Character)) { - getAI().setIntention(AI_INTENTION_ATTACK, getTarget()); + getAI().setIntention(AI_INTENTION_ATTACK, _target); } else if ((skill.isOffensive()) && (skill.getSkillType() != SkillType.UNLOCK) && (skill.getSkillType() != SkillType.BLOW) && (skill.getSkillType() != SkillType.DELUXE_KEY_UNLOCK) && (skill.getId() != 345) && (skill.getId() != 346)) { - getAI().setIntention(AI_INTENTION_ATTACK, getTarget()); + getAI().setIntention(AI_INTENTION_ATTACK, _target); getAI().clientStartAutoAttack(); } } @@ -8735,7 +8735,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder { if (!skill.isMagic() && skill.nextActionIsAttack()) { - getAI().setIntention(AI_INTENTION_ATTACK, getTarget()); + getAI().setIntention(AI_INTENTION_ATTACK, _target); } getAI().clientStartAutoAttack(); @@ -8745,7 +8745,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder { if (!skill.isMagic()) { - getAI().setIntention(AI_INTENTION_ATTACK, getTarget()); + getAI().setIntention(AI_INTENTION_ATTACK, _target); } getAI().clientStartAutoAttack(); @@ -8759,7 +8759,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // Notify the AI of the L2Character with EVT_FINISH_CASTING getAI().notifyEvent(CtrlEvent.EVT_FINISH_CASTING); - notifyQuestEventSkillFinished(skill, getTarget()); + notifyQuestEventSkillFinished(skill, _target); /* * If character is a player, then wipe their current cast state and check if a skill is queued. If there is a queued skill, launch it and wipe the queue. @@ -8823,7 +8823,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder { final L2PcInstance player = target instanceof L2PcInstance ? (L2PcInstance) target : ((L2Summon) target).getOwner(); - for (Quest quest : ((L2NpcTemplate) getTemplate()).getEventQuests(Quest.QuestEventType.ON_SPELL_FINISHED)) + for (Quest quest : ((L2NpcTemplate) _template).getEventQuests(Quest.QuestEventType.ON_SPELL_FINISHED)) { quest.notifySpellFinished(((L2NpcInstance) this), player, skill); } @@ -9516,7 +9516,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public boolean isBehindTarget() { - return isBehind(getTarget()); + return isBehind(_target); } /** @@ -9534,7 +9534,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } maxAngleDiff = maxAngle / 2; angleTarget = Util.calculateAngleFrom(this, target); - angleChar = Util.convertHeadingToDegree(getHeading()); + angleChar = Util.convertHeadingToDegree(_heading); angleDiff = angleChar - angleTarget; if (angleDiff <= (-360 + maxAngleDiff)) { @@ -9589,7 +9589,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (Math.abs(angleDiff) <= maxAngleDiff) { - if (isBehindTarget()) + if (isBehind(_target)) { return false; } @@ -9612,7 +9612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public boolean isFrontTarget() { - return isFront(getTarget()); + return isFront(_target); } /** @@ -9630,7 +9630,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder if (target instanceof L2Character) { - if (isBehindTarget() || isFrontTarget()) + if (isBehind(_target) || isFront(_target)) { return false; } @@ -9645,7 +9645,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public boolean isSideTarget() { - return isSide(getTarget()); + return isSide(_target); } /** @@ -9682,7 +9682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder private Future _PvPRegTask; /** The _pvp flag lasts. */ - private long _pvpFlagLasts; + long _pvpFlagLasts; /** * Sets the pvp flag lasts. @@ -10316,18 +10316,18 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } } - if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && (Config.L2JMOD_CHAMPION_HP != 0)) + if (Config.L2JMOD_CHAMPION_ENABLE && _champion && (Config.L2JMOD_CHAMPION_HP != 0)) { getStatus().reduceHp(i / Config.L2JMOD_CHAMPION_HP, attacker, awake); } - else if (is_advanceFlag()) + else if (_advanceFlag) { getStatus().reduceHp(i / _advanceMultiplier, attacker, awake); } - else if (isUnkillable()) + else if (_isUnkillable) { - final double hpToReduce = getCurrentHp() - 1; - if (i > getCurrentHp()) + final double hpToReduce = getStatus().getCurrentHp() - 1; + if (i > getStatus().getCurrentHp()) { getStatus().reduceHp(hpToReduce, attacker, awake); } @@ -10678,7 +10678,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public void restoreHPMP() { - getStatus().setCurrentHpMp(getMaxHp(), getMaxMp()); + getStatus().setCurrentHpMp(getStat().getMaxHp(), getStat().getMaxMp()); } /** @@ -10686,7 +10686,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder */ public void restoreCP() { - getStatus().setCurrentCp(getMaxCp()); + getStatus().setCurrentCp(getStat().getMaxCp()); } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 9e2c604c5b..3c7fd682ff 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -59,7 +59,7 @@ public abstract class L2Summon extends L2Playable protected int _pkKills; private L2PcInstance _owner; private int _attackRange = 36; // Melee range - private boolean _follow = true; + boolean _follow = true; private boolean _previousFollowStatus = true; private int _maxLoad; @@ -86,7 +86,7 @@ public abstract class L2Summon extends L2Playable public boolean isAutoFollow() { - return getFollowStatus(); + return _follow; } public void doPickupItem(L2Object object) @@ -278,12 +278,12 @@ public abstract class L2Summon extends L2Playable public final int getKarma() { - return getOwner() != null ? getOwner().getKarma() : 0; + return _owner != null ? _owner.getKarma() : 0; } public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } public final L2PcInstance getOwner() @@ -299,7 +299,7 @@ public abstract class L2Summon extends L2Playable @Override protected void doAttack(L2Character target) { - if ((getOwner() != null) && (getOwner() == target) && !getOwner().isBetrayed()) + if ((_owner != null) && (_owner == target) && !_owner.isBetrayed()) { sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_INCORRECT)); return; @@ -409,9 +409,9 @@ public abstract class L2Summon extends L2Playable { super.broadcastStatusUpdate(); - if ((getOwner() != null) && isVisible()) + if ((_owner != null) && isVisible()) { - getOwner().sendPacket(new PetStatusUpdate(this)); + _owner.sendPacket(new PetStatusUpdate(this)); } } @@ -480,7 +480,7 @@ public abstract class L2Summon extends L2Playable if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -632,7 +632,7 @@ public abstract class L2Summon extends L2Playable } // Set current pet skill - getOwner().setCurrentPetSkill(skill, forceUse, dontMove); + _owner.setCurrentPetSkill(skill, forceUse, dontMove); // ************************************* Check Target ******************************************* @@ -644,7 +644,7 @@ public abstract class L2Summon extends L2Playable // OWNER_PET should be cast even if no target has been found case TARGET_OWNER_PET: { - target = getOwner(); + target = _owner; break; } // PARTY, AURA, SELF should be cast even if no target has been found @@ -666,9 +666,9 @@ public abstract class L2Summon extends L2Playable // Check the validity of the target if (target == null) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(SystemMessageId.TARGET_CANT_FOUND); + _owner.sendPacket(SystemMessageId.TARGET_CANT_FOUND); } return; } @@ -676,16 +676,16 @@ public abstract class L2Summon extends L2Playable // ************************************* Check skill availability ******************************************* // Check if this skill is enabled (ex : reuse time) - if (isSkillDisabled(skill) && (getOwner() != null) && getOwner().getAccessLevel().allowPeaceAttack()) + if (isSkillDisabled(skill) && (_owner != null) && _owner.getAccessLevel().allowPeaceAttack()) { SystemMessage sm = new SystemMessage(SystemMessageId.S1_PREPARED_FOR_REUSE); sm.addString(skill.getName()); - getOwner().sendPacket(sm); + _owner.sendPacket(sm); return; } // Check if all skills are disabled - if (isAllSkillsDisabled() && (getOwner() != null) && getOwner().getAccessLevel().allowPeaceAttack()) + if (isAllSkillsDisabled() && (_owner != null) && _owner.getAccessLevel().allowPeaceAttack()) { return; } @@ -696,9 +696,9 @@ public abstract class L2Summon extends L2Playable if (getCurrentMp() < (getStat().getMpConsume(skill) + getStat().getMpInitialConsume(skill))) { // Send a System Message to the caster - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(SystemMessageId.NOT_ENOUGH_MP); + _owner.sendPacket(SystemMessageId.NOT_ENOUGH_MP); } return; @@ -708,9 +708,9 @@ public abstract class L2Summon extends L2Playable if (getCurrentHp() <= skill.getHpConsume()) { // Send a System Message to the caster - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(SystemMessageId.NOT_ENOUGH_HP); + _owner.sendPacket(SystemMessageId.NOT_ENOUGH_HP); } return; @@ -721,20 +721,20 @@ public abstract class L2Summon extends L2Playable // Check if this is offensive magic skill if (skill.isOffensive()) { - if ((getOwner() != null) && (getOwner() == target) && !getOwner().isBetrayed()) + if ((_owner != null) && (_owner == target) && !_owner.isBetrayed()) { sendPacket(new SystemMessage(SystemMessageId.TARGET_IS_INCORRECT)); return; } - if (isInsidePeaceZone(this, target) && (getOwner() != null) && !getOwner().getAccessLevel().allowPeaceAttack()) + if (isInsidePeaceZone(this, target) && (_owner != null) && !_owner.getAccessLevel().allowPeaceAttack()) { // If summon or target is in a peace zone, send a system message TARGET_IN_PEACEZONE sendPacket(new SystemMessage(SystemMessageId.TARGET_IN_PEACEZONE)); return; } - if ((getOwner() != null) && getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if ((_owner != null) && _owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // if L2PcInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed sendPacket(ActionFailed.STATIC_PACKET); @@ -744,14 +744,14 @@ public abstract class L2Summon extends L2Playable // Check if the target is attackable if (target instanceof L2DoorInstance) { - if (!((L2DoorInstance) target).isAttackable(getOwner())) + if (!((L2DoorInstance) target).isAttackable(_owner)) { return; } } else { - if (!target.isAttackable() && (getOwner() != null) && getOwner().getAccessLevel().allowPeaceAttack()) + if (!target.isAttackable() && (_owner != null) && _owner.getAccessLevel().allowPeaceAttack()) { return; } @@ -775,7 +775,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if imobilized temporarly disable follow mode if (_previousFollowStatus) @@ -814,7 +814,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return getOwner() != null ? getOwner().isInCombat() : false; + return _owner != null ? _owner.isInCombat() : false; } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleTeleporterInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleTeleporterInstance.java index 93df7e1826..49d9b498e6 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleTeleporterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CastleTeleporterInstance.java @@ -58,7 +58,7 @@ public final class L2CastleTeleporterInstance extends L2NpcInstance if (actualCommand.equalsIgnoreCase("tele")) { int delay; - if (!getTask()) + if (!_currentTask) { if (getCastle().getSiege().getIsInProgress() && (getCastle().getSiege().getControlTowerCount() == 0)) { @@ -90,7 +90,7 @@ public final class L2CastleTeleporterInstance extends L2NpcInstance public void showChatWindow(L2PcInstance player) { String filename; - if (!getTask()) + if (!_currentTask) { if (getCastle().getSiege().getIsInProgress() && (getCastle().getSiege().getControlTowerCount() == 0)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ChestInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ChestInstance.java index 2f0d51b7ac..ae632ffc89 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ChestInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ChestInstance.java @@ -232,7 +232,7 @@ public final class L2ChestInstance extends L2MonsterInstance return true; } - if (isInteracted()) + if (_isInteracted) { return false; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.java index 3072a29db9..ae2040401c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableMobInstance.java @@ -93,7 +93,7 @@ public class L2ControllableMobInstance extends L2MonsterInstance @Override public void reduceCurrentHp(double i, L2Character attacker, boolean awake) { - if (isInvul() || isDead()) + if (_isInvul || isDead()) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index db96fa9410..fe7e0cc4b6 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -110,7 +110,7 @@ public class L2DoorInstance extends L2Character protected final String _name; /** The _open. */ - private boolean _open; + boolean _open; /** The _unlockable. */ private final boolean _unlockable; @@ -262,7 +262,7 @@ public class L2DoorInstance extends L2Character { String doorAction; - if (!getOpen()) + if (!_open) { doorAction = "opened"; openMe(); @@ -512,7 +512,7 @@ public class L2DoorInstance extends L2Character @Override public boolean isAutoAttackable(L2Character attacker) { - if (isUnlockable()) + if (_unlockable) { return true; } @@ -681,12 +681,12 @@ public class L2DoorInstance extends L2Character LOGGER.info("player clanid " + player.getClanId()); LOGGER.info("player clanleaderid " + player.getClan().getLeaderId()); } - LOGGER.info("clanhall " + getClanHall()); - if (getClanHall() != null) + LOGGER.info("clanhall " + _clanHall); + if (_clanHall != null) { - LOGGER.info("clanhallID " + getClanHall().getId()); - LOGGER.info("clanhallOwner " + getClanHall().getOwnerId()); - for (L2DoorInstance door : getClanHall().getDoors()) + LOGGER.info("clanhallID " + _clanHall.getId()); + LOGGER.info("clanhallOwner " + _clanHall.getOwnerId()); + for (L2DoorInstance door : _clanHall.getDoors()) { LOGGER.info("clanhallDoor " + door.getObjectId()); } @@ -721,7 +721,7 @@ public class L2DoorInstance extends L2Character player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } } - else if ((player.getClan() != null) && (getClanHall() != null) && (player.getClanId() == getClanHall().getOwnerId())) + else if ((player.getClan() != null) && (_clanHall != null) && (player.getClanId() == _clanHall.getOwnerId())) { if (!isInsideRadius(player, L2NpcInstance.INTERACTION_DISTANCE, false, false)) { @@ -731,7 +731,7 @@ public class L2DoorInstance extends L2Character { // Like L2OFF Clanhall's doors get request to be closed/opened player.gatesRequest(this); - if (!getOpen()) + if (!_open) { player.sendPacket(new ConfirmDlg(1140)); } @@ -768,12 +768,12 @@ public class L2DoorInstance extends L2Character LOGGER.info("player clanid " + player.getClanId()); LOGGER.info("player clanleaderid " + player.getClan().getLeaderId()); } - LOGGER.info("clanhall " + getClanHall()); - if (getClanHall() != null) + LOGGER.info("clanhall " + _clanHall); + if (_clanHall != null) { - LOGGER.info("clanhallID " + getClanHall().getId()); - LOGGER.info("clanhallOwner " + getClanHall().getOwnerId()); - for (L2DoorInstance door : getClanHall().getDoors()) + LOGGER.info("clanhallID " + _clanHall.getId()); + LOGGER.info("clanhallOwner " + _clanHall.getOwnerId()); + for (L2DoorInstance door : _clanHall.getDoors()) { LOGGER.info("clanhallDoor " + door.getObjectId()); } @@ -799,7 +799,7 @@ public class L2DoorInstance extends L2Character html1.append(""); html1.append(""); - html1.append(""); + html1.append(""); html1.append(""); html1.append(""); @@ -807,8 +807,8 @@ public class L2DoorInstance extends L2Character html1.append("
There are no currently pending petitions.
PetitionerPetition TypeSubmitted
Max HP " + getMaxHp() + "
Object ID: " + getObjectId() + "
Door ID: " + getDoorId() + "
Door ID: " + _doorId + "

Class: " + getClass().getName() + "
"); html1.append(""); - html1.append(""); - html1.append(""); + html1.append(""); + html1.append(""); html1.append(""); html1.append(""); html1.append("
"); @@ -888,7 +888,7 @@ public class L2DoorInstance extends L2Character { synchronized (this) { - if (!getOpen()) + if (!_open) { return; } @@ -906,7 +906,7 @@ public class L2DoorInstance extends L2Character { synchronized (this) { - if (getOpen()) + if (_open) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GourdInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GourdInstance.java index 6323c9873b..035a8a0089 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GourdInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2GourdInstance.java @@ -67,7 +67,7 @@ public final class L2GourdInstance extends L2MonsterInstance @Override public void reduceCurrentHp(double damage, L2Character attacker, boolean awake) { - if (!attacker.getName().equalsIgnoreCase(getOwner())) + if (!attacker.getName().equalsIgnoreCase(_name)) { damage = 0; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java index 896c1eae53..66389b4d11 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java @@ -539,7 +539,7 @@ public final class L2ItemInstance extends L2Object */ public boolean isCupidBow() { - if ((getItemId() == 9140) || (getItemId() == 9141)) + if ((_itemId == 9140) || (_itemId == 9141)) { return true; } @@ -615,7 +615,7 @@ public final class L2ItemInstance extends L2Object */ public int getPriceToSell() { - return isConsumable() ? (int) (_priceSell * Config.RATE_CONSUMABLE_COST) : _priceSell; + return _item.isConsumable() ? (int) (_priceSell * Config.RATE_CONSUMABLE_COST) : _priceSell; } /** @@ -719,9 +719,9 @@ public final class L2ItemInstance extends L2Object */ public boolean isAvailable(L2PcInstance player, boolean allowAdena, boolean allowEquipped) { - return (!isEquipped() || allowEquipped) && (getItem().getType2() != L2Item.TYPE2_QUEST) && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // TODO: what does this mean? + return (!isEquipped() || allowEquipped) && (_item.getType2() != L2Item.TYPE2_QUEST) && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // TODO: what does this mean? && ((player.getPet() == null) || (getObjectId() != player.getPet().getControlItemId())) // Not Control item of currently summoned pet - && (player.getActiveEnchantItem() != this) && (allowAdena || (getItemId() != 57)) && ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != getItemId())) && isTradeable(); + && (player.getActiveEnchantItem() != this) && (allowAdena || (_itemId != 57)) && ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != _itemId)) && isTradeable(); } /* @@ -946,21 +946,21 @@ public final class L2ItemInstance extends L2Object case 10: { sm = new SystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_10); - sm.addString(getItemName()); + sm.addString(_item.getName()); player.sendPacket(sm); break; } case 5: { sm = new SystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_5); - sm.addString(getItemName()); + sm.addString(_item.getName()); player.sendPacket(sm); break; } case 1: { sm = new SystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_1); - sm.addString(getItemName()); + sm.addString(_item.getName()); player.sendPacket(sm); break; } @@ -969,7 +969,7 @@ public final class L2ItemInstance extends L2Object if (_mana == 0) // The life time has expired { sm = new SystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_0); - sm.addString(getItemName()); + sm.addString(_item.getName()); player.sendPacket(sm); // unequip @@ -987,7 +987,7 @@ public final class L2ItemInstance extends L2Object player.sendPacket(iu); } - if (getLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1017,7 +1017,7 @@ public final class L2ItemInstance extends L2Object scheduleConsumeManaTask(); } - if (getLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1108,7 +1108,7 @@ public final class L2ItemInstance extends L2Object */ public Func[] getStatFuncs(L2Character player) { - return getItem().getStatFuncs(this, player); + return _item.getStatFuncs(this, player); } /** @@ -1127,9 +1127,7 @@ public final class L2ItemInstance extends L2Object */ public void updateDatabase() { - // LOGGER.info("Item: "+getItemId()+" Loc: "+_loc.name()+" ExistInDb: "+_existsInDb+" owner: "+_ownerId); - - if (isWear()) + if (_wear) { return; } @@ -1374,15 +1372,15 @@ public final class L2ItemInstance extends L2Object { PreparedStatement statement = con.prepareStatement("UPDATE items SET owner_id=?,count=?,loc=?,loc_data=?,enchant_level=?,price_sell=?,price_buy=?,custom_type1=?,custom_type2=?,mana_left=? WHERE object_id = ?"); statement.setInt(1, _ownerId); - statement.setInt(2, getCount()); + statement.setInt(2, _count); statement.setString(3, _loc.name()); statement.setInt(4, _locData); - statement.setInt(5, getEnchantLevel()); + statement.setInt(5, _enchantLevel); statement.setInt(6, _priceSell); statement.setInt(7, _priceBuy); - statement.setInt(8, getCustomType1()); - statement.setInt(9, getCustomType2()); - statement.setInt(10, getMana()); + statement.setInt(8, _type1); + statement.setInt(9, _type2); + statement.setInt(10, _mana); statement.setInt(11, getObjectId()); statement.executeUpdate(); _existsInDb = true; @@ -1420,16 +1418,16 @@ public final class L2ItemInstance extends L2Object PreparedStatement statement = con.prepareStatement("INSERT INTO items (owner_id,item_id,count,loc,loc_data,enchant_level,price_sell,price_buy,object_id,custom_type1,custom_type2,mana_left) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)"); statement.setInt(1, _ownerId); statement.setInt(2, _itemId); - statement.setInt(3, getCount()); + statement.setInt(3, _count); statement.setString(4, _loc.name()); statement.setInt(5, _locData); - statement.setInt(6, getEnchantLevel()); + statement.setInt(6, _enchantLevel); statement.setInt(7, _priceSell); statement.setInt(8, _priceBuy); statement.setInt(9, getObjectId()); statement.setInt(10, _type1); statement.setInt(11, _type2); - statement.setInt(12, getMana()); + statement.setInt(12, _mana); statement.executeUpdate(); _existsInDb = true; @@ -1440,7 +1438,7 @@ public final class L2ItemInstance extends L2Object { if (Config.DEBUG) { - LOGGER.warning("ATTENTION: Update Item instead of Insert one, check player with id " + getOwnerId() + " actions on item " + getObjectId()); + LOGGER.warning("ATTENTION: Update Item instead of Insert one, check player with id " + _ownerId + " actions on item " + getObjectId()); } updateInDb(); } @@ -1659,7 +1657,7 @@ public final class L2ItemInstance extends L2Object */ public boolean isVarkaKetraAllyQuestItem() { - if (((getItemId() >= 7211) && (getItemId() <= 7215)) || ((getItemId() >= 7221) && (getItemId() <= 7225))) + if (((_itemId >= 7211) && (_itemId <= 7215)) || ((_itemId >= 7221) && (_itemId <= 7225))) { return true; } @@ -1679,7 +1677,7 @@ public final class L2ItemInstance extends L2Object public boolean checkOlympCondition() { - if (isHeroItem() || isOlyRestrictedItem() || isWear() || (!Config.ALT_OLY_AUGMENT_ALLOW && isAugmented())) + if (isHeroItem() || isOlyRestrictedItem() || _wear || (!Config.ALT_OLY_AUGMENT_ALLOW && isAugmented())) { return false; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java index 57ae717e64..f4707cd226 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MinionInstance.java @@ -57,7 +57,7 @@ public final class L2MinionInstance extends L2MonsterInstance @Override public boolean isRaid() { - return getLeader() instanceof L2RaidBossInstance; + return _master instanceof L2RaidBossInstance; } /** @@ -79,7 +79,7 @@ public final class L2MinionInstance extends L2MonsterInstance { super.onSpawn(); // Notify Leader that Minion has Spawned - getLeader().notifyMinionSpawned(this); + _master.notifyMinionSpawned(this); // check the region where this mob is, do not activate the AI if region is inactive. L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 6aad936cf1..3a6392b1b5 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -141,13 +141,13 @@ public class L2MonsterInstance extends L2Attackable { try { - for (L2MinionInstance minion : getSpawnedMinions()) + for (L2MinionInstance minion : _minionList.getSpawnedMinions()) { if (minion == null) { continue; } - getSpawnedMinions().remove(minion); + _minionList.getSpawnedMinions().remove(minion); minion.deleteMe(); } _minionList.clearRespawnList(); @@ -354,7 +354,7 @@ public class L2MonsterInstance extends L2Attackable @Override public void deleteMe() { - if (hasMinions()) + if (_minionList.hasMinions()) { if (_minionMaintainTask != null) { @@ -371,7 +371,7 @@ public class L2MonsterInstance extends L2Attackable */ public void deleteSpawnedMinions() { - for (L2MinionInstance minion : getSpawnedMinions()) + for (L2MinionInstance minion : _minionList.getSpawnedMinions()) { if (minion == null) { @@ -380,7 +380,7 @@ public class L2MonsterInstance extends L2Attackable minion.abortAttack(); minion.abortCast(); minion.deleteMe(); - getSpawnedMinions().remove(minion); + _minionList.getSpawnedMinions().remove(minion); } _minionList.clearRespawnList(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index f857481cca..edace422cc 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -1031,7 +1031,7 @@ public class L2NpcInstance extends L2Character String className = getClass().getName().substring(43); html1.append("
"); - html1.append("Instance Type: " + className + "Faction: " + getFactionId() + "Location ID: " + (getSpawn() != null ? getSpawn().getLocation() : 0) + ""); + html1.append("Instance Type: " + className + "Faction: " + getTemplate().factionId + "Location ID: " + (_spawn != null ? _spawn.getLocation() : 0) + ""); if (this instanceof L2ControllableMobInstance) { @@ -1039,13 +1039,13 @@ public class L2NpcInstance extends L2Character } else { - html1.append("Respawn Time: " + (getSpawn() != null ? (getSpawn().getRespawnDelay() / 1000) + " Seconds
" : "? Seconds
")); + html1.append("Respawn Time: " + (_spawn != null ? (_spawn.getRespawnDelay() / 1000) + " Seconds
" : "? Seconds
")); } html1.append(""); html1.append(""); html1.append(""); - html1.append(""); + html1.append(""); html1.append("
Object ID" + getObjectId() + "NPC ID" + getTemplate().npcId + "
Castle" + getCastle().getCastleId() + "Coords" + getX() + "," + getY() + "," + getZ() + "
Level" + getLevel() + "Aggro" + (this instanceof L2Attackable ? ((L2Attackable) this).getAggroRange() : 0) + "
Level" + getTemplate().level + "Aggro" + (this instanceof L2Attackable ? ((L2Attackable) this).getAggroRange() : 0) + "

"); html1.append("Combat"); @@ -1400,13 +1400,13 @@ public class L2NpcInstance extends L2Character { // if (canInteract(player)) // { - if (isBusy() && (getBusyMessage().length() > 0)) + if (_isBusy && (_busyMessage.length() > 0)) { player.sendPacket(ActionFailed.STATIC_PACKET); NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile("/data/html/npcbusy.htm"); - html.replace("%busymessage%", getBusyMessage()); + html.replace("%busymessage%", _busyMessage); html.replace("%npcname%", getName()); html.replace("%playername%", player.getName()); player.sendPacket(html); @@ -2464,7 +2464,7 @@ public class L2NpcInstance extends L2Character */ public void makeCPRecovery(L2PcInstance player) { - if ((getNpcId() != 31225) && (getNpcId() != 31226)) + if ((getTemplate().npcId != 31225) && (getTemplate().npcId != 31226)) { return; } @@ -3277,7 +3277,7 @@ public class L2NpcInstance extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -3385,7 +3385,7 @@ public class L2NpcInstance extends L2Character */ public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancelDecayTask(this); onDecay(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 60ef9f90bd..ee6a03aaef 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -552,7 +552,7 @@ public final class L2PcInstance extends L2Playable private boolean _inCrystallize; /** The _in craft mode. */ - private boolean _inCraftMode; + private boolean _isCrafting; /** The table containing all L2RecipeList of the L2PcInstance. */ private final Map _dwarvenRecipeBook = new HashMap<>(); @@ -1955,24 +1955,22 @@ public final class L2PcInstance extends L2Playable return getPrivateStoreType() > 0; } - // public boolean isInCraftMode() { return (getPrivateStoreType() == STORE_PRIVATE_MANUFACTURE); } - /** * Checks if is in craft mode. * @return true, if is in craft mode */ - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } /** * Checks if is in craft mode. - * @param b the b + * @param isCrafting */ - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** The _kicked. */ @@ -1995,7 +1993,6 @@ public final class L2PcInstance extends L2Playable _kicked = kicked; closeNetConnection(); - } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 1a2db58fef..a0e659f495 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -68,10 +68,10 @@ public class L2PetInstance extends L2Summon // private byte _pvpFlag; /** The _cur fed. */ - private int _curFed; + int _curFed; /** The _inventory. */ - private final PetInventory _inventory; + final PetInventory _inventory; /** The _control item id. */ private final int _controlItemId; @@ -160,10 +160,10 @@ public class L2PetInstance extends L2Summon } } - if (getCurrentFed() > FOOD_ITEM_CONSUME_COUNT) + if (_curFed > FOOD_ITEM_CONSUME_COUNT) { // eat - setCurrentFed(getCurrentFed() - FOOD_ITEM_CONSUME_COUNT); + setCurrentFed(_curFed - FOOD_ITEM_CONSUME_COUNT); } else { @@ -181,13 +181,13 @@ public class L2PetInstance extends L2Summon } L2ItemInstance food = null; - food = getInventory().getItemByItemId(foodId); + food = _inventory.getItemByItemId(foodId); - if ((food != null) && (getCurrentFed() < (0.55 * getMaxFed()))) + if ((food != null) && (_curFed < (0.55 * getStat().getMaxFeed()))) { if (destroyItem("Feed", food.getObjectId(), 1, null, false)) { - setCurrentFed(getCurrentFed() + 100); + setCurrentFed(_curFed + 100); if (getOwner() != null) { SystemMessage sm = new SystemMessage(SystemMessageId.PET_TOOK_S1_BECAUSE_HE_WAS_HUNGRY); @@ -291,7 +291,7 @@ public class L2PetInstance extends L2Summon @Override public double getLevelMod() { - return ((100.0 - 11) + getLevel()) / 100.0; + return ((100.0 - 11) + getStat().getLevel()) / 100.0; } /** @@ -380,7 +380,7 @@ public class L2PetInstance extends L2Summon */ public void setCurrentFed(int num) { - _curFed = num > getMaxFed() ? getMaxFed() : num; + _curFed = num > getStat().getMaxFeed() ? getStat().getMaxFeed() : num; } // public void setPvpFlag(byte pvpFlag) { _pvpFlag = pvpFlag; } @@ -402,7 +402,7 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { if ((item.getLocation() == L2ItemInstance.ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)) { @@ -641,7 +641,7 @@ public class L2PetInstance extends L2Summon } } - getInventory().addItem("Pickup", target, getOwner(), this); + _inventory.addItem("Pickup", target, getOwner(), this); // FIXME Just send the updates if possible (old way wasn't working though) PetItemList iu = new PetItemList(this); getOwner().sendPacket(iu); @@ -689,9 +689,9 @@ public class L2PetInstance extends L2Summon @Override public void doRevive() { - if (_curFed > (getMaxFed() / 10)) + if (_curFed > (getStat().getMaxFeed() / 10)) { - _curFed = getMaxFed() / 10; + _curFed = getStat().getMaxFeed() / 10; } getOwner().removeReviving(); @@ -728,8 +728,8 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, int count, Inventory target, L2PcInstance actor, L2Object reference) { - L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -794,7 +794,7 @@ public class L2PetInstance extends L2Summon { try { - Inventory petInventory = getInventory(); + Inventory petInventory = _inventory; L2ItemInstance[] items = petInventory.getItems(); for (L2ItemInstance item : items) { @@ -850,7 +850,7 @@ public class L2PetInstance extends L2Summon // delete from inventory try { - L2ItemInstance removedItem = owner.getInventory().destroyItem("PetDestroy", getControlItemId(), 1, getOwner(), this); + L2ItemInstance removedItem = owner.getInventory().destroyItem("PetDestroy", _controlItemId, 1, getOwner(), this); InventoryUpdate iu = new InventoryUpdate(); iu.addRemovedItem(removedItem); @@ -874,7 +874,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id=?"); - statement.setInt(1, getControlItemId()); + statement.setInt(1, _controlItemId); statement.execute(); statement.close(); } @@ -891,7 +891,7 @@ public class L2PetInstance extends L2Summon { try { - L2ItemInstance[] items = getInventory().getItems(); + L2ItemInstance[] items = _inventory.getItems(); for (L2ItemInstance item : items) { dropItemHere(item); @@ -919,7 +919,7 @@ public class L2PetInstance extends L2Summon */ public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -1032,14 +1032,14 @@ public class L2PetInstance extends L2Summon @Override public void store() { - if (getControlItemId() == 0) + if (_controlItemId == 0) { // this is a summon, not a pet, don't store anything return; } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,karma,pkkills,fed,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -1059,8 +1059,8 @@ public class L2PetInstance extends L2Summon statement.setInt(6, getStat().getSp()); statement.setInt(7, getKarma()); statement.setInt(8, getPkKills()); - statement.setInt(9, getCurrentFed()); - statement.setInt(10, getControlItemId()); + statement.setInt(9, _curFed); + statement.setInt(10, _controlItemId); statement.executeUpdate(); statement.close(); _respawned = true; @@ -1201,7 +1201,7 @@ public class L2PetInstance extends L2Summon @Override public long getExpForThisLevel() { - return getStat().getExpForLevel(getLevel()); + return getStat().getExpForLevel(getStat().getLevel()); } /* @@ -1211,7 +1211,7 @@ public class L2PetInstance extends L2Summon @Override public long getExpForNextLevel() { - return getStat().getExpForLevel(getLevel() + 1); + return getStat().getExpForLevel(getStat().getLevel() + 1); } /* @@ -1344,7 +1344,7 @@ public class L2PetInstance extends L2Summon { return 0; } - final int lvl = getLevel(); + final int lvl = getStat().getLevel(); return lvl > 70 ? 7 + ((lvl - 70) / 5) : lvl / 10; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java index dfda1fb105..7e6b637559 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java @@ -140,7 +140,7 @@ public class L2StaticObjectInstance extends L2Object { if (_type < 0) { - LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + getStaticObjectId()); + LOGGER.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + _staticObjectId); } // Check if the L2PcInstance already target the L2NpcInstance if (this != player.getTarget()) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java index 551b788ea7..95987d0e80 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java @@ -82,9 +82,9 @@ public class AttackableKnownList extends NpcKnownList @Override public int getDistanceToForgetObject(L2Object object) { - if (getActiveChar().getAggroListRP() != null) + if (getActiveChar().getAggroList() != null) { - if (getActiveChar().getAggroListRP().get(object) != null) + if (getActiveChar().getAggroList().get(object) != null) { return 3000; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java index 80122b643d..be6395788f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java @@ -51,7 +51,7 @@ public class ObjectKnownList public boolean addKnownObject(L2Object object, L2Character dropper) { - if ((object == null) || (object == getActiveObject())) + if ((object == null) || (object == _activeObject)) { return false; } @@ -67,7 +67,7 @@ public class ObjectKnownList } // Check if object is not inside distance to watch object - if (!Util.checkIfInRange(getDistanceToWatchObject(object), getActiveObject(), object, true)) + if (!Util.checkIfInRange(getDistanceToWatchObject(object), _activeObject, object, true)) { return false; } @@ -82,7 +82,7 @@ public class ObjectKnownList return false; } - return (getActiveObject() == object) || getKnownObjects().containsKey(object.getObjectId()); + return (_activeObject == object) || getKnownObjects().containsKey(object.getObjectId()); } /** Remove all L2Object from _knownObjects */ @@ -114,7 +114,7 @@ public class ObjectKnownList public final synchronized void updateKnownObjects() { // Only bother updating knownobjects for L2Character; don't for L2Object - if (getActiveObject() instanceof L2Character) + if (_activeObject instanceof L2Character) { findCloseObjects(); forgetObjects(); @@ -125,7 +125,7 @@ public class ObjectKnownList // Method - Private private final void findCloseObjects() { - final boolean isActiveObjectPlayable = getActiveObject() instanceof L2Playable; + final boolean isActiveObjectPlayable = _activeObject instanceof L2Playable; if (isActiveObjectPlayable) { @@ -152,7 +152,7 @@ public class ObjectKnownList // Only if object is a L2Character and active object is a L2PlayableInstance if (object instanceof L2Character) { - object.getKnownList().addKnownObject(getActiveObject()); + object.getKnownList().addKnownObject(_activeObject); } } } @@ -201,17 +201,17 @@ public class ObjectKnownList // Remove all invisible object // Remove all too far object - if (!object.isVisible() || !Util.checkIfInRange(getDistanceToForgetObject(object), getActiveObject(), object, true)) + if (!object.isVisible() || !Util.checkIfInRange(getDistanceToForgetObject(object), _activeObject, object, true)) { - if ((object instanceof L2BoatInstance) && (getActiveObject() instanceof L2PcInstance)) + if ((object instanceof L2BoatInstance) && (_activeObject instanceof L2PcInstance)) { if (((L2BoatInstance) object).getVehicleDeparture() == null) { // } - else if (((L2PcInstance) getActiveObject()).isInBoat()) + else if (((L2PcInstance) _activeObject).isInBoat()) { - if (((L2PcInstance) getActiveObject()).getBoat() == object) + if (((L2PcInstance) _activeObject).getBoat() == object) { // } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index d051bba9ac..846eac9f71 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -53,7 +53,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java index 19cbf66483..f8d2402af1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java @@ -98,18 +98,18 @@ public class ObjectPosition } catch (Exception e) { - LOGGER.warning("Object Id at bad coords: (x: " + getX() + ", y: " + getY() + ", z: " + getZ() + ")."); + LOGGER.warning("Object Id at bad coords: (x: " + getWorldPosition().getX() + ", y: " + getWorldPosition().getY() + ", z: " + getWorldPosition().getZ() + ")."); - if (getActiveObject() instanceof L2PcInstance) + if (_activeObject instanceof L2PcInstance) { // ((L2PcInstance)obj).deleteMe(); - ((L2PcInstance) getActiveObject()).teleToLocation(0, 0, 0, false); - ((L2PcInstance) getActiveObject()).sendMessage("Error with your coords, Please ask a GM for help!"); + ((L2PcInstance) _activeObject).teleToLocation(0, 0, 0, false); + ((L2PcInstance) _activeObject).sendMessage("Error with your coords, Please ask a GM for help!"); } - else if (getActiveObject() instanceof L2Character) + else if (_activeObject instanceof L2Character) { - getActiveObject().decayMe(); + _activeObject.decayMe(); } } } @@ -160,7 +160,7 @@ public class ObjectPosition } setWorldPosition(x, y, z); - getActiveObject().setIsVisible(false); + _activeObject.setIsVisible(false); } /** @@ -168,7 +168,7 @@ public class ObjectPosition */ public void updateWorldRegion() { - if (!getActiveObject().isVisible()) + if (!_activeObject.isVisible()) { return; } @@ -176,12 +176,12 @@ public class ObjectPosition L2WorldRegion newRegion = L2World.getInstance().getRegion(getWorldPosition()); if (newRegion != getWorldRegion()) { - getWorldRegion().removeVisibleObject(getActiveObject()); + getWorldRegion().removeVisibleObject(_activeObject); setWorldRegion(newRegion); // Add the L2Oject spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(getActiveObject()); + getWorldRegion().addVisibleObject(_activeObject); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index ce57f76414..54f537ac7b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -48,16 +48,16 @@ public class CharStatus // ========================================================= // Data Field /** The _active char. */ - private final L2Character _activeChar; + final L2Character _activeChar; /** The _current cp. */ - private double _currentCp = 0; // Current CP of the L2Character + double _currentCp = 0; // Current CP of the L2Character /** The _current hp. */ - private double _currentHp = 0; // Current HP of the L2Character + double _currentHp = 0; // Current HP of the L2Character /** The _current mp. */ - private double _currentMp = 0; // Current MP of the L2Character + double _currentMp = 0; // Current MP of the L2Character /** Array containing all clients that need to be notified about hp/mp updates of the L2Character. */ private Set _StatusListener; @@ -104,7 +104,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -121,9 +121,9 @@ public class CharStatus */ public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -154,94 +154,94 @@ public class CharStatus */ public void reduceHp(double value, L2Character attacker, boolean awake) { - if (getActiveChar().isInvul()) + if (_activeChar.isInvul()) { return; } - if (getActiveChar() instanceof L2PcInstance) + if (_activeChar instanceof L2PcInstance) { - if (((L2PcInstance) getActiveChar()).isInDuel()) + if (((L2PcInstance) _activeChar).isInDuel()) { // the duel is finishing - players do not recive damage - if (((L2PcInstance) getActiveChar()).getDuelState() == Duel.DUELSTATE_DEAD) + if (((L2PcInstance) _activeChar).getDuelState() == Duel.DUELSTATE_DEAD) { return; } - else if (((L2PcInstance) getActiveChar()).getDuelState() == Duel.DUELSTATE_WINNER) + else if (((L2PcInstance) _activeChar).getDuelState() == Duel.DUELSTATE_WINNER) { return; } // cancel duel if player got hit by another player, that is not part of the duel or a monster - if (!(attacker instanceof L2SummonInstance) && (!(attacker instanceof L2PcInstance) || (((L2PcInstance) attacker).getDuelId() != ((L2PcInstance) getActiveChar()).getDuelId()))) + if (!(attacker instanceof L2SummonInstance) && (!(attacker instanceof L2PcInstance) || (((L2PcInstance) attacker).getDuelId() != ((L2PcInstance) _activeChar).getDuelId()))) { - ((L2PcInstance) getActiveChar()).setDuelState(Duel.DUELSTATE_INTERRUPTED); + ((L2PcInstance) _activeChar).setDuelState(Duel.DUELSTATE_INTERRUPTED); } } - if (getActiveChar().isDead() && !getActiveChar().isFakeDeath()) + if (_activeChar.isDead() && !_activeChar.isFakeDeath()) { return; // Disabled == null check so skills like Body to Mind work again untill another solution is found } } else { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return; // Disabled == null check so skills like Body to Mind work again untill another solution is found } - if ((attacker instanceof L2PcInstance) && ((L2PcInstance) attacker).isInDuel() && (!(getActiveChar() instanceof L2SummonInstance) || (((L2SummonInstance) getActiveChar()).getOwner().getDuelId() != ((L2PcInstance) attacker).getDuelId()))) // Duelling player attacks mob + if ((attacker instanceof L2PcInstance) && ((L2PcInstance) attacker).isInDuel() && (!(_activeChar instanceof L2SummonInstance) || (((L2SummonInstance) _activeChar).getOwner().getDuelId() != ((L2PcInstance) attacker).getDuelId()))) // Duelling player attacks mob { ((L2PcInstance) attacker).setDuelState(Duel.DUELSTATE_INTERRUPTED); } } - if (awake && getActiveChar().isSleeping()) + if (awake && _activeChar.isSleeping()) { - getActiveChar().stopSleeping(null); + _activeChar.stopSleeping(null); } - if (awake && getActiveChar().isImmobileUntilAttacked()) + if (awake && _activeChar.isImmobileUntilAttacked()) { - getActiveChar().stopImmobileUntilAttacked(null); + _activeChar.stopImmobileUntilAttacked(null); } - if (getActiveChar().isStunned() && (Rnd.get(10) == 0)) + if (_activeChar.isStunned() && (Rnd.get(10) == 0)) { - getActiveChar().stopStunning(null); + _activeChar.stopStunning(null); } // Add attackers to npc's attacker list - if (getActiveChar() instanceof L2NpcInstance) + if (_activeChar instanceof L2NpcInstance) { - getActiveChar().addAttackerToAttackByList(attacker); + _activeChar.addAttackerToAttackByList(attacker); } if (value > 0) // Reduce Hp if any { // If we're dealing with an L2Attackable Instance and the attacker hit it with an over-hit enabled skill, set the over-hit values. // Anything else, clear the over-hit flag - if (getActiveChar() instanceof L2Attackable) + if (_activeChar instanceof L2Attackable) { - if (((L2Attackable) getActiveChar()).isOverhit()) + if (((L2Attackable) _activeChar).isOverhit()) { - ((L2Attackable) getActiveChar()).setOverhitValues(attacker, value); + ((L2Attackable) _activeChar).setOverhitValues(attacker, value); } else { - ((L2Attackable) getActiveChar()).overhitEnabled(false); + ((L2Attackable) _activeChar).overhitEnabled(false); } } - value = getCurrentHp() - value; // Get diff of Hp vs value + value = _currentHp - value; // Get diff of Hp vs value if (value <= 0) { // is the dieing one a duelist? if so change his duel state to dead - if ((getActiveChar() instanceof L2PcInstance) && ((L2PcInstance) getActiveChar()).isInDuel()) + if ((_activeChar instanceof L2PcInstance) && ((L2PcInstance) _activeChar).isInDuel()) { - getActiveChar().disableAllSkills(); + _activeChar.disableAllSkills(); stopHpMpRegeneration(); attacker.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); attacker.sendPacket(ActionFailed.STATIC_PACKET); @@ -259,19 +259,19 @@ public class CharStatus setCurrentHp(value); // Set Hp } else // If we're dealing with an L2Attackable Instance and the attacker's hit didn't kill the mob, clear the over-hit flag - if (getActiveChar() instanceof L2Attackable) + if (_activeChar instanceof L2Attackable) { - ((L2Attackable) getActiveChar()).overhitEnabled(false); + ((L2Attackable) _activeChar).overhitEnabled(false); } - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { - getActiveChar().abortAttack(); - getActiveChar().abortCast(); + _activeChar.abortAttack(); + _activeChar.abortCast(); - if (getActiveChar() instanceof L2PcInstance) + if (_activeChar instanceof L2PcInstance) { - if (((L2PcInstance) getActiveChar()).isInOlympiadMode()) + if (((L2PcInstance) _activeChar).isInOlympiadMode()) { stopHpMpRegeneration(); return; @@ -286,15 +286,15 @@ public class CharStatus } // Start the doDie process - getActiveChar().doDie(attacker); + _activeChar.doDie(attacker); // now reset currentHp to zero setCurrentHp(0); } else // If we're dealing with an L2Attackable Instance and the attacker's hit didn't kill the mob, clear the over-hit flag - if (getActiveChar() instanceof L2Attackable) + if (_activeChar instanceof L2Attackable) { - ((L2Attackable) getActiveChar()).overhitEnabled(false); + ((L2Attackable) _activeChar).overhitEnabled(false); } } @@ -304,7 +304,7 @@ public class CharStatus */ public final void reduceMp(double value) { - value = getCurrentMp() - value; + value = _currentMp - value; if (value < 0) { @@ -347,7 +347,7 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { if (Config.DEBUG) { @@ -355,7 +355,7 @@ public class CharStatus } // Get the Regeneration periode - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(new RegenTask(), period, period); @@ -451,7 +451,7 @@ public class CharStatus synchronized (this) { // Get the Max CP of the L2Character - final int maxCp = getActiveChar().getStat().getMaxCp(); + final int maxCp = _activeChar.getStat().getMaxCp(); if (newCp < 0) { @@ -484,7 +484,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -545,14 +545,14 @@ public class CharStatus synchronized (this) { // Get the Max HP of the L2Character - final double maxHp = getActiveChar().getStat().getMaxHp(); + final double maxHp = _activeChar.getStat().getMaxHp(); if ((newHp >= maxHp) && !direct) { // Set the RegenActive flag to false _currentHp = maxHp; _flagsRegenActive &= ~REGEN_FLAG_HP; - getActiveChar().setIsKilledAlready(false); + _activeChar.setIsKilledAlready(false); // Stop the HP/MP/CP Regeneration task if (_flagsRegenActive == 0) @@ -566,9 +566,9 @@ public class CharStatus _currentHp = newHp; _flagsRegenActive |= REGEN_FLAG_HP; - if (!getActiveChar().isDead()) + if (!_activeChar.isDead()) { - getActiveChar().setIsKilledAlready(false); + _activeChar.setIsKilledAlready(false); } // Start the HP/MP/CP Regeneration task with Medium priority @@ -580,7 +580,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -634,7 +634,7 @@ public class CharStatus synchronized (this) { // Get the Max MP of the L2Character - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int maxMp = _activeChar.getStat().getMaxMp(); if ((newMp >= maxMp) && !direct) { @@ -662,7 +662,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -703,43 +703,43 @@ public class CharStatus { try { - final CharStat charstat = getActiveChar().getStat(); + final CharStat charstat = _activeChar.getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxCp()) + if (_currentCp < charstat.getMaxCp()) { - setCurrentCp(getCurrentCp() + Formulas.calcCpRegen(getActiveChar()), false); + setCurrentCp(_currentCp + Formulas.calcCpRegen(_activeChar), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentHp() < charstat.getMaxHp()) + if (_currentHp < charstat.getMaxHp()) { - setCurrentHp(getCurrentHp() + Formulas.calcHpRegen(getActiveChar()), false); + setCurrentHp(_currentHp + Formulas.calcHpRegen(_activeChar), false); } // Modify the current MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentMp() < charstat.getMaxMp()) + if (_currentMp < charstat.getMaxMp()) { - setCurrentMp(getCurrentMp() + Formulas.calcMpRegen(getActiveChar()), false); + setCurrentMp(_currentMp + Formulas.calcMpRegen(_activeChar), false); } - if (!getActiveChar().isInActiveRegion()) + if (!_activeChar.isInActiveRegion()) { // no broadcast necessary for characters that are in inactive regions. // stop regeneration for characters who are filled up and in an inactive region. - if ((getCurrentCp() == charstat.getMaxCp()) && (getCurrentHp() == charstat.getMaxHp()) && (getCurrentMp() == charstat.getMaxMp())) + if ((_currentCp == charstat.getMaxCp()) && (_currentHp == charstat.getMaxHp()) && (_currentMp == charstat.getMaxMp())) { stopHpMpRegeneration(); } } else { - getActiveChar().broadcastStatusUpdate(); // send the StatusUpdate packet + _activeChar.broadcastStatusUpdate(); // send the StatusUpdate packet } } catch (Throwable e) { - LOGGER.warning("RegenTask failed for " + getActiveChar().getName() + " " + e); + LOGGER.warning("RegenTask failed for " + _activeChar.getName() + " " + e); } } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/base/SubClass.java index cdfb7b02bb..063b0fba92 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -125,7 +125,7 @@ public final class SubClass public void incLevel() { - if (getLevel() == (Config.MAX_SUBCLASS_LEVEL - 1)) + if (_level == (Config.MAX_SUBCLASS_LEVEL - 1)) { return; } @@ -135,7 +135,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Auction.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Auction.java index 177b960f40..ca748f4cd7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Auction.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Auction.java @@ -272,7 +272,7 @@ public class Auction ResultSet rs; statement = con.prepareStatement("Select * from auction where id = ?"); - statement.setInt(1, getId()); + statement.setInt(1, _id); rs = statement.executeQuery(); while (rs.next()) @@ -314,7 +314,7 @@ public class Auction ResultSet rs; statement = con.prepareStatement("SELECT bidderId, bidderName, maxBid, clan_name, time_bid FROM auction_bid WHERE auctionId = ? ORDER BY maxBid DESC"); - statement.setInt(1, getId()); + statement.setInt(1, _id); rs = statement.executeQuery(); while (rs.next()) @@ -397,12 +397,12 @@ public class Auction { int requiredAdena = bid; - if (getHighestBidderName().equals(bidder.getClan().getLeaderName())) + if (_highestBidderName.equals(bidder.getClan().getLeaderName())) { - requiredAdena = bid - getHighestBidderMaxBid(); + requiredAdena = bid - _highestBidderMaxBid; } - if (((getHighestBidderId() > 0) && (bid > getHighestBidderMaxBid())) || ((getHighestBidderId() == 0) && (bid >= getStartingBid()))) + if (((_highestBidderId > 0) && (bid > _highestBidderMaxBid)) || ((_highestBidderId == 0) && (bid >= _startingBid))) { if (takeItem(bidder, requiredAdena)) { @@ -411,7 +411,7 @@ public class Auction return; } } - if ((bid < getStartingBid()) || (bid <= getHighestBidderMaxBid())) + if ((bid < _startingBid) || (bid <= _highestBidderMaxBid)) { bidder.sendMessage("Bid Price must be higher"); } @@ -465,14 +465,14 @@ public class Auction { PreparedStatement statement; - if (getBidders().get(bidder.getClanId()) != null) + if (_bidders.get(bidder.getClanId()) != null) { statement = con.prepareStatement("UPDATE auction_bid SET bidderId=?, bidderName=?, maxBid=?, time_bid=? WHERE auctionId=? AND bidderId=?"); statement.setInt(1, bidder.getClanId()); statement.setString(2, bidder.getClan().getLeaderName()); statement.setInt(3, bid); statement.setLong(4, System.currentTimeMillis()); - statement.setInt(5, getId()); + statement.setInt(5, _id); statement.setInt(6, bidder.getClanId()); statement.execute(); statement.close(); @@ -481,7 +481,7 @@ public class Auction { statement = con.prepareStatement("INSERT INTO auction_bid (id, auctionId, bidderId, bidderName, maxBid, clan_name, time_bid) VALUES (?, ?, ?, ?, ?, ?, ?)"); statement.setInt(1, IdFactory.getInstance().getNextId()); - statement.setInt(2, getId()); + statement.setInt(2, _id); statement.setInt(3, bidder.getClanId()); statement.setString(4, bidder.getName()); statement.setInt(5, bid); @@ -528,7 +528,7 @@ public class Auction PreparedStatement statement; statement = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=?"); - statement.setInt(1, getId()); + statement.setInt(1, _id); statement.execute(); statement.close(); @@ -628,7 +628,7 @@ public class Auction PreparedStatement statement; statement = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=? AND bidderId=?"); - statement.setInt(1, getId()); + statement.setInt(1, _id); statement.setInt(2, bidder); statement.execute(); @@ -664,7 +664,7 @@ public class Auction { PreparedStatement statement; statement = con.prepareStatement("INSERT INTO auction (id, sellerId, sellerName, sellerClanName, itemType, itemId, itemObjectId, itemName, itemQuantity, startingBid, currentBid, endDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)"); - statement.setInt(1, getId()); + statement.setInt(1, _id); statement.setInt(2, _sellerId); statement.setString(3, _sellerName); statement.setString(4, _sellerClanName); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index 579971c3e9..69fcb6f3e2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -49,7 +49,7 @@ public class ClanHall protected static final Logger LOGGER = Logger.getLogger(ClanHall.class.getName()); /** The _clan hall id. */ - private final int _clanHallId; + final int _clanHallId; /** The _doors. */ private final List _doors = new ArrayList<>(); @@ -58,7 +58,7 @@ public class ClanHall private final List _doorDefault = new ArrayList<>(); /** The _name. */ - private final String _name; + final String _name; /** The _owner id. */ private int _ownerId; @@ -126,7 +126,7 @@ public class ClanHall public class ClanHallFunction { /** The _type. */ - private final int _type; + final int _type; /** The _lvl. */ private int _lvl; @@ -138,10 +138,10 @@ public class ClanHall protected int _tempFee; /** The _rate. */ - private final long _rate; + final long _rate; /** The _end date. */ - private long _endDate; + long _endDate; /** The _in debt. */ protected boolean _inDebt; @@ -291,9 +291,9 @@ public class ClanHall int fee = _fee; boolean newfc = true; - if ((getEndTime() == 0) || (getEndTime() == -1)) + if ((_endDate == 0) || (_endDate == -1)) { - if (getEndTime() == -1) + if (_endDate == -1) { newfc = false; fee = _tempFee; @@ -304,20 +304,20 @@ public class ClanHall newfc = false; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(newfc); getOwnerClan().getWarehouse().destroyItemByItemId("CH_function_fee", 57, fee, null, null); if (Config.DEBUG) { - LOGGER.warning("deducted " + fee + " adena from " + getName() + " owner's cwh for function id : " + getType()); + LOGGER.warning("deducted " + fee + " adena from " + _name + " owner's cwh for function id : " + _type); } - ThreadPool.schedule(new FunctionTask(), getRate()); + ThreadPool.schedule(new FunctionTask(), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -339,21 +339,21 @@ public class ClanHall if (newFunction) { statement = con.prepareStatement("INSERT INTO clanhall_functions (hall_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)"); - statement.setInt(1, getId()); - statement.setInt(2, getType()); - statement.setInt(3, getLvl()); - statement.setInt(4, getLease()); - statement.setLong(5, getRate()); - statement.setLong(6, getEndTime()); + statement.setInt(1, _clanHallId); + statement.setInt(2, _type); + statement.setInt(3, _lvl); + statement.setInt(4, _fee); + statement.setLong(5, _rate); + statement.setLong(6, _endDate); } else { statement = con.prepareStatement("UPDATE clanhall_functions SET lvl=?, lease=?, endTime=? WHERE hall_id=? AND type=?"); - statement.setInt(1, getLvl()); - statement.setInt(2, getLease()); - statement.setLong(3, getEndTime()); - statement.setInt(4, getId()); - statement.setInt(5, getType()); + statement.setInt(1, _lvl); + statement.setInt(2, _fee); + statement.setLong(3, _endDate); + statement.setInt(4, _clanHallId); + statement.setInt(5, _type); } statement.execute(); statement.close(); @@ -644,7 +644,7 @@ public class ClanHall */ public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar != null) && (activeChar.getClanId() == getOwnerId())) + if ((activeChar != null) && (activeChar.getClanId() == _ownerId)) { openCloseDoor(doorId, open); } @@ -687,7 +687,7 @@ public class ClanHall */ public void openCloseDoors(L2PcInstance activeChar, boolean open) { - if ((activeChar != null) && (activeChar.getClanId() == getOwnerId())) + if ((activeChar != null) && (activeChar.getClanId() == _ownerId)) { openCloseDoors(open); } @@ -720,7 +720,7 @@ public class ClanHall */ public void banishForeigners() { - _zone.banishForeigners(getOwnerId()); + _zone.banishForeigners(_ownerId); } /** @@ -733,7 +733,7 @@ public class ClanHall PreparedStatement statement; ResultSet rs; statement = con.prepareStatement("Select * from clanhall_functions where hall_id = ?"); - statement.setInt(1, getId()); + statement.setInt(1, _clanHallId); rs = statement.executeQuery(); while (rs.next()) @@ -761,7 +761,7 @@ public class ClanHall { PreparedStatement statement; statement = con.prepareStatement("DELETE FROM clanhall_functions WHERE hall_id=? AND type=?"); - statement.setInt(1, getId()); + statement.setInt(1, _clanHallId); statement.setInt(2, functionType); statement.execute(); statement.close(); @@ -785,7 +785,7 @@ public class ClanHall { if (Config.DEBUG) { - LOGGER.warning("Called ClanHall.updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) Owner : " + getOwnerId()); + LOGGER.warning("Called ClanHall.updateFunctions(int type, int lvl, int lease, long rate, boolean addNew) Owner : " + _ownerId); } if (addNew) @@ -916,7 +916,7 @@ public class ClanHall if (Config.DEBUG) { - LOGGER.warning("deducted " + getLease() + " adena from " + getName() + " owner's cwh for ClanHall _paidUntil" + _paidUntil); + LOGGER.warning("deducted " + getLease() + " adena from " + _name + " owner's cwh for ClanHall _paidUntil" + _paidUntil); } ThreadPool.schedule(new FeeTask(), _paidUntil - System.currentTimeMillis()); @@ -972,7 +972,7 @@ public class ClanHall try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Select * from castle_door where castleId = ?"); - statement.setInt(1, getId()); + statement.setInt(1, _clanHallId); ResultSet rs = statement.executeQuery(); while (rs.next()) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Duel.java index a75336223d..ef8c20f040 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -847,7 +847,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -871,7 +871,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java index e9713d519f..c3d578dc54 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java @@ -155,7 +155,7 @@ public class CTF implements EventTask */ public static boolean set_eventName(String _eventName) { - if (!is_inProgress()) + if (!_inProgress) { CTF._eventName = _eventName; return true; @@ -179,7 +179,7 @@ public class CTF implements EventTask */ public static boolean set_eventDesc(String _eventDesc) { - if (!is_inProgress()) + if (!_inProgress) { CTF._eventDesc = _eventDesc; return true; @@ -203,7 +203,7 @@ public class CTF implements EventTask */ public static boolean set_joiningLocationName(String _joiningLocationName) { - if (!is_inProgress()) + if (!_inProgress) { CTF._joiningLocationName = _joiningLocationName; return true; @@ -227,7 +227,7 @@ public class CTF implements EventTask */ public static boolean set_npcId(int _npcId) { - if (!is_inProgress()) + if (!_inProgress) { CTF._npcId = _npcId; return true; @@ -262,7 +262,7 @@ public class CTF implements EventTask */ public static boolean set_rewardId(int _rewardId) { - if (!is_inProgress()) + if (!_inProgress) { CTF._rewardId = _rewardId; return true; @@ -286,7 +286,7 @@ public class CTF implements EventTask */ public static boolean set_rewardAmount(int _rewardAmount) { - if (!is_inProgress()) + if (!_inProgress) { CTF._rewardAmount = _rewardAmount; return true; @@ -310,7 +310,7 @@ public class CTF implements EventTask */ public static boolean set_minlvl(int _minlvl) { - if (!is_inProgress()) + if (!_inProgress) { CTF._minlvl = _minlvl; return true; @@ -334,7 +334,7 @@ public class CTF implements EventTask */ public static boolean set_maxlvl(int _maxlvl) { - if (!is_inProgress()) + if (!_inProgress) { CTF._maxlvl = _maxlvl; return true; @@ -358,7 +358,7 @@ public class CTF implements EventTask */ public static boolean set_joinTime(int _joinTime) { - if (!is_inProgress()) + if (!_inProgress) { CTF._joinTime = _joinTime; return true; @@ -382,7 +382,7 @@ public class CTF implements EventTask */ public static boolean set_eventTime(int _eventTime) { - if (!is_inProgress()) + if (!_inProgress) { CTF._eventTime = _eventTime; return true; @@ -406,7 +406,7 @@ public class CTF implements EventTask */ public static boolean set_minPlayers(int _minPlayers) { - if (!is_inProgress()) + if (!_inProgress) { CTF._minPlayers = _minPlayers; return true; @@ -430,7 +430,7 @@ public class CTF implements EventTask */ public static boolean set_maxPlayers(int _maxPlayers) { - if (!is_inProgress()) + if (!_inProgress) { CTF._maxPlayers = _maxPlayers; return true; @@ -454,7 +454,7 @@ public class CTF implements EventTask */ public static boolean set_intervalBetweenMatches(long _intervalBetweenMatches) { - if (!is_inProgress()) + if (!_inProgress) { CTF._intervalBetweenMatches = _intervalBetweenMatches; return true; @@ -478,7 +478,7 @@ public class CTF implements EventTask */ public boolean setStartEventTime(String startEventTime) { - if (!is_inProgress()) + if (!_inProgress) { this.startEventTime = startEventTime; return true; @@ -2518,7 +2518,7 @@ public class CTF implements EventTask */ public static void addTeam(String teamName) { - if (is_inProgress()) + if (_inProgress) { if (Config.DEBUG) { @@ -2558,7 +2558,7 @@ public class CTF implements EventTask */ public static void removeTeam(String teamName) { - if (is_inProgress() || _teams.isEmpty()) + if (_inProgress || _teams.isEmpty()) { if (Config.DEBUG) { @@ -2657,7 +2657,7 @@ public class CTF implements EventTask */ public static void setTeamColor(String teamName, int color) { - if (is_inProgress()) + if (_inProgress) { return; } @@ -2863,7 +2863,7 @@ public class CTF implements EventTask */ public static boolean set_eventOffset(int _eventOffset) { - if (!is_inProgress()) + if (!_inProgress) { CTF._eventOffset = _eventOffset; return true; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java index 0bf8d056bf..892a868e19 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java @@ -122,7 +122,7 @@ public class DM implements EventTask */ public static boolean set_eventName(String _eventName) { - if (!is_inProgress()) + if (!_inProgress) { DM._eventName = _eventName; return true; @@ -146,7 +146,7 @@ public class DM implements EventTask */ public static boolean set_eventDesc(String _eventDesc) { - if (!is_inProgress()) + if (!_inProgress) { DM._eventDesc = _eventDesc; return true; @@ -170,7 +170,7 @@ public class DM implements EventTask */ public static boolean set_joiningLocationName(String _joiningLocationName) { - if (!is_inProgress()) + if (!_inProgress) { DM._joiningLocationName = _joiningLocationName; return true; @@ -194,7 +194,7 @@ public class DM implements EventTask */ public static boolean set_npcId(int _npcId) { - if (!is_inProgress()) + if (!_inProgress) { DM._npcId = _npcId; return true; @@ -229,7 +229,7 @@ public class DM implements EventTask */ public static boolean set_rewardId(int _rewardId) { - if (!is_inProgress()) + if (!_inProgress) { DM._rewardId = _rewardId; return true; @@ -253,7 +253,7 @@ public class DM implements EventTask */ public static boolean set_rewardAmount(int _rewardAmount) { - if (!is_inProgress()) + if (!_inProgress) { DM._rewardAmount = _rewardAmount; return true; @@ -277,7 +277,7 @@ public class DM implements EventTask */ public static boolean set_minlvl(int _minlvl) { - if (!is_inProgress()) + if (!_inProgress) { DM._minlvl = _minlvl; return true; @@ -301,7 +301,7 @@ public class DM implements EventTask */ public static boolean set_maxlvl(int _maxlvl) { - if (!is_inProgress()) + if (!_inProgress) { DM._maxlvl = _maxlvl; return true; @@ -325,7 +325,7 @@ public class DM implements EventTask */ public static boolean set_joinTime(int _joinTime) { - if (!is_inProgress()) + if (!_inProgress) { DM._joinTime = _joinTime; return true; @@ -349,7 +349,7 @@ public class DM implements EventTask */ public static boolean set_eventTime(int _eventTime) { - if (!is_inProgress()) + if (!_inProgress) { DM._eventTime = _eventTime; return true; @@ -373,7 +373,7 @@ public class DM implements EventTask */ public static boolean set_minPlayers(int _minPlayers) { - if (!is_inProgress()) + if (!_inProgress) { DM._minPlayers = _minPlayers; return true; @@ -397,7 +397,7 @@ public class DM implements EventTask */ public static boolean set_maxPlayers(int _maxPlayers) { - if (!is_inProgress()) + if (!_inProgress) { DM._maxPlayers = _maxPlayers; return true; @@ -421,7 +421,7 @@ public class DM implements EventTask */ public static boolean set_intervalBetweenMatchs(long _intervalBetweenMatchs) { - if (!is_inProgress()) + if (!_inProgress) { DM._intervalBetweenMatchs = _intervalBetweenMatchs; return true; @@ -445,7 +445,7 @@ public class DM implements EventTask */ public boolean setStartEventTime(String startEventTime) { - if (!is_inProgress()) + if (!_inProgress) { this.startEventTime = startEventTime; return true; @@ -2022,7 +2022,7 @@ public class DM implements EventTask */ public static boolean set_playerColors(int _playerColors) { - if (!is_inProgress()) + if (!_inProgress) { DM._playerColors = _playerColors; return true; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/EventPoint.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/EventPoint.java index b0ab419bdb..a2b629063a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/EventPoint.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/EventPoint.java @@ -49,7 +49,7 @@ public class EventPoint try (Connection con = DatabaseFactory.getInstance().getConnection()) { final PreparedStatement st = con.prepareStatement("Select * From char_points where charId = ?"); - st.setInt(1, getActiveChar().getObjectId()); + st.setInt(1, _activeChar.getObjectId()); final ResultSet rst = st.executeQuery(); while (rst.next()) @@ -71,7 +71,7 @@ public class EventPoint { final PreparedStatement st = con.prepareStatement("Update char_points Set points = ? Where charId = ?"); st.setInt(1, _points); - st.setInt(2, getActiveChar().getObjectId()); + st.setInt(2, _activeChar.getObjectId()); st.execute(); st.close(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java index bcfc273460..59eff9e20e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/Lottery.java @@ -99,9 +99,9 @@ public class Lottery { PreparedStatement statement; statement = con.prepareStatement(UPDATE_PRICE); - statement.setInt(1, getPrize()); - statement.setInt(2, getPrize()); - statement.setInt(3, getId()); + statement.setInt(1, _prize); + statement.setInt(2, _prize); + statement.setInt(3, _number); statement.execute(); statement.close(); } @@ -187,7 +187,7 @@ public class Lottery if (Config.DEBUG) { - LOGGER.info("Lottery: Starting ticket sell for lottery #" + getId() + "."); + LOGGER.info("Lottery: Starting ticket sell for lottery #" + _number + "."); } _isSellingTickets = true; @@ -219,10 +219,10 @@ public class Lottery { statement = con.prepareStatement(INSERT_LOTTERY); statement.setInt(1, 1); - statement.setInt(2, getId()); - statement.setLong(3, getEndDate()); - statement.setInt(4, getPrize()); - statement.setInt(5, getPrize()); + statement.setInt(2, _number); + statement.setLong(3, _enddate); + statement.setInt(4, _prize); + statement.setInt(5, _prize); statement.execute(); statement.close(); } @@ -245,7 +245,7 @@ public class Lottery { if (Config.DEBUG) { - LOGGER.info("Lottery: Stopping ticket sell for lottery #" + getId() + "."); + LOGGER.info("Lottery: Stopping ticket sell for lottery #" + _number + "."); } _isSellingTickets = false; @@ -266,7 +266,7 @@ public class Lottery { if (Config.DEBUG) { - LOGGER.info("Lottery: Ending lottery #" + getId() + "."); + LOGGER.info("Lottery: Ending lottery #" + _number + "."); } final int[] luckynums = new int[5]; @@ -327,7 +327,7 @@ public class Lottery try (Connection con = DatabaseFactory.getInstance().getConnection()) { statement = con.prepareStatement(SELECT_LOTTERY_ITEM); - statement.setInt(1, getId()); + statement.setInt(1, _number); ResultSet rset = statement.executeQuery(); while (rset.next()) @@ -394,17 +394,17 @@ public class Lottery if (count1 > 0) { - prize1 = (int) (((getPrize() - prize4) * Config.ALT_LOTTERY_5_NUMBER_RATE) / count1); + prize1 = (int) (((_prize - prize4) * Config.ALT_LOTTERY_5_NUMBER_RATE) / count1); } if (count2 > 0) { - prize2 = (int) (((getPrize() - prize4) * Config.ALT_LOTTERY_4_NUMBER_RATE) / count2); + prize2 = (int) (((_prize - prize4) * Config.ALT_LOTTERY_4_NUMBER_RATE) / count2); } if (count3 > 0) { - prize3 = (int) (((getPrize() - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3); + prize3 = (int) (((_prize - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3); } if (Config.DEBUG) @@ -415,7 +415,7 @@ public class Lottery LOGGER.info("Lottery: " + count4 + " players with ONE or TWO numbers each win " + prize4 + "."); } - final int newprize = getPrize() - (prize1 + prize2 + prize3 + prize4); + final int newprize = _prize - (prize1 + prize2 + prize3 + prize4); if (Config.DEBUG) { LOGGER.info("Lottery: Jackpot for next lottery is " + newprize + "."); @@ -427,8 +427,8 @@ public class Lottery { // There are winners. sm = new SystemMessage(SystemMessageId.AMOUNT_FOR_WINNER_S1_IS_S2_ADENA_WE_HAVE_S3_PRIZE_WINNER); - sm.addNumber(getId()); - sm.addNumber(getPrize()); + sm.addNumber(_number); + sm.addNumber(_prize); sm.addNumber(count1); Announcements.getInstance().announceToAll(sm); } @@ -436,22 +436,22 @@ public class Lottery { // There are no winners. sm = new SystemMessage(SystemMessageId.AMOUNT_FOR_LOTTERY_S1_IS_S2_ADENA_NO_WINNER); - sm.addNumber(getId()); - sm.addNumber(getPrize()); + sm.addNumber(_number); + sm.addNumber(_prize); Announcements.getInstance().announceToAll(sm); } try (Connection con = DatabaseFactory.getInstance().getConnection()) { statement = con.prepareStatement(UPDATE_LOTTERY); - statement.setInt(1, getPrize()); + statement.setInt(1, _prize); statement.setInt(2, newprize); statement.setInt(3, enchant); statement.setInt(4, type2); statement.setInt(5, prize1); statement.setInt(6, prize2); statement.setInt(7, prize3); - statement.setInt(8, getId()); + statement.setInt(8, _number); statement.execute(); statement.close(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java index 82941476cc..d6c9edbc0f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java @@ -133,7 +133,7 @@ public class TvT implements EventTask */ public static boolean set_eventName(String _eventName) { - if (!is_inProgress()) + if (!_inProgress) { TvT._eventName = _eventName; return true; @@ -157,7 +157,7 @@ public class TvT implements EventTask */ public static boolean set_eventDesc(String _eventDesc) { - if (!is_inProgress()) + if (!_inProgress) { TvT._eventDesc = _eventDesc; return true; @@ -181,7 +181,7 @@ public class TvT implements EventTask */ public static boolean set_joiningLocationName(String _joiningLocationName) { - if (!is_inProgress()) + if (!_inProgress) { TvT._joiningLocationName = _joiningLocationName; return true; @@ -205,7 +205,7 @@ public class TvT implements EventTask */ public static boolean set_npcId(int _npcId) { - if (!is_inProgress()) + if (!_inProgress) { TvT._npcId = _npcId; return true; @@ -240,7 +240,7 @@ public class TvT implements EventTask */ public static boolean set_rewardId(int _rewardId) { - if (!is_inProgress()) + if (!_inProgress) { TvT._rewardId = _rewardId; return true; @@ -264,7 +264,7 @@ public class TvT implements EventTask */ public static boolean set_rewardAmount(int _rewardAmount) { - if (!is_inProgress()) + if (!_inProgress) { TvT._rewardAmount = _rewardAmount; return true; @@ -288,7 +288,7 @@ public class TvT implements EventTask */ public static boolean set_minlvl(int _minlvl) { - if (!is_inProgress()) + if (!_inProgress) { TvT._minlvl = _minlvl; return true; @@ -312,7 +312,7 @@ public class TvT implements EventTask */ public static boolean set_maxlvl(int _maxlvl) { - if (!is_inProgress()) + if (!_inProgress) { TvT._maxlvl = _maxlvl; return true; @@ -336,7 +336,7 @@ public class TvT implements EventTask */ public static boolean set_joinTime(int _joinTime) { - if (!is_inProgress()) + if (!_inProgress) { TvT._joinTime = _joinTime; return true; @@ -360,7 +360,7 @@ public class TvT implements EventTask */ public static boolean set_eventTime(int _eventTime) { - if (!is_inProgress()) + if (!_inProgress) { TvT._eventTime = _eventTime; return true; @@ -384,7 +384,7 @@ public class TvT implements EventTask */ public static boolean set_minPlayers(int _minPlayers) { - if (!is_inProgress()) + if (!_inProgress) { TvT._minPlayers = _minPlayers; return true; @@ -408,7 +408,7 @@ public class TvT implements EventTask */ public static boolean set_maxPlayers(int _maxPlayers) { - if (!is_inProgress()) + if (!_inProgress) { TvT._maxPlayers = _maxPlayers; return true; @@ -432,7 +432,7 @@ public class TvT implements EventTask */ public static boolean set_intervalBetweenMatchs(long _intervalBetweenMatchs) { - if (!is_inProgress()) + if (!_inProgress) { TvT._intervalBetweenMatchs = _intervalBetweenMatchs; return true; @@ -456,7 +456,7 @@ public class TvT implements EventTask */ public boolean setStartEventTime(String startEventTime) { - if (!is_inProgress()) + if (!_inProgress) { this.startEventTime = startEventTime; return true; @@ -2396,7 +2396,7 @@ public class TvT implements EventTask */ public static void addTeam(String teamName) { - if (is_inProgress()) + if (_inProgress) { if (Config.DEBUG) { @@ -2436,7 +2436,7 @@ public class TvT implements EventTask */ public static void removeTeam(String teamName) { - if (is_inProgress() || _teams.isEmpty()) + if (_inProgress || _teams.isEmpty()) { if (Config.DEBUG) { @@ -2530,7 +2530,7 @@ public class TvT implements EventTask */ public static void setTeamColor(String teamName, int color) { - if (is_inProgress()) + if (_inProgress) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java index 685418c4c4..a09d0b74be 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java @@ -1109,7 +1109,7 @@ public class Olympiad { final int[] array = new int[2]; - if (!inCompPeriod()) + if (!_inCompPeriod) { return null; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadStadium.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadStadium.java index 0d55b74d23..52ef79dbae 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadStadium.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadStadium.java @@ -61,7 +61,7 @@ class OlympiadStadium protected void addSpectator(int id, L2PcInstance spec, boolean storeCoords) { - spec.enterOlympiadObserverMode(getCoordinates()[0], getCoordinates()[1], getCoordinates()[2], id, storeCoords); + spec.enterOlympiadObserverMode(_coords[0], _coords[1], _coords[2], id, storeCoords); _spectators.add(spec); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java index 8cc0e4a720..0ccc694d9c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java @@ -666,7 +666,7 @@ public class SevenSigns { // Calculate the number of days until the next period // A period starts at 18:00 pm (local time), like on official servers. - switch (getCurrentPeriod()) + switch (_activePeriod) { case PERIOD_SEAL_VALIDATION: case PERIOD_COMPETITION: @@ -1424,7 +1424,7 @@ public class SevenSigns { SystemMessage sm = null; - switch (getCurrentPeriod()) + switch (_activePeriod) { case PERIOD_COMP_RECRUITING: { @@ -1761,7 +1761,7 @@ public class SevenSigns /* * Remember the period check here refers to the period just ENDED! */ - final int periodEnded = getCurrentPeriod(); + final int periodEnded = _activePeriod; _activePeriod++; switch (periodEnded) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java index 79c968ff40..5348e5d8a1 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java @@ -4643,7 +4643,7 @@ public class SevenSignsFestival implements SpawnListener */ public final L2DarknessFestival getFestivalInstance(int oracle, int festivalId) { - if (!isFestivalInitialized()) + if (!_festivalInitialized) { return null; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java index 807f071209..d7af016b5f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Castle.java @@ -156,7 +156,7 @@ public class Castle */ public void addToTreasury(int amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -203,7 +203,7 @@ public class Castle */ public boolean addToTreasuryNoTax(int amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -231,8 +231,8 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Update castle set treasury = ? where id = ?"); - statement.setInt(1, getTreasury()); - statement.setInt(2, getCastleId()); + statement.setInt(1, _treasury); + statement.setInt(2, _castleId); statement.execute(); statement.close(); } @@ -249,7 +249,7 @@ public class Castle */ public void banishForeigners() { - _zone.banishForeigners(getOwnerId()); + _zone.banishForeigners(_ownerId); } /** @@ -309,7 +309,7 @@ public class Castle public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClanId() != getOwnerId()) + if (activeChar.getClanId() != _ownerId) { return; } @@ -338,7 +338,7 @@ public class Castle public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getClanId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getClanId() != _ownerId))) { L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance @@ -427,7 +427,7 @@ public class Castle } setTaxPercent(taxPercent); - activeChar.sendMessage(getName() + " castle tax changed to " + taxPercent + "%."); + activeChar.sendMessage(_name + " castle tax changed to " + taxPercent + "%."); } public void setTaxPercent(int taxPercent) @@ -439,7 +439,7 @@ public class Castle { PreparedStatement statement = con.prepareStatement("Update castle set taxPercent = ? where id = ?"); statement.setInt(1, taxPercent); - statement.setInt(2, getCastleId()); + statement.setInt(2, _castleId); statement.execute(); statement.close(); } @@ -464,9 +464,9 @@ public class Castle */ public void spawnDoor(boolean isDoorWeak) { - for (int i = 0; i < getDoors().size(); i++) + for (int i = 0; i < _doors.size(); i++) { - L2DoorInstance door = getDoors().get(i); + L2DoorInstance door = _doors.get(i); if (door.getCurrentHp() <= 0) { door.decayMe(); // Kill current if not killed already @@ -482,7 +482,7 @@ public class Castle } door.spawnMe(door.getX(), door.getY(), door.getZ()); - getDoors().set(i, door); + _doors.set(i, door); } else if (door.getOpen()) { @@ -521,7 +521,7 @@ public class Castle ResultSet rs; statement = con.prepareStatement("Select * from castle where id = ?"); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); rs = statement.executeQuery(); while (rs.next()) @@ -556,7 +556,7 @@ public class Castle _taxRate = _taxPercent / 100.0; statement = con.prepareStatement("Select clan_id from clan_data where hasCastle = ?"); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); rs = statement.executeQuery(); while (rs.next()) @@ -564,7 +564,7 @@ public class Castle _ownerId = rs.getInt("clan_id"); } - if (getOwnerId() > 0) + if (_ownerId > 0) { L2Clan clan = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance ThreadPool.schedule(new CastleUpdater(clan, 1), 3600000); // Schedule owner tasks to start running @@ -585,7 +585,7 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Select * from castle_door where castleId = ?"); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); ResultSet rs = statement.executeQuery(); while (rs.next()) @@ -614,7 +614,7 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Select * from castle_doorupgrade where doorId in (Select Id from castle_door where castleId = ?)"); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); ResultSet rs = statement.executeQuery(); while (rs.next()) @@ -636,7 +636,7 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("delete from castle_doorupgrade where doorId in (select id from castle_door where castleId=?)"); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); statement.execute(); statement.close(); } @@ -683,13 +683,13 @@ public class Castle // NEED TO REMOVE HAS CASTLE FLAG FROM CLAN_DATA // SHOULD BE CHECKED FROM CASTLE TABLE statement = con.prepareStatement("UPDATE clan_data SET hasCastle=0 WHERE hasCastle=?"); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); statement.execute(); statement.close(); statement = con.prepareStatement("UPDATE clan_data SET hasCastle=? WHERE clan_id=?"); - statement.setInt(1, getCastleId()); - statement.setInt(2, getOwnerId()); + statement.setInt(1, _castleId); + statement.setInt(2, _ownerId); statement.execute(); statement.close(); // ============================================================================ @@ -697,7 +697,7 @@ public class Castle // Announce to clan memebers if (clan != null) { - clan.setHasCastle(getCastleId()); // Set has castle flag for new owner + clan.setHasCastle(_castleId); // Set has castle flag for new owner Announcements.getInstance().announceToAll(clan.getName() + " has taken " + getName() + " castle!"); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); clan.broadcastToOnlineMembers(new PlaySound(1, "Siege_Victory", 0, 0, 0, 0, 0)); @@ -727,9 +727,9 @@ public class Castle return null; } - for (int i = 0; i < getDoors().size(); i++) + for (int i = 0; i < _doors.size(); i++) { - L2DoorInstance door = getDoors().get(i); + L2DoorInstance door = _doors.get(i); if (door.getDoorId() == doorId) { @@ -899,7 +899,7 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { statement = con.prepareStatement(CASTLE_MANOR_DELETE_PRODUCTION); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); statement.execute(); statement.close(); @@ -913,7 +913,7 @@ public class Castle for (SeedProduction s : _production) { - values[count] = "(" + getCastleId() + "," + s.getId() + "," + s.getCanProduce() + "," + s.getStartProduce() + "," + s.getPrice() + "," + CastleManorManager.PERIOD_CURRENT + ")"; + values[count] = "(" + _castleId + "," + s.getId() + "," + s.getCanProduce() + "," + s.getStartProduce() + "," + s.getPrice() + "," + CastleManorManager.PERIOD_CURRENT + ")"; count++; } @@ -939,7 +939,7 @@ public class Castle for (SeedProduction s : _productionNext) { - values[count] = "(" + getCastleId() + "," + s.getId() + "," + s.getCanProduce() + "," + s.getStartProduce() + "," + s.getPrice() + "," + CastleManorManager.PERIOD_NEXT + ")"; + values[count] = "(" + _castleId + "," + s.getId() + "," + s.getCanProduce() + "," + s.getStartProduce() + "," + s.getPrice() + "," + CastleManorManager.PERIOD_NEXT + ")"; count++; } @@ -960,7 +960,7 @@ public class Castle } catch (Exception e) { - LOGGER.info("Error adding seed production data for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error adding seed production data for castle " + _name + ": " + e.getMessage()); } } @@ -971,7 +971,7 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { statement = con.prepareStatement(CASTLE_MANOR_DELETE_PRODUCTION_PERIOD); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); statement.setInt(2, period); statement.execute(); statement.close(); @@ -988,7 +988,7 @@ public class Castle for (SeedProduction s : prod) { - values[count] = "(" + getCastleId() + "," + s.getId() + "," + s.getCanProduce() + "," + s.getStartProduce() + "," + s.getPrice() + "," + period + ")"; + values[count] = "(" + _castleId + "," + s.getId() + "," + s.getCanProduce() + "," + s.getStartProduce() + "," + s.getPrice() + "," + period + ")"; count++; } if (values.length > 0) @@ -1006,7 +1006,7 @@ public class Castle } catch (Exception e) { - LOGGER.info("Error adding seed production data for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error adding seed production data for castle " + _name + ": " + e.getMessage()); } } @@ -1017,7 +1017,7 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { statement = con.prepareStatement(CASTLE_MANOR_DELETE_PROCURE); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); statement.execute(); statement.close(); @@ -1030,7 +1030,7 @@ public class Castle for (CropProcure cp : _procure) { - values[count] = "(" + getCastleId() + "," + cp.getId() + "," + cp.getAmount() + "," + cp.getStartAmount() + "," + cp.getPrice() + "," + cp.getReward() + "," + CastleManorManager.PERIOD_CURRENT + ")"; + values[count] = "(" + _castleId + "," + cp.getId() + "," + cp.getAmount() + "," + cp.getStartAmount() + "," + cp.getPrice() + "," + cp.getReward() + "," + CastleManorManager.PERIOD_CURRENT + ")"; count++; } @@ -1058,7 +1058,7 @@ public class Castle for (CropProcure cp : _procureNext) { - values[count] = "(" + getCastleId() + "," + cp.getId() + "," + cp.getAmount() + "," + cp.getStartAmount() + "," + cp.getPrice() + "," + cp.getReward() + "," + CastleManorManager.PERIOD_NEXT + ")"; + values[count] = "(" + _castleId + "," + cp.getId() + "," + cp.getAmount() + "," + cp.getStartAmount() + "," + cp.getPrice() + "," + cp.getReward() + "," + CastleManorManager.PERIOD_NEXT + ")"; count++; } @@ -1077,7 +1077,7 @@ public class Castle } catch (Exception e) { - LOGGER.info("Error adding crop data for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error adding crop data for castle " + _name + ": " + e.getMessage()); } } @@ -1088,7 +1088,7 @@ public class Castle try (Connection con = DatabaseFactory.getInstance().getConnection()) { statement = con.prepareStatement(CASTLE_MANOR_DELETE_PROCURE_PERIOD); - statement.setInt(1, getCastleId()); + statement.setInt(1, _castleId); statement.setInt(2, period); statement.execute(); statement.close(); @@ -1105,7 +1105,7 @@ public class Castle for (CropProcure cp : proc) { - values[count] = "(" + getCastleId() + "," + cp.getId() + "," + cp.getAmount() + "," + cp.getStartAmount() + "," + cp.getPrice() + "," + cp.getReward() + "," + period + ")"; + values[count] = "(" + _castleId + "," + cp.getId() + "," + cp.getAmount() + "," + cp.getStartAmount() + "," + cp.getPrice() + "," + cp.getReward() + "," + period + ")"; count++; } @@ -1126,7 +1126,7 @@ public class Castle } catch (Exception e) { - LOGGER.info("Error adding crop data for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error adding crop data for castle " + _name + ": " + e.getMessage()); } } @@ -1138,14 +1138,14 @@ public class Castle statement = con.prepareStatement(CASTLE_UPDATE_CROP); statement.setInt(1, amount); statement.setInt(2, cropId); - statement.setInt(3, getCastleId()); + statement.setInt(3, _castleId); statement.setInt(4, period); statement.execute(); statement.close(); } catch (Exception e) { - LOGGER.info("Error adding crop data for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error adding crop data for castle " + _name + ": " + e.getMessage()); } } @@ -1157,14 +1157,14 @@ public class Castle statement = con.prepareStatement(CASTLE_UPDATE_SEED); statement.setInt(1, amount); statement.setInt(2, seedId); - statement.setInt(3, getCastleId()); + statement.setInt(3, _castleId); statement.setInt(4, period); statement.execute(); statement.close(); } catch (Exception e) { - LOGGER.info("Error adding seed production data for castle " + getName() + ": " + e.getMessage()); + LOGGER.info("Error adding seed production data for castle " + _name + ": " + e.getMessage()); } } @@ -1263,7 +1263,7 @@ public class Castle LOGGER.info(" Player Name: " + actual.getName()); } } - getTeleZone().oustAllPlayers(); + _teleZone.oustAllPlayers(); } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/ClanHallSiege.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/ClanHallSiege.java index 776b84ae80..8402022d0b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/ClanHallSiege.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/ClanHallSiege.java @@ -75,7 +75,7 @@ public abstract class ClanHallSiege try (Connection con = DatabaseFactory.getInstance().getConnection()) { final PreparedStatement statement = con.prepareStatement("UPDATE clanhall_siege SET siege_data=? WHERE id = ?"); - statement.setLong(1, getSiegeDate().getTimeInMillis()); + statement.setLong(1, _siegeDate.getTimeInMillis()); statement.setInt(2, ClanHallId); statement.execute(); statement.close(); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Fort.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Fort.java index d7fe3d68d2..6c02bb6fbd 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Fort.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Fort.java @@ -110,7 +110,7 @@ public class Fort */ public void banishForeigners() { - _zone.banishForeigners(getOwnerId()); + _zone.banishForeigners(_ownerId); } /** @@ -160,7 +160,7 @@ public class Fort public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClanId() != getOwnerId()) + if (activeChar.getClanId() != _ownerId) { return; } @@ -190,7 +190,7 @@ public class Fort public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getClanId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getClanId() != _ownerId))) { // Try to find clan instance L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); @@ -270,7 +270,7 @@ public class Fort return; } - activeChar.sendMessage(getName() + " fort tax changed to " + taxPercent + "%."); + activeChar.sendMessage(_name + " fort tax changed to " + taxPercent + "%."); } /** @@ -288,9 +288,9 @@ public class Fort */ public void spawnDoor(boolean isDoorWeak) { - for (int i = 0; i < getDoors().size(); i++) + for (int i = 0; i < _doors.size(); i++) { - L2DoorInstance door = getDoors().get(i); + L2DoorInstance door = _doors.get(i); if (door.getCurrentHp() >= 0) { @@ -307,7 +307,7 @@ public class Fort } door.spawnMe(door.getX(), door.getY(), door.getZ()); - getDoors().set(i, door); + _doors.set(i, door); } else if (!door.getOpen()) { @@ -348,7 +348,7 @@ public class Fort ResultSet rs; statement = con.prepareStatement("Select * from fort where id = ?"); - statement.setInt(1, getFortId()); + statement.setInt(1, _fortId); rs = statement.executeQuery(); while (rs.next()) @@ -377,13 +377,13 @@ public class Fort rs.close(); statement.close(); - if (getOwnerId() > 0) + if (_ownerId > 0) { L2Clan clan = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance // ThreadPoolManager.scheduleGeneral(new FortUpdater(clan, 1), 3600000); // Schedule owner tasks to start running if (clan != null) { - clan.setHasFort(getFortId()); + clan.setHasFort(_fortId); _fortOwner = clan; } } @@ -405,7 +405,7 @@ public class Fort try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Select * from fort_door where fortId = ?"); - statement.setInt(1, getFortId()); + statement.setInt(1, _fortId); ResultSet rs = statement.executeQuery(); while (rs.next()) @@ -437,7 +437,7 @@ public class Fort try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Select * from fort_doorupgrade where doorId in (Select Id from fort_door where fortId = ?)"); - statement.setInt(1, getFortId()); + statement.setInt(1, _fortId); ResultSet rs = statement.executeQuery(); while (rs.next()) @@ -459,7 +459,7 @@ public class Fort try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("delete from fort_doorupgrade where doorId in (select id from fort_door where fortId=?)"); - statement.setInt(1, getFortId()); + statement.setInt(1, _fortId); statement.execute(); statement.close(); } @@ -505,8 +505,8 @@ public class Fort PreparedStatement statement; statement = con.prepareStatement("UPDATE fort SET owner=? where id = ?"); - statement.setInt(1, getOwnerId()); - statement.setInt(2, getFortId()); + statement.setInt(1, _ownerId); + statement.setInt(2, _fortId); statement.execute(); statement.close(); @@ -515,7 +515,7 @@ public class Fort // Announce to clan memebers if (clan != null) { - clan.setHasFort(getFortId()); // Set has fort flag for new owner + clan.setHasFort(_fortId); // Set has fort flag for new owner Announcements.getInstance().announceToAll(clan.getName() + " has taken " + getName() + " fort!"); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); clan.broadcastToOnlineMembers(new PlaySound(1, "Siege_Victory", 0, 0, 0, 0, 0)); @@ -552,9 +552,9 @@ public class Fort return null; } - for (int i = 0; i < getDoors().size(); i++) + for (int i = 0; i < _doors.size(); i++) { - L2DoorInstance door = getDoors().get(i); + L2DoorInstance door = _doors.get(i); if (door.getDoorId() == doorId) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/FortSiege.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/FortSiege.java index 2cd78df9f3..9f658bed49 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/FortSiege.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/FortSiege.java @@ -109,7 +109,7 @@ public class FortSiege @Override public void run() { - if (!getIsInProgress()) + if (!_isInProgress) { return; } @@ -179,7 +179,7 @@ public class FortSiege @Override public void run() { - if (getIsInProgress()) + if (_isInProgress) { return; } @@ -266,7 +266,7 @@ public class FortSiege private final Fort[] _fort; /** The _is in progress. */ - private boolean _isInProgress = false; + boolean _isInProgress = false; /** The _is scheduled. */ private boolean _isScheduled = false; @@ -309,7 +309,7 @@ public class FortSiege */ public void endSiege() { - if (getIsInProgress()) + if (_isInProgress) { announceToPlayer("The siege of " + getFort().getName() + " has finished!", false); @@ -420,7 +420,7 @@ public class FortSiege */ public void midVictory() { - if (getIsInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { // defenders to attacker for (L2SiegeClan sc : getDefenderClans()) @@ -449,7 +449,7 @@ public class FortSiege */ public void startSiege() { - if (!getIsInProgress()) + if (!_isInProgress) { if (getAttackerClans().size() <= 0) { @@ -627,7 +627,7 @@ public class FortSiege */ public boolean checkIfInZone(int x, int y, int z) { - return getIsInProgress() && getFort().checkIfInZone(x, y, z); // Fort zone during siege + return _isInProgress && getFort().checkIfInZone(x, y, z); // Fort zone during siege } /** @@ -682,7 +682,7 @@ public class FortSiege getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -710,7 +710,7 @@ public class FortSiege statement.execute(); statement.close(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -1124,7 +1124,7 @@ public class FortSiege } default: { - players = getPlayersInZone(); + players = getFort().getZone().getAllPlayers(); } } @@ -1184,7 +1184,7 @@ public class FortSiege */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1195,11 +1195,11 @@ public class FortSiege */ private boolean checkIfCanRegister(L2PcInstance player) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { player.sendMessage("The deadline to register for the siege of " + getFort().getName() + " has passed."); } - else if (getIsInProgress()) + else if (_isInProgress) { player.sendMessage("This is not the time for siege registration and so registration and cancellation cannot be done."); } @@ -1249,7 +1249,7 @@ public class FortSiege { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add fort owner as defender (add owner first so that they are on the top of the defender list) if (getFort().getOwnerId() > 0) @@ -1344,7 +1344,7 @@ public class FortSiege try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Update fort set siegeDate = ? where id = ?"); - statement.setLong(1, getSiegeDate().getTimeInMillis()); + statement.setLong(1, getFort().getSiegeDate().getTimeInMillis()); statement.setInt(2, getFort().getFortId()); statement.execute(); @@ -1676,7 +1676,7 @@ public class FortSiege */ public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Siege.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Siege.java index 3fa89eeac3..2a12ed4cd7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Siege.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Siege.java @@ -164,7 +164,7 @@ public class Siege @Override public void run() { - if (!getIsInProgress()) + if (!_isInProgress) { return; } @@ -241,7 +241,7 @@ public class Siege @Override public void run() { - if (getIsInProgress()) + if (_isInProgress) { return; } @@ -329,7 +329,7 @@ public class Siege private final Castle[] _castle; /** The _is in progress. */ - private boolean _isInProgress = false; + boolean _isInProgress = false; /** The _is normal side. */ private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def @@ -369,7 +369,7 @@ public class Siege */ public void endSiege() { - if (getIsInProgress()) + if (_isInProgress) { announceToPlayer("The siege of " + getCastle().getName() + " has finished!", false); @@ -487,7 +487,7 @@ public class Siege */ public void midVictory() { - if (getIsInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { if (getCastle().getOwnerId() > 0) { @@ -607,7 +607,7 @@ public class Siege */ public void startSiege() { - if (!getIsInProgress()) + if (!_isInProgress) { if (getAttackerClans().size() <= 0) { @@ -796,7 +796,7 @@ public class Siege */ public boolean checkIfInZone(int x, int y, int z) { - return getIsInProgress() && getCastle().checkIfInZone(x, y, z); // Castle zone during siege + return _isInProgress && getCastle().checkIfInZone(x, y, z); // Castle zone during siege } /** @@ -857,7 +857,7 @@ public class Siege getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -877,7 +877,7 @@ public class Siege statement.execute(); statement.close(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -1241,7 +1241,7 @@ public class Siege } default: { - players = getPlayersInZone(); + players = getCastle().getZone().getAllPlayers(); } } @@ -1304,7 +1304,7 @@ public class Siege private void addDefenderWaiting(int clanId) { // Add registered defender to defender list - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); } /** @@ -1315,11 +1315,11 @@ public class Siege */ private boolean checkIfCanRegister(L2PcInstance player) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { player.sendMessage("The deadline to register for the siege of " + getCastle().getName() + " has passed."); } - else if (getIsInProgress()) + else if (_isInProgress) { player.sendMessage("This is not the time for siege registration and so registration and cancellation cannot be done."); } @@ -1431,7 +1431,7 @@ public class Siege { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) if (getCastle().getOwnerId() > 0) @@ -1555,7 +1555,7 @@ public class Siege try (Connection con = DatabaseFactory.getInstance().getConnection()) { PreparedStatement statement = con.prepareStatement("Update castle set siegeDate = ? where id = ?"); - statement.setLong(1, getSiegeDate().getTimeInMillis()); + statement.setLong(1, getCastle().getSiegeDate().getTimeInMillis()); statement.setInt(2, getCastle().getCastleId()); statement.execute(); @@ -1907,7 +1907,7 @@ public class Siege */ public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java index 99f41da576..381301bbea 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java @@ -51,7 +51,7 @@ public class BanditStrongholdSiege extends ClanHallSiege { protected static Logger LOGGER = Logger.getLogger(BanditStrongholdSiege.class.getName()); private static BanditStrongholdSiege _instance; - private boolean _registrationPeriod = false; + boolean _registrationPeriod = false; private int _clanCounter = 0; protected Map _clansInfo = new HashMap<>(); private L2ClanHallZone zone; @@ -571,7 +571,7 @@ public class BanditStrongholdSiege extends ClanHallSiege long remaining = registerTimeRemaining; if (registerTimeRemaining <= 0) { - if (!isRegistrationPeriod()) + if (!_registrationPeriod) { if (clanhall.getOwnerClan() != null) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java index 7f24926de9..a5aed49d4c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java @@ -48,7 +48,7 @@ public class WildBeastFarmSiege extends ClanHallSiege { protected static Logger LOGGER = Logger.getLogger(WildBeastFarmSiege.class.getName()); private static WildBeastFarmSiege _instance; - private boolean _registrationPeriod = false; + boolean _registrationPeriod = false; private int _clanCounter = 0; protected Map _clansInfo = new HashMap<>(); public ClanHall clanhall = ClanHallManager.getInstance().getClanHallById(63); @@ -556,7 +556,7 @@ public class WildBeastFarmSiege extends ClanHallSiege long remaining = registerTimeRemaining; if (registerTimeRemaining <= 0) { - if (!isRegistrationPeriod()) + if (!_registrationPeriod) { if (clanhall.getOwnerClan() != null) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java index c46afc195f..efee3586ca 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -263,7 +263,7 @@ public class Quest extends ManagedScript */ public QuestState newQuestState(L2PcInstance player) { - QuestState qs = new QuestState(this, player, getInitialState()); + QuestState qs = new QuestState(this, player, _initialState); createQuestInDb(qs); return qs; } @@ -397,7 +397,7 @@ public class Quest extends ManagedScript { if (Config.DEBUG) { - LOGGER.info("StartingQuestTimer for Quest " + getName()); + LOGGER.info("StartingQuestTimer for Quest " + _name); String info = "Event:" + name + " Time:" + time; if (npc != null) @@ -764,7 +764,7 @@ public class Quest extends ManagedScript // if not overriden by a subclass, then default to the returned value of the simpler (and older) onEvent override // if the player has a state, use it as parameter in the next call, else return null - final QuestState qs = player.getQuestState(getName()); + final QuestState qs = player.getQuestState(_name); if (qs != null) { @@ -1259,7 +1259,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("REPLACE INTO quest_global_data (quest_name,var,value) VALUES (?,?,?)"); - statement.setString(1, getName()); + statement.setString(1, _name); statement.setString(2, var); statement.setString(3, value); statement.executeUpdate(); @@ -1284,7 +1284,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("SELECT value FROM quest_global_data WHERE quest_name = ? AND var = ?"); - statement.setString(1, getName()); + statement.setString(1, _name); statement.setString(2, var); ResultSet rs = statement.executeQuery(); @@ -1313,7 +1313,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ? AND var = ?"); - statement.setString(1, getName()); + statement.setString(1, _name); statement.setString(2, var); statement.executeUpdate(); statement.close(); @@ -1333,7 +1333,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ?"); - statement.setString(1, getName()); + statement.setString(1, _name); statement.executeUpdate(); statement.close(); } @@ -1501,7 +1501,7 @@ public class Quest extends ManagedScript } // Check player's quest conditions. - final QuestState st = player.getQuestState(getName()); + final QuestState st = player.getQuestState(_name); if (st == null) { return null; @@ -1538,7 +1538,7 @@ public class Quest extends ManagedScript } // Check player's quest conditions. - final QuestState st = player.getQuestState(getName()); + final QuestState st = player.getQuestState(_name); if (st == null) { return null; @@ -1676,7 +1676,7 @@ public class Quest extends ManagedScript // if this player is not in a party, just check if this player instance matches the conditions itself if ((party == null) || (party.getPartyMembers().size() == 0)) { - temp = player.getQuestState(getName()); + temp = player.getQuestState(_name); if ((temp != null) && (temp.get(var) != null) && ((String) temp.get(var)).equalsIgnoreCase(value)) { return player; // match @@ -1698,7 +1698,7 @@ public class Quest extends ManagedScript for (L2PcInstance partyMember : party.getPartyMembers()) { - temp = partyMember.getQuestState(getName()); + temp = partyMember.getQuestState(_name); if ((temp != null) && (temp.get(var) != null) && ((String) temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius(target, 1500, true, false)) { candidates.add(partyMember); @@ -1777,7 +1777,7 @@ public class Quest extends ManagedScript // if this player is not in a party, just check if this player instance matches the conditions itself if ((party == null) || (party.getPartyMembers().size() == 0)) { - temp = player.getQuestState(getName()); + temp = player.getQuestState(_name); if ((temp != null) && (temp.getState() == state)) { return player; // match @@ -1799,7 +1799,7 @@ public class Quest extends ManagedScript for (L2PcInstance partyMember : party.getPartyMembers()) { - temp = partyMember.getQuestState(getName()); + temp = partyMember.getQuestState(_name); if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius(target, 1500, true, false)) { @@ -1825,10 +1825,10 @@ public class Quest extends ManagedScript */ public String showHtmlFile(L2PcInstance player, String fileName) { - final String questId = getName(); + final String questId = _name; // Create handler to file linked to the quest - final String directory = getDescr().toLowerCase(); + final String directory = _descr.toLowerCase(); String content = HtmCache.getInstance().getHtm("data/scripts/" + directory + "/" + questId + "/" + fileName); if (content == null) @@ -1876,7 +1876,7 @@ public class Quest extends ManagedScript */ public boolean isRealQuest() { - return getQuestIntId() > 0; + return _questId > 0; } // ========================================================= @@ -1959,7 +1959,7 @@ public class Quest extends ManagedScript @Override public String getScriptName() { - return getName(); + return _name; } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestState.java index c21bacb6e2..090f8309f9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -100,7 +100,7 @@ public final class QuestState _player = player; // Save the state of the quest for the player in the player's list of quest onwed - getPlayer().setQuestState(this); + _player.setQuestState(this); // set the state of the quest _state = state; @@ -144,7 +144,7 @@ public final class QuestState */ public boolean isCompleted() { - return (getState() == State.COMPLETED); + return (_state == State.COMPLETED); } /** @@ -153,7 +153,7 @@ public final class QuestState */ public boolean isStarted() { - return (getState() == State.STARTED); + return (_state == State.STARTED); } /** @@ -175,7 +175,7 @@ public final class QuestState Quest.updateQuestInDb(this); final QuestList ql = new QuestList(); - getPlayer().sendPacket(ql); + _player.sendPacket(ql); return state; } @@ -256,7 +256,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.finer(getPlayer().getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e); + LOGGER.finer(_player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e); } } @@ -352,13 +352,13 @@ public final class QuestState // send a packet to the client to inform it of the quest progress (step change) QuestList ql = new QuestList(); - getPlayer().sendPacket(ql); + _player.sendPacket(ql); final int questId = getQuest().getQuestIntId(); if ((questId > 0) && (questId < 999) && (cond > 0)) { - getPlayer().sendPacket(new ExShowQuestMark(questId)); + _player.sendPacket(new ExShowQuestMark(questId)); } } @@ -434,7 +434,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.info(getPlayer().getName() + ": variable " + var + " isn't an integer: returned value will be " + varint + e); + LOGGER.info(_player.getName() + ": variable " + var + " isn't an integer: returned value will be " + varint + e); if (Config.AUTODELETE_INVALID_QUEST_DATA) { @@ -469,9 +469,9 @@ public final class QuestState { int count = 0; - if ((getPlayer() != null) && (getPlayer().getInventory() != null) && (getPlayer().getInventory().getItems() != null)) + if ((_player != null) && (_player.getInventory() != null) && (_player.getInventory().getItems() != null)) { - for (L2ItemInstance item : getPlayer().getInventory().getItems()) + for (L2ItemInstance item : _player.getInventory().getItems()) { if ((item != null) && (item.getItemId() == itemId)) { @@ -536,7 +536,7 @@ public final class QuestState */ public int getEnchantLevel(int itemId) { - final L2ItemInstance enchanteditem = getPlayer().getInventory().getItemByItemId(itemId); + final L2ItemInstance enchanteditem = _player.getInventory().getItemByItemId(itemId); if (enchanteditem == null) { @@ -573,7 +573,7 @@ public final class QuestState // Set quantity of item // Add items to player's inventory - final L2ItemInstance item = getPlayer().getInventory().addItem("Quest", itemId, count, getPlayer(), getPlayer().getTarget()); + final L2ItemInstance item = _player.getInventory().addItem("Quest", itemId, count, _player, _player.getTarget()); if (item == null) { @@ -590,7 +590,7 @@ public final class QuestState { SystemMessage smsg = new SystemMessage(SystemMessageId.EARNED_ADENA); smsg.addNumber(count); - getPlayer().sendPacket(smsg); + _player.sendPacket(smsg); } // Otherwise, send message of object reward to client else if (count > 1) @@ -598,19 +598,19 @@ public final class QuestState SystemMessage smsg = new SystemMessage(SystemMessageId.EARNED_S2_S1_S); smsg.addItemName(item.getItemId()); smsg.addNumber(count); - getPlayer().sendPacket(smsg); + _player.sendPacket(smsg); } else { SystemMessage smsg = new SystemMessage(SystemMessageId.EARNED_ITEM); smsg.addItemName(item.getItemId()); - getPlayer().sendPacket(smsg); + _player.sendPacket(smsg); } - getPlayer().sendPacket(new ItemList(getPlayer(), false)); + _player.sendPacket(new ItemList(_player, false)); - StatusUpdate su = new StatusUpdate(getPlayer().getObjectId()); - su.addAttribute(StatusUpdate.CUR_LOAD, getPlayer().getCurrentLoad()); - getPlayer().sendPacket(su); + StatusUpdate su = new StatusUpdate(_player.getObjectId()); + su.addAttribute(StatusUpdate.CUR_LOAD, _player.getCurrentLoad()); + _player.sendPacket(su); } /** @@ -646,7 +646,7 @@ public final class QuestState public boolean dropQuestItems(int itemId, int minCount, int maxCount, int neededCount, int dropChance, boolean sound) { - dropChance *= Config.RATE_DROP_QUEST / (getPlayer().getParty() != null ? getPlayer().getParty().getMemberCount() : 1); + dropChance *= Config.RATE_DROP_QUEST / (_player.getParty() != null ? _player.getParty().getMemberCount() : 1); final int currentCount = getQuestItemsCount(itemId); @@ -692,7 +692,7 @@ public final class QuestState } // Inventory slot check - if (!getPlayer().getInventory().validateCapacityByItemId(itemId)) + if (!_player.getInventory().validateCapacityByItemId(itemId)) { return false; } @@ -708,7 +708,7 @@ public final class QuestState // } // Give the item to Player - getPlayer().addItem("Quest", itemId, itemCount, getPlayer().getTarget(), true); + _player.addItem("Quest", itemId, itemCount, _player.getTarget(), true); if (sound) { @@ -940,17 +940,17 @@ public final class QuestState // BEGIN STUFF THAT WILL PROBABLY BE CHANGED public void addRadar(int x, int y, int z) { - getPlayer().getRadar().addMarker(x, y, z); + _player.getRadar().addMarker(x, y, z); } public void removeRadar(int x, int y, int z) { - getPlayer().getRadar().removeMarker(x, y, z); + _player.getRadar().removeMarker(x, y, z); } public void clearRadar() { - getPlayer().getRadar().removeAllMarkers(); + _player.getRadar().removeAllMarkers(); } // END STUFF THAT WILL PROBABLY BE CHANGED @@ -967,16 +967,16 @@ public final class QuestState public void takeItems(int itemId, int count) { // Get object item from player's inventory list - L2ItemInstance item = getPlayer().getInventory().getItemByItemId(itemId); + L2ItemInstance item = _player.getInventory().getItemByItemId(itemId); if (item == null) { return; } - if (getPlayer().isProcessingTransaction()) + if (_player.isProcessingTransaction()) { - getPlayer().cancelActiveTrade(); + _player.cancelActiveTrade(); } // Tests on count value in order not to have negative value @@ -988,23 +988,23 @@ public final class QuestState // Destroy the quantity of items wanted if (itemId == 57) { - getPlayer().reduceAdena("Quest", count, getPlayer(), true); + _player.reduceAdena("Quest", count, _player, true); } else { // Fix for destroyed quest items if (item.isEquipped()) { - getPlayer().getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); + _player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); } - getPlayer().destroyItemByItemId("Quest", itemId, count, getPlayer(), true); + _player.destroyItemByItemId("Quest", itemId, count, _player, true); } // on quests, always refresh inventory final InventoryUpdate u = new InventoryUpdate(); u.addItem(item); - getPlayer().sendPacket(u); + _player.sendPacket(u); } /** @@ -1013,7 +1013,7 @@ public final class QuestState */ public void playSound(String sound) { - getPlayer().sendPacket(new PlaySound(sound)); + _player.sendPacket(new PlaySound(sound)); } /** @@ -1023,7 +1023,7 @@ public final class QuestState */ public void rewardExpAndSp(int exp, int sp) { - getPlayer().addExpAndSp((int) getPlayer().calcStat(Stats.EXPSP_RATE, exp * Config.RATE_QUESTS_REWARD, null, null), (int) getPlayer().calcStat(Stats.EXPSP_RATE, sp * Config.RATE_QUESTS_REWARD, null, null)); + _player.addExpAndSp((int) _player.calcStat(Stats.EXPSP_RATE, exp * Config.RATE_QUESTS_REWARD, null, null), (int) _player.calcStat(Stats.EXPSP_RATE, sp * Config.RATE_QUESTS_REWARD, null, null)); } /** @@ -1042,7 +1042,7 @@ public final class QuestState */ public int getItemEquipped(int loc) { - return getPlayer().getInventory().getPaperdollItemId(loc); + return _player.getInventory().getPaperdollItemId(loc); } /** @@ -1115,12 +1115,12 @@ public final class QuestState */ public L2NpcInstance addSpawn(int npcId) { - return addSpawn(npcId, getPlayer().getX(), getPlayer().getY(), getPlayer().getZ(), 0, false, 0); + return addSpawn(npcId, _player.getX(), _player.getY(), _player.getZ(), 0, false, 0); } public L2NpcInstance addSpawn(int npcId, int despawnDelay) { - return addSpawn(npcId, getPlayer().getX(), getPlayer().getY(), getPlayer().getZ(), 0, false, despawnDelay); + return addSpawn(npcId, _player.getX(), _player.getY(), _player.getZ(), 0, false, despawnDelay); } public L2NpcInstance addSpawn(int npcId, int x, int y, int z) @@ -1220,7 +1220,7 @@ public final class QuestState // If quest is repeatable, delete quest from list of quest of the player and from database (quest CAN be created again => repeatable) if (repeatable) { - getPlayer().delQuestState(getQuestName()); + _player.delQuestState(_questName); Quest.deleteQuestInDb(this); _vars = null; @@ -1244,12 +1244,12 @@ public final class QuestState public void showQuestionMark(int number) { - getPlayer().sendPacket(new TutorialShowQuestionMark(number)); + _player.sendPacket(new TutorialShowQuestionMark(number)); } public void playTutorialVoice(String voice) { - getPlayer().sendPacket(new PlaySound(2, voice, 0, 0, getPlayer().getX(), getPlayer().getY(), getPlayer().getZ())); + _player.sendPacket(new PlaySound(2, voice, 0, 0, _player.getX(), _player.getY(), _player.getZ())); } public void showTutorialHTML(String html) @@ -1262,17 +1262,17 @@ public final class QuestState text = "File data/scripts/quests/255_Tutorial/" + html + " not found or file is empty."; } - getPlayer().sendPacket(new TutorialShowHtml(text)); + _player.sendPacket(new TutorialShowHtml(text)); } public void closeTutorialHtml() { - getPlayer().sendPacket(new TutorialCloseHtml()); + _player.sendPacket(new TutorialCloseHtml()); } public void onTutorialClientEvent(int number) { - getPlayer().sendPacket(new TutorialEnableClientEvent(number)); + _player.sendPacket(new TutorialEnableClientEvent(number)); } public void dropItem(L2MonsterInstance npc, L2PcInstance player, int itemId, int count) @@ -1282,9 +1282,9 @@ public final class QuestState public L2NpcInstance getNpc() { - if (getPlayer().getTarget() instanceof L2NpcInstance) + if (_player.getTarget() instanceof L2NpcInstance) { - return (L2NpcInstance) getPlayer().getTarget(); + return (L2NpcInstance) _player.getTarget(); } return null; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 435409ccef..2b5a00fd01 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -31,18 +31,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancel(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Throwable t) { @@ -52,12 +52,12 @@ public class QuestTimer // ========================================================= // Data Field - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2NpcInstance _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2NpcInstance _npc; + final L2PcInstance _player; + final boolean _isRepeating; private ScheduledFuture _schedular; // ========================================================= @@ -107,7 +107,7 @@ public class QuestTimer if (removeTimer) { - getQuest().removeQuestTimer(this); + _quest.removeQuestTimer(this); } } @@ -116,24 +116,17 @@ public class QuestTimer // null npc or player act as wildcards for the match public boolean isMatch(Quest quest, String name, L2NpcInstance npc, L2PcInstance player) { - /* - * if (quest instanceof Frintezza_l2j) { LOGGER.info("#### INPUT Parameters ####"); LOGGER.info("Quest Name: " + quest.getName()); LOGGER.info("Quest Timer Name: " + name); LOGGER.info("Quest NPC: " + npc); if (npc != null) { LOGGER.info(" NPC Name: " + npc.getName()); - * LOGGER.info(" NPC Id: " + npc.getNpcId()); LOGGER.info(" NPC Instance: " + npc.getInstanceId()); } LOGGER.info("Quest Player: " + player); if (player != null) { LOGGER.info(" Player Name: " + player.getName()); LOGGER.info(" Player Instance: " + player.getInstanceId()); } - * LOGGER.info("\n#### LOCAL Parameters ####"); LOGGER.info("Quest Name: " + getQuest().getName()); LOGGER.info("Quest Timer Name: " + getName()); LOGGER.info("Quest NPC: " + getNpc()); if (getNpc() != null) { LOGGER.info(" NPC Name: " + getNpc().getName()); LOGGER.info(" NPC Id: " + - * getNpc().getNpcId()); LOGGER.info(" NPC Instance: " + getNpc().getInstanceId()); } LOGGER.info("Quest Player: " + getPlayer()); if (getPlayer() != null) { LOGGER.info(" Player Name: " + getPlayer().getName()); LOGGER.info(" Player Instance: " + getPlayer().getInstanceId()); } } - */ - if ((quest == null) || (name == null)) { return false; } - if ((quest != getQuest()) || (name.compareToIgnoreCase(getName()) != 0)) + if ((quest != _quest) || (name.compareToIgnoreCase(_name) != 0)) { return false; } - return (npc == getNpc()) && (player == getPlayer()); + return (npc == _npc) && (player == _player); } // ========================================================= diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java index e57b9320dc..a3fd2fc5fd 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java @@ -544,9 +544,9 @@ public class L2Spawn int newlocx, newlocy, newlocz; // If Locx=0 and Locy=0, the L2NpcInstance must be spawned in an area defined by location - if ((getX() == 0) && (getY() == 0)) + if ((_locX == 0) && (_locY == 0)) { - if (getLocation() == 0) + if (_location == 0) { return mob; } @@ -562,9 +562,9 @@ public class L2Spawn else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _locX; + newlocy = _locY; + newlocz = _locZ; } if (mob != null) @@ -575,13 +575,13 @@ public class L2Spawn mob.setCurrentHpMp(mob.getMaxHp(), mob.getMaxMp()); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_heading == -1) { mob.setHeading(Rnd.nextInt(61794)); } else { - mob.setHeading(getHeading()); + mob.setHeading(_heading); } // Reset decay info diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 984ad18eff..8f3a7d8046 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -43,10 +43,10 @@ public class L2EffectZone extends L2ZoneType { public static final Logger LOGGER = Logger.getLogger(L2EffectZone.class.getName()); - private int _chance; + int _chance; private int _initialDelay; private int _reuse; - private boolean _enabled; + boolean _enabled; private boolean _isShowDangerIcon; private volatile Future _task; protected volatile Map _skills; @@ -254,7 +254,7 @@ public class L2EffectZone extends L2ZoneType @Override public void run() { - if (isEnabled()) + if (_enabled) { for (L2Character temp : getCharacterList()) { @@ -265,7 +265,7 @@ public class L2EffectZone extends L2ZoneType continue; } - if (Rnd.get(100) < getChance()) + if (Rnd.get(100) < _chance) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java index 7f531d7d68..68b1fb4b4c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java @@ -56,7 +56,7 @@ public class L2OlympiadStadiumZone extends L2ZoneType if (character instanceof L2PcInstance) { - if ((((L2PcInstance) character).getOlympiadGameId() + 1) == getStadiumId()) + if ((((L2PcInstance) character).getOlympiadGameId() + 1) == _stadiumId) { ((L2PcInstance) character).sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2PoisonZone.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2PoisonZone.java index a0941ecaf2..fa12afef68 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2PoisonZone.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/type/L2PoisonZone.java @@ -33,12 +33,12 @@ public class L2PoisonZone extends L2ZoneType { protected final Logger LOGGER = Logger.getLogger(L2PoisonZone.class.getName()); protected int _skillId; - private int _chance; + int _chance; private int _initialDelay; protected int _skillLvl; private int _reuse; - private boolean _enabled; - private String _target; + boolean _enabled; + String _target; private Future _task; public L2PoisonZone(int id) @@ -161,13 +161,13 @@ public class L2PoisonZone extends L2ZoneType @Override public void run() { - if (isEnabled()) + if (_enabled) { for (L2Character temp : _characterList.values()) { if ((temp != null) && !temp.isDead()) { - if ((((temp instanceof L2Playable) && getTargetType().equalsIgnoreCase("pc")) || ((temp instanceof L2PcInstance) && getTargetType().equalsIgnoreCase("pc_only")) || ((temp instanceof L2MonsterInstance) && getTargetType().equalsIgnoreCase("npc"))) && (Rnd.get(100) < getChance())) + if ((((temp instanceof L2Playable) && _target.equalsIgnoreCase("pc")) || ((temp instanceof L2PcInstance) && _target.equalsIgnoreCase("pc_only")) || ((temp instanceof L2MonsterInstance) && _target.equalsIgnoreCase("npc"))) && (Rnd.get(100) < _chance)) { L2Skill skill = getSkill(); if (skill == null) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9a116dc393..4f7f6c8a94 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -343,10 +343,6 @@ public final class L2GameClient extends MMOClient> i public void markRestoredChar(int charslot) { // have to make sure active character must be nulled - /* - * if (getActiveChar() != null) { saveCharToDisk (getActiveChar()); if (Config.DEBUG) LOGGER.fine("active Char saved"); this.setActiveChar(null); } - */ - final int objid = getObjectIdForSlot(charslot); if (objid < 0) @@ -485,7 +481,7 @@ public final class L2GameClient extends MMOClient> i { // exploit prevention, should not happens in normal way - LOGGER.warning("Attempt of double login: " + character.getName() + "(" + objId + ") " + getAccountName()); + LOGGER.warning("Attempt of double login: " + character.getName() + "(" + objId + ") " + accountName); if (character.getClient() != null) { @@ -662,7 +658,7 @@ public final class L2GameClient extends MMOClient> i ip = address.getHostAddress(); } - switch (getState()) + switch (_state) { case CONNECTED: { @@ -670,11 +666,11 @@ public final class L2GameClient extends MMOClient> i } case AUTHED: { - return "[Account: " + getAccountName() + " - IP: " + ip + "]"; + return "[Account: " + accountName + " - IP: " + ip + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName()) + " - Account: " + getAccountName() + " - IP: " + ip + "]"; + return "[Character: " + (activeChar == null ? "disconnected" : activeChar.getName()) + " - Account: " + accountName + " - IP: " + ip + "]"; } default: { @@ -700,7 +696,7 @@ public final class L2GameClient extends MMOClient> i // _autoSaveInDB.cancel(true); // - final L2PcInstance player = getActiveChar(); + final L2PcInstance player = activeChar; if (player != null) // this should only happen on connection loss { // we store all data from players who are disconnected while in an event in order to restore it in the next login @@ -787,7 +783,7 @@ public final class L2GameClient extends MMOClient> i // if(_autoSaveInDB != null) // _autoSaveInDB.cancel(true); - L2PcInstance player = getActiveChar(); + L2PcInstance player = activeChar; if (player != null) // this should only happen on connection loss { // we store all data from players who are disconnected while in an event in order to restore it in the next login @@ -840,7 +836,7 @@ public final class L2GameClient extends MMOClient> i && !player.isInOlympiadMode() // && !player.isInFunEvent() // && ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) // - || (player.isInCraftMode() && Config.OFFLINE_CRAFT_ENABLE))) + || (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE))) { if (!Config.OFFLINE_MODE_IN_PEACE_ZONE || (Config.OFFLINE_MODE_IN_PEACE_ZONE && player.isInsideZone(ZoneId.PEACE))) { @@ -851,7 +847,7 @@ public final class L2GameClient extends MMOClient> i if (Config.OFFLINE_MODE_SET_INVULNERABLE) { - getActiveChar().setIsInvul(true); + activeChar.setIsInvul(true); } if (Config.OFFLINE_SET_NAME_COLOR) { @@ -932,7 +928,7 @@ public final class L2GameClient extends MMOClient> i */ public void onBufferUnderflow() { - if (getStats().countUnderflowException()) + if (_stats.countUnderflowException()) { LOGGER.warning("Client " + this + " - Disconnected: Too many buffer underflow exceptions."); closeNow(); @@ -951,16 +947,16 @@ public final class L2GameClient extends MMOClient> i */ public void execute(ReceivablePacket packet) { - if (getStats().countFloods()) + if (_stats.countFloods()) { - LOGGER.warning("Client " + this + " - Disconnected, too many floods:" + getStats().longFloods + " long and " + getStats().shortFloods + " short."); + LOGGER.warning("Client " + this + " - Disconnected, too many floods:" + _stats.longFloods + " long and " + _stats.shortFloods + " short."); closeNow(); return; } if (!_packetQueue.offer(packet)) { - if (getStats().countQueueOverflow()) + if (_stats.countQueueOverflow()) { LOGGER.warning("Client " + this + " - Disconnected, too many queue overflows."); closeNow(); @@ -986,7 +982,7 @@ public final class L2GameClient extends MMOClient> i { if (_state == GameClientState.CONNECTED) { - if (getStats().processedPackets > 3) + if (_stats.processedPackets > 3) { LOGGER.warning("Client " + this + " - Disconnected, too many packets in non-authed state."); closeNow(); @@ -1040,7 +1036,7 @@ public final class L2GameClient extends MMOClient> i } count++; - if (getStats().countBurst(count)) + if (_stats.countBurst(count)) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java index 26457d958b..6a45334b51 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -129,7 +129,7 @@ public final class Logout extends L2GameClientPacket if (Config.OFFLINE_LOGOUT && player.isSitting()) { - if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isInCraftMode() && Config.OFFLINE_CRAFT_ENABLE)) + if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE)) { // Sleep effect, not official feature but however L2OFF features (like offline trade) if (Config.OFFLINE_SLEEP_EFFECT) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 7515863b93..59c5ce4db2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -49,7 +49,7 @@ public final class RequestRecipeItemMakeSelf extends L2GameClientPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("Currently in Craft Mode"); return; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 2910440f11..6d43be6c3e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -69,7 +69,7 @@ public final class RequestRecipeShopMakeItem extends L2GameClientPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("Currently in Craft Mode"); return; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/ScriptPackage.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/ScriptPackage.java index 24db89713c..315e4b4667 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/ScriptPackage.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/ScriptPackage.java @@ -94,26 +94,26 @@ public class ScriptPackage @Override public String toString() { - if (getScriptFiles().isEmpty() && getOtherFiles().isEmpty()) + if (_scriptFiles.isEmpty() && _otherFiles.isEmpty()) { return "Empty Package."; } - String out = "Package Name: " + getName() + "\n"; + String out = "Package Name: " + _name + "\n"; - if (!getScriptFiles().isEmpty()) + if (!_scriptFiles.isEmpty()) { out += "Xml Script Files...\n"; - for (ScriptDocument script : getScriptFiles()) + for (ScriptDocument script : _scriptFiles) { out += script.getName() + "\n"; } } - if (!getOtherFiles().isEmpty()) + if (!_otherFiles.isEmpty()) { out += "Other Files...\n"; - for (String fileName : getOtherFiles()) + for (String fileName : _otherFiles) { out += fileName + "\n"; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptHolder.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptHolder.java index 8f8fd15264..e9cfce62ef 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptHolder.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/scripting/CompiledScriptHolder.java @@ -97,6 +97,6 @@ public class CompiledScriptHolder implements Serializable public boolean matches(File f) { - return (f.lastModified() == getLastModified()) && (f.length() == getSize()); + return (f.lastModified() == _lastModified) && (f.length() == _size); } } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java index 5e035303e9..8a3f6ef09d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/l2skills/L2SkillSummon.java @@ -80,7 +80,7 @@ public class L2SkillSummon extends L2Skill { final L2PcInstance player = (L2PcInstance) activeChar; - if (isCubic()) + if (_isCubic) { if (getTargetType() != L2Skill.SkillTargetType.TARGET_SELF) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/templates/item/L2Item.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/templates/item/L2Item.java index 198e82b136..36dfcf53fa 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/templates/item/L2Item.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/templates/item/L2Item.java @@ -413,7 +413,7 @@ public abstract class L2Item */ public final int getItemGrade() { - return getCrystalType(); + return _crystalType; } /** @@ -439,11 +439,11 @@ public abstract class L2Item case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (crystalEnchantBonusArmor[getCrystalType()] * ((3 * enchantLevel) - 6)); + return _crystalCount + (crystalEnchantBonusArmor[_crystalType] * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (crystalEnchantBonusWeapon[getCrystalType()] * ((2 * enchantLevel) - 3)); + return _crystalCount + (crystalEnchantBonusWeapon[_crystalType] * ((2 * enchantLevel) - 3)); } default: { @@ -458,11 +458,11 @@ public abstract class L2Item case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (crystalEnchantBonusArmor[getCrystalType()] * enchantLevel); + return _crystalCount + (crystalEnchantBonusArmor[_crystalType] * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (crystalEnchantBonusWeapon[getCrystalType()] * enchantLevel); + return _crystalCount + (crystalEnchantBonusWeapon[_crystalType] * enchantLevel); } default: { @@ -568,7 +568,7 @@ public abstract class L2Item public boolean isPotion() { - return (getItemType() == L2EtcItemType.POTION); + return (_type == L2EtcItemType.POTION); } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java index 686de06067..27dcae7c3c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java @@ -65,7 +65,7 @@ public class MinionList int count = 0; synchronized (minionReferences) { - for (L2MinionInstance minion : getSpawnedMinions()) + for (L2MinionInstance minion : minionReferences) { if (minion.getNpcId() == minionId) { @@ -78,7 +78,7 @@ public class MinionList public boolean hasMinions() { - return getSpawnedMinions().size() > 0; + return minionReferences.size() > 0; } public List getSpawnedMinions() @@ -97,7 +97,7 @@ public class MinionList public int lazyCountSpawnedMinionsGroups() { final Set seenGroups = new HashSet<>(); - for (L2MinionInstance minion : getSpawnedMinions()) + for (L2MinionInstance minion : minionReferences) { seenGroups.add(minion.getNpcId()); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MultiSort.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MultiSort.java index d91cfeacc8..1d6140fedb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MultiSort.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/MultiSort.java @@ -106,7 +106,7 @@ public class MultiSort totalValue += 1 / currValue; } - return getCount() / totalValue; + return getValues().size() / totalValue; } public final List getKeys() @@ -141,7 +141,7 @@ public class MultiSort return -1; } - return getTotalValue() / getCount(); + return getTotalValue() / getValues().size(); } public final double getStandardDeviation() @@ -154,7 +154,7 @@ public class MultiSort final List tempValList = new ArrayList<>(); final int meanValue = getMean(); - final int numValues = getCount(); + final int numValues = getValues().size(); for (int value : getValues()) { @@ -226,7 +226,7 @@ public class MultiSort int lastValue = 0; - if (!isSortDescending()) + if (!_isSortDescending) { // If there are no keys, just return the ascendingly sorted values. if (getKeys().isEmpty()) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerTable.java index 77211089f1..6090a8967c 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerTable.java @@ -235,7 +235,7 @@ public class GameServerTable public String getServerNameById(int id) { - return getServerNames().get(id); + return _serverNames.get(id); } public Map getServerNames() diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java index 9d880a06b7..8b67332afa 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/GameServerThread.java @@ -255,12 +255,12 @@ public class GameServerThread extends Thread if (isAuthed()) { - AuthResponse ar = new AuthResponse(getGameServerInfo().getId()); + AuthResponse ar = new AuthResponse(_gsi.getId()); sendPacket(ar); if (Config.DEBUG) { - LOGGER.info("Authed: id: " + getGameServerInfo().getId()); + LOGGER.info("Authed: id: " + _gsi.getId()); } } } @@ -628,12 +628,12 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -656,9 +656,9 @@ public class GameServerThread extends Thread private int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java index 09c9e69fd4..1502dd1545 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/L2LoginClient.java @@ -271,7 +271,7 @@ public final class L2LoginClient extends MMOClient> } LoginController.getInstance().removeLoginClient(this); - if (!hasJoinedGS() && (getAccount() != null)) + if (!_joinedGS && (_account != null)) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } @@ -281,9 +281,9 @@ public final class L2LoginClient extends MMOClient> public String toString() { final InetAddress address = getConnection().getInetAddress(); - if (getState() == LoginClientState.AUTHED_LOGIN) + if (_state == LoginClientState.AUTHED_LOGIN) { - return "[" + getAccount() + " (" + (address == null ? "disconnected" : address.getHostAddress()) + ")]"; + return "[" + _account + " (" + (address == null ? "disconnected" : address.getHostAddress()) + ")]"; } return "[" + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 878c53cfa6..7ec499e39f 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -176,7 +176,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -204,10 +204,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -232,7 +232,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java index d547cdc36c..b733c60ed7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java @@ -73,9 +73,9 @@ public final class HellboundEngine extends AbstractNpcAI if (event.equals(UPDATE_EVENT)) { int level = getLevel(); - if ((level > 0) && (level == getCachedLevel())) + if ((level > 0) && (level == _cachedLevel)) { - if ((getTrust() == getMaxTrust()) && (level != 4)) // Only exclusion is kill of Derek. + if ((getTrust() == _maxTrust) && (level != 4)) // Only exclusion is kill of Derek. { level++; setLevel(level); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java index 4dce8e4a5d..2ac55d99ea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java @@ -542,7 +542,7 @@ public final class Minigame extends AbstractNpcAI _listener = null; } - getManager().setTarget(null); + _manager.setTarget(null); setParticipant(null); setStarted(false); setAttemptNumber(1); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index efdf1501ef..92ea237c71 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -121,7 +121,7 @@ public final class Fishing extends AbstractEffect return; } - if (player.isInCraftMode() || player.isInStoreMode()) + if (player.isCrafting() || player.isInStoreMode()) { player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_MANUFACTURE_OR_PRIVATE_STORE); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 8b6bd6d297..fb8984a956 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -40,7 +40,7 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/PacketReader.java index 9b7823f1b8..14f9538589 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java index a64c2c4225..a7c82d1692 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java @@ -198,7 +198,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -290,7 +290,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -429,7 +429,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); _activeMakers.remove(_player.getObjectId()); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendPacket(new ItemList(_target, false)); } @@ -641,7 +641,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player.getObjectId()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java index 9e87f8c407..1e041f8dd3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java @@ -204,7 +204,7 @@ public class SevenSigns private boolean isNextPeriodChangeInPast() { final Calendar lastPeriodChange = Calendar.getInstance(); - switch (getCurrentPeriod()) + switch (_activePeriod) { case PERIOD_SEAL_VALIDATION: case PERIOD_COMPETITION: @@ -516,7 +516,7 @@ public class SevenSigns { // Calculate the number of days until the next period // A period starts at 18:00 pm (local time), like on official servers. - switch (getCurrentPeriod()) + switch (_activePeriod) { case PERIOD_SEAL_VALIDATION: case PERIOD_COMPETITION: @@ -620,7 +620,7 @@ public class SevenSigns tillDate += ((2 * PERIOD_MAJOR_LENGTH) + (2 * PERIOD_MINOR_LENGTH)); } - switch (getCurrentPeriod()) + switch (_activePeriod) { case PERIOD_COMP_RECRUITING: { @@ -1208,7 +1208,7 @@ public class SevenSigns { SystemMessage sm = null; - switch (getCurrentPeriod()) + switch (_activePeriod) { case PERIOD_COMP_RECRUITING: { @@ -1531,7 +1531,7 @@ public class SevenSigns public void run() { // Remember the period check here refers to the period just ENDED! - final int periodEnded = getCurrentPeriod(); + final int periodEnded = _activePeriod; _activePeriod++; switch (periodEnded) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java index 71a5acb618..a27065bcd3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java @@ -2017,7 +2017,7 @@ public class SevenSignsFestival implements SpawnListener */ public final L2DarknessFestival getFestivalInstance(int oracle, int festivalId) { - if (!isFestivalInitialized()) + if (!_festivalInitialized) { return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 4cb98bf6c5..f29e557b1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -740,7 +740,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -775,7 +775,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -809,7 +809,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player) && _clientMoving) + if (_actor.isVisibleFor(player) && _clientMoving) { if ((_clientMovingToPawnOffset != 0) && (_followTarget != null)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index e450a56200..aeb86f4f82 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -170,7 +170,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getAttackTarget(), max_range); } @@ -217,7 +217,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -257,7 +257,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java index 2deb7d249e..ca2c4a6944 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -61,7 +61,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index dfad9ffa60..424ef40350 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index f8c52d4f1b..ceac41fbe5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -135,7 +135,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -355,7 +355,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 92862dd983..052497331a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -255,7 +255,7 @@ public class RecipeData implements IGameXmlReader if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage(getClass().getSimpleName() + ": No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java index cccf1fd54e..e63ab8bb65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java @@ -257,17 +257,17 @@ public class MerchantPriceConfigTable implements InstanceListManager public boolean hasCastle() { - return getCastle() != null; + return _castle != null; } public double getCastleTaxRate() { - return hasCastle() ? getCastle().getTaxRate() : 0.0; + return hasCastle() ? _castle.getTaxRate() : 0.0; } public int getTotalTax() { - return hasCastle() ? (getCastle().getTaxPercent() + getBaseTax()) : getBaseTax(); + return hasCastle() ? (_castle.getTaxPercent() + _baseTax) : _baseTax; } public double getTotalTaxRate() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2856e2241b..c4d57a56cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index 1209bbbddd..79fa47c121 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -91,7 +91,7 @@ public final class CHSiegeManager public SiegableHall getSiegableHall(int clanHall) { - return getConquerableHalls().get(clanHall); + return _siegableHalls.get(clanHall); } public final SiegableHall getNearbyClanHall(L2Character activeChar) @@ -173,7 +173,7 @@ public final class CHSiegeManager public final boolean isClanParticipating(L2Clan clan) { - for (SiegableHall hall : getConquerableHalls().values()) + for (SiegableHall hall : _siegableHalls.values()) { if ((hall.getSiege() != null) && hall.getSiege().checkIsAttacker(clan)) { @@ -185,7 +185,7 @@ public final class CHSiegeManager public final void onServerShutDown() { - for (SiegableHall hall : getConquerableHalls().values()) + for (SiegableHall hall : _siegableHalls.values()) { // Rainbow springs has his own attackers table if ((hall.getId() == 62) || (hall.getSiege() == null)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 3cb9150afb..ce483a71fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -99,8 +99,8 @@ public final class ClanHallManager ClanHallAuctionManager.getInstance().initNPC(id); } } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getClanHalls().size() + " clan halls"); - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getFreeClanHalls().size() + " free clan halls"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanHall.size() + " clan halls"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _freeClanHall.size() + " free clan halls"); _loaded = true; } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java index 836fd6218d..84da1ae738 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java @@ -57,9 +57,9 @@ public final class CoupleManager { while (rs.next()) { - getCouples().add(new Couple(rs.getInt("id"))); + _couples.add(new Couple(rs.getInt("id"))); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCouples().size() + " couples(s)"); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _couples.size() + " couples(s)"); } catch (Exception e) { @@ -70,7 +70,7 @@ public final class CoupleManager public final Couple getCouple(int coupleId) { final int index = getCoupleIndex(coupleId); - return index >= 0 ? getCouples().get(index) : null; + return index >= 0 ? _couples.get(index) : null; } public void createCouple(L2PcInstance player1, L2PcInstance player2) @@ -84,7 +84,7 @@ public final class CoupleManager final int player2id = player2.getObjectId(); final Couple couple = new Couple(player1, player2); - getCouples().add(couple); + _couples.add(couple); player1.setPartnerId(player2id); player2.setPartnerId(player1id); player1.setCoupleId(couple.getId()); @@ -94,7 +94,7 @@ public final class CoupleManager public void deleteCouple(int coupleId) { final int index = getCoupleIndex(coupleId); - final Couple couple = getCouples().get(index); + final Couple couple = _couples.get(index); if (couple == null) { return; @@ -114,13 +114,13 @@ public final class CoupleManager player2.setCoupleId(0); } couple.divorce(); - getCouples().remove(index); + _couples.remove(index); } public final int getCoupleIndex(int coupleId) { int i = 0; - for (Couple temp : getCouples()) + for (Couple temp : _couples) { if ((temp != null) && (temp.getId() == coupleId)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java index 6325ea375e..e3be1761bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java @@ -49,7 +49,7 @@ public final class FortSiegeGuardManager { try { - final List monsterList = _siegeGuards.get(getFort().getResidenceId()); + final List monsterList = _siegeGuards.get(_fort.getResidenceId()); if (monsterList != null) { for (L2Spawn spawnDat : monsterList) @@ -68,7 +68,7 @@ public final class FortSiegeGuardManager } catch (Exception e) { - LOGGER.log(Level.WARNING, "Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -79,7 +79,7 @@ public final class FortSiegeGuardManager { try { - final List monsterList = _siegeGuards.get(getFort().getResidenceId()); + final List monsterList = _siegeGuards.get(_fort.getResidenceId()); if (monsterList != null) { for (L2Spawn spawnDat : monsterList) @@ -94,7 +94,7 @@ public final class FortSiegeGuardManager } catch (Exception e) { - LOGGER.log(Level.WARNING, "Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -107,7 +107,7 @@ public final class FortSiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -130,7 +130,7 @@ public final class FortSiegeGuardManager } catch (Exception e) { - LOGGER.log(Level.WARNING, "Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 8be4dd799f..11c7456d21 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -961,7 +961,7 @@ public final class FourSepulchersManager } } - if (!isEntryTime()) + if (!_inEntryTime) { showHtmlFile(player, npcId + "-NE.htm", npc, null); return; @@ -1065,7 +1065,7 @@ public final class FourSepulchersManager public void spawnMysteriousBox(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1080,7 +1080,7 @@ public final class FourSepulchersManager public void spawnMonster(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1232,7 +1232,7 @@ public final class FourSepulchersManager public void spawnKeyBox(L2Npc activeChar) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1253,7 +1253,7 @@ public final class FourSepulchersManager public void spawnExecutionerOfHalisha(L2Npc activeChar) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1274,7 +1274,7 @@ public final class FourSepulchersManager public void spawnArchonOfHalisha(int npcId) { - if (!isAttackTime() || _archonSpawned.get(npcId)) + if (!_inAttackTime || _archonSpawned.get(npcId)) { return; } @@ -1301,7 +1301,7 @@ public final class FourSepulchersManager public void spawnEmperorsGraveNpc(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } @@ -1342,7 +1342,7 @@ public final class FourSepulchersManager public void spawnShadow(int npcId) { - if (!isAttackTime()) + if (!_inAttackTime) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 3d83cae120..f5737828fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -100,7 +100,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -113,7 +113,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -126,7 +126,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -139,7 +139,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -152,7 +152,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 3159f8e776..3cada66d57 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -239,14 +239,14 @@ public final class PetitionManager public boolean isPetitionInProcess(int petitionId) { - return isValidPetition(petitionId) && (getPendingPetitions().get(petitionId).getState() == PetitionState.IN_PROCESS); + return isValidPetition(petitionId) && (_pendingPetitions.get(petitionId).getState() == PetitionState.IN_PROCESS); } public boolean isPlayerInConsultation(L2PcInstance player) { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition == null) || (currPetition.getState() != PetitionState.IN_PROCESS)) { @@ -271,7 +271,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -290,7 +290,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -300,7 +300,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -318,7 +318,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -351,12 +351,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -367,7 +367,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -407,7 +407,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -423,7 +423,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 364537156c..5682868358 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -127,12 +127,12 @@ public final class SiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("Delete From castle_siege_guards Where castleId = ? And isHired = 1")) { - ps.setInt(1, getCastle().getResidenceId()); + ps.setInt(1, _castle.getResidenceId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting hired siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error deleting hired siege guard for castle " + _castle.getName() + ": " + e.getMessage(), e); } } @@ -145,7 +145,7 @@ public final class SiegeGuardManager { int hiredCount = 0; final int hiredMax = MercTicketManager.getInstance().getMaxAllowedMerc(_castle.getResidenceId()); - final boolean isHired = getCastle().getOwnerId() > 0; + final boolean isHired = _castle.getOwnerId() > 0; loadSiegeGuard(); for (L2Spawn spawn : _siegeGuardSpawn) { @@ -165,7 +165,7 @@ public final class SiegeGuardManager } catch (Exception e) { - LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error spawning siege guards for castle " + getCastle().getName(), e); + LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error spawning siege guards for castle " + _castle.getName(), e); } } @@ -194,8 +194,8 @@ public final class SiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM castle_siege_guards Where castleId = ? And isHired = ?")) { - ps.setInt(1, getCastle().getResidenceId()); - ps.setInt(2, getCastle().getOwnerId() > 0 ? 1 : 0); + ps.setInt(1, _castle.getResidenceId()); + ps.setInt(2, _castle.getOwnerId() > 0 ? 1 : 0); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -215,7 +215,7 @@ public final class SiegeGuardManager } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for castle " + _castle.getName() + ": " + e.getMessage(), e); } } @@ -233,7 +233,7 @@ public final class SiegeGuardManager try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("Insert Into castle_siege_guards (castleId, npcId, x, y, z, heading, respawnDelay, isHired) Values (?, ?, ?, ?, ?, ?, ?, ?)")) { - ps.setInt(1, getCastle().getResidenceId()); + ps.setInt(1, _castle.getResidenceId()); ps.setInt(2, npcId); ps.setInt(3, x); ps.setInt(4, y); @@ -245,7 +245,7 @@ public final class SiegeGuardManager } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error adding siege guard for castle " + getCastle().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error adding siege guard for castle " + _castle.getName() + ": " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java index f045ab9e91..cbc8554c28 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java @@ -44,7 +44,7 @@ public final class SoDManager _SoDLastStateChangeDate = Calendar.getInstance(); loadData(); handleSodStages(); - LOGGER.info("Seed of Destruction Manager: Loaded. Current stage is: " + getSoDState()); + LOGGER.info("Seed of Destruction Manager: Loaded. Current stage is: " + _SoDState); } public void saveData(byte seedType) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index 82e701a88f..5ff79f8562 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -95,7 +95,7 @@ public final class TerritoryWarManager implements Siegable protected Calendar _startTWDate = Calendar.getInstance(); protected boolean _isRegistrationOver = true; protected boolean _isTWChannelOpen = false; - private boolean _isTWInProgress = false; + boolean _isTWInProgress = false; protected ScheduledFuture _scheduledStartTWTask = null; protected ScheduledFuture _scheduledEndTWTask = null; protected ScheduledFuture _scheduledRewardOnlineTask = null; @@ -376,7 +376,7 @@ public final class TerritoryWarManager implements Siegable ward._npcId = territoryId; ret = spawnNPC(36491 + territoryId, ward.getLocation()); ward.setNPC(ret); - if (!isTWInProgress() && !SPAWN_WARDS_WHEN_TW_IS_NOT_IN_PROGRESS) + if (!_isTWInProgress && !SPAWN_WARDS_WHEN_TW_IS_NOT_IN_PROGRESS) { ret.decayMe(); } @@ -548,7 +548,7 @@ public final class TerritoryWarManager implements Siegable if (twWard.playerId == player.getObjectId()) { twWard.dropIt(); - if (isTWInProgress()) + if (_isTWInProgress) { if (isKilled) { @@ -1236,7 +1236,7 @@ public final class TerritoryWarManager implements Siegable @Override public void run() { - if (isTWInProgress()) + if (_isTWInProgress) { for (L2PcInstance player : L2World.getInstance().getPlayers()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java index 5278dff3ed..f2806360d8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -94,9 +94,9 @@ public class Lottery try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(UPDATE_PRICE)) { - ps.setLong(1, getPrize()); - ps.setLong(2, getPrize()); - ps.setInt(3, getId()); + ps.setLong(1, _prize); + ps.setLong(2, _prize); + ps.setInt(3, _number); ps.execute(); } catch (SQLException e) @@ -172,7 +172,7 @@ public class Lottery _isSellingTickets = true; _isStarted = true; - Broadcast.toAllOnlinePlayers("Lottery tickets are now available for Lucky Lottery #" + getId() + "."); + Broadcast.toAllOnlinePlayers("Lottery tickets are now available for Lucky Lottery #" + _number + "."); final Calendar finishtime = Calendar.getInstance(); finishtime.setTimeInMillis(_enddate); finishtime.set(Calendar.MINUTE, 0); @@ -198,10 +198,10 @@ public class Lottery PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY)) { ps.setInt(1, 1); - ps.setInt(2, getId()); - ps.setLong(3, getEndDate()); - ps.setLong(4, getPrize()); - ps.setLong(5, getPrize()); + ps.setInt(2, _number); + ps.setLong(3, _enddate); + ps.setLong(4, _prize); + ps.setLong(5, _prize); ps.execute(); } catch (SQLException e) @@ -284,7 +284,7 @@ public class Lottery try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_LOTTERY_ITEM)) { - ps.setInt(1, getId()); + ps.setInt(1, _number); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -350,49 +350,49 @@ public class Lottery if (count1 > 0) { - prize1 = (long) (((getPrize() - prize4) * Config.ALT_LOTTERY_5_NUMBER_RATE) / count1); + prize1 = (long) (((_prize - prize4) * Config.ALT_LOTTERY_5_NUMBER_RATE) / count1); } if (count2 > 0) { - prize2 = (long) (((getPrize() - prize4) * Config.ALT_LOTTERY_4_NUMBER_RATE) / count2); + prize2 = (long) (((_prize - prize4) * Config.ALT_LOTTERY_4_NUMBER_RATE) / count2); } if (count3 > 0) { - prize3 = (long) (((getPrize() - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3); + prize3 = (long) (((_prize - prize4) * Config.ALT_LOTTERY_3_NUMBER_RATE) / count3); } - final long newprize = getPrize() - (prize1 + prize2 + prize3 + prize4); + final long newprize = _prize - (prize1 + prize2 + prize3 + prize4); SystemMessage sm; if (count1 > 0) { // There are winners. sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PRIZE_AMOUNT_FOR_THE_WINNER_OF_LOTTERY_S1_IS_S2_ADENA_WE_HAVE_S3_FIRST_PRIZE_WINNERS); - sm.addInt(getId()); - sm.addLong(getPrize()); + sm.addInt(_number); + sm.addLong(_prize); sm.addLong(count1); } else { // There are no winners. sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PRIZE_AMOUNT_FOR_LUCKY_LOTTERY_S1_IS_S2_ADENA_THERE_WAS_NO_FIRST_PRIZE_WINNER_IN_THIS_DRAWING_THEREFORE_THE_JACKPOT_WILL_BE_ADDED_TO_THE_NEXT_DRAWING); - sm.addInt(getId()); - sm.addLong(getPrize()); + sm.addInt(_number); + sm.addLong(_prize); } Broadcast.toAllOnlinePlayers(sm); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(UPDATE_LOTTERY)) { - ps.setLong(1, getPrize()); + ps.setLong(1, _prize); ps.setLong(2, newprize); ps.setInt(3, enchant); ps.setInt(4, type2); ps.setLong(5, prize1); ps.setLong(6, prize2); ps.setLong(7, prize3); - ps.setInt(8, getId()); + ps.setInt(8, _number); ps.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index db711cb586..0972b49a7b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -77,7 +77,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -154,7 +154,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java index e7fab3f163..bb77ad05f3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -174,27 +174,27 @@ public final class CharEffectList final List buffs = new ArrayList<>(); if (hasBuffs()) { - buffs.addAll(getBuffs()); + buffs.addAll(_buffs); } if (hasTriggered()) { - buffs.addAll(getTriggered()); + buffs.addAll(_triggered); } if (hasDances()) { - buffs.addAll(getDances()); + buffs.addAll(_dances); } if (hasToggles()) { - buffs.addAll(getToggles()); + buffs.addAll(_toggles); } if (hasDebuffs()) { - buffs.addAll(getDebuffs()); + buffs.addAll(_debuffs); } return buffs; } @@ -214,27 +214,27 @@ public final class CharEffectList final Queue effects; if (skill.isPassive()) { - effects = getPassives(); + effects = _passives; } else if (skill.isDebuff()) { - effects = getDebuffs(); + effects = _debuffs; } else if (skill.isTriggeredSkill()) { - effects = getTriggered(); + effects = _triggered; } else if (skill.isDance()) { - effects = getDances(); + effects = _dances; } else if (skill.isToggle()) { - effects = getToggles(); + effects = _toggles; } else { - effects = getBuffs(); + effects = _buffs; } return effects; } @@ -250,7 +250,7 @@ public final class CharEffectList { if (hasBuffs()) { - for (BuffInfo info : getBuffs()) + for (BuffInfo info : _buffs) { if (info != null) { @@ -267,7 +267,7 @@ public final class CharEffectList if (hasTriggered()) { - for (BuffInfo info : getTriggered()) + for (BuffInfo info : _triggered) { if (info != null) { @@ -284,7 +284,7 @@ public final class CharEffectList if (hasDances()) { - for (BuffInfo info : getDances()) + for (BuffInfo info : _dances) { if (info != null) { @@ -301,7 +301,7 @@ public final class CharEffectList if (hasToggles()) { - for (BuffInfo info : getToggles()) + for (BuffInfo info : _toggles) { if (info != null) { @@ -318,7 +318,7 @@ public final class CharEffectList if (hasDebuffs()) { - for (BuffInfo info : getDebuffs()) + for (BuffInfo info : _debuffs) { if (info != null) { @@ -357,32 +357,32 @@ public final class CharEffectList BuffInfo info = null; if (hasBuffs()) { - info = getBuffs().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); + info = _buffs.stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); } if (hasTriggered() && (info == null)) { - info = getTriggered().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); + info = _triggered.stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); } if (hasDances() && (info == null)) { - info = getDances().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); + info = _dances.stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); } if (hasToggles() && (info == null)) { - info = getToggles().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); + info = _toggles.stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); } if (hasDebuffs() && (info == null)) { - info = getDebuffs().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); + info = _debuffs.stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); } if (hasPassives() && (info == null)) { - info = getPassives().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); + info = _passives.stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null); } return info; } @@ -486,7 +486,7 @@ public final class CharEffectList */ public int getBuffCount() { - return hasBuffs() ? getBuffs().size() - _hiddenBuffs.get() - (getShortBuff() != null ? 1 : 0) : 0; + return hasBuffs() ? _buffs.size() - _hiddenBuffs.get() - (_shortBuff != null ? 1 : 0) : 0; } /** @@ -496,7 +496,7 @@ public final class CharEffectList */ public int getDanceCount() { - return hasDances() ? getDances().size() : 0; + return hasDances() ? _dances.size() : 0; } /** @@ -506,7 +506,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return hasTriggered() ? getTriggered().size() : 0; + return hasTriggered() ? _triggered.size() : 0; } /** @@ -568,7 +568,7 @@ public final class CharEffectList // If it's an herb that ends, check if there are hidden buffs. if (info.getSkill().isAbnormalInstant() && hasBuffs()) { - for (BuffInfo buff : getBuffs()) + for (BuffInfo buff : _buffs) { if ((buff != null) && (buff.getSkill().getAbnormalType() == info.getSkill().getAbnormalType()) && !buff.isInUse()) { @@ -626,31 +626,31 @@ public final class CharEffectList boolean update = false; if (hasBuffs()) { - getBuffs().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getBuffs())); + _buffs.stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, _buffs)); update = true; } if (hasTriggered()) { - getTriggered().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getTriggered())); + _triggered.stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, _triggered)); update = true; } if (hasDebuffs()) { - getDebuffs().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getDebuffs())); + _debuffs.stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, _debuffs)); update = true; } if (hasDances()) { - getDances().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getDances())); + _dances.stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, _dances)); update = true; } if (hasToggles()) { - getToggles().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getToggles())); + _toggles.stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, _toggles)); update = true; } @@ -666,31 +666,31 @@ public final class CharEffectList boolean update = false; if (hasBuffs()) { - getBuffs().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getBuffs())); + _buffs.stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, _buffs)); update = true; } if (hasTriggered()) { - getTriggered().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getTriggered())); + _triggered.stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, _triggered)); update = true; } if (hasDebuffs()) { - getDebuffs().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getDebuffs())); + _debuffs.stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, _debuffs)); update = true; } if (hasDances()) { - getDances().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getDances())); + _dances.stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, _dances)); update = true; } if (hasToggles()) { - getToggles().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getToggles())); + _toggles.stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, _toggles)); update = true; } @@ -707,12 +707,12 @@ public final class CharEffectList { if (hasBuffs()) { - getBuffs().forEach(b -> stopAndRemove(b, getBuffs())); + _buffs.forEach(b -> stopAndRemove(b, _buffs)); } if (triggered && hasTriggered()) { - getTriggered().forEach(b -> stopAndRemove(b, getTriggered())); + _triggered.forEach(b -> stopAndRemove(b, _triggered)); } // Update effect flags and icons. @@ -738,7 +738,7 @@ public final class CharEffectList { return; } - getToggles().forEach(b -> stopAndRemove(b, getToggles())); + _toggles.forEach(b -> stopAndRemove(b, _toggles)); // Update effect flags and icons. updateEffectList(update); } @@ -753,7 +753,7 @@ public final class CharEffectList { return; } - getDances().forEach(b -> stopAndRemove(b, getDances())); + _dances.forEach(b -> stopAndRemove(b, _dances)); // Update effect flags and icons. updateEffectList(update); } @@ -768,7 +768,7 @@ public final class CharEffectList { return; } - getDebuffs().forEach(b -> stopAndRemove(b, getDebuffs())); + _debuffs.forEach(b -> stopAndRemove(b, _debuffs)); // Update effect flags and icons. updateEffectList(update); } @@ -791,31 +791,31 @@ public final class CharEffectList if (hasBuffs()) { - getBuffs().stream().filter(Objects::nonNull).forEach(action); + _buffs.stream().filter(Objects::nonNull).forEach(action); update = true; } if (hasTriggered()) { - getTriggered().stream().filter(Objects::nonNull).forEach(action); + _triggered.stream().filter(Objects::nonNull).forEach(action); update = true; } if (hasDances()) { - getDances().stream().filter(Objects::nonNull).forEach(action); + _dances.stream().filter(Objects::nonNull).forEach(action); update = true; } if (hasToggles()) { - getToggles().stream().filter(Objects::nonNull).forEach(action); + _toggles.stream().filter(Objects::nonNull).forEach(action); update = true; } if (hasDebuffs()) { - getDebuffs().stream().filter(Objects::nonNull).forEach(action); + _debuffs.stream().filter(Objects::nonNull).forEach(action); update = true; } @@ -900,31 +900,31 @@ public final class CharEffectList boolean update = false; if (hasBuffs()) { - getBuffs().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getBuffs())); + _buffs.stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, _buffs)); update = true; } if (hasTriggered()) { - getTriggered().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getTriggered())); + _triggered.stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, _triggered)); update = true; } if (hasDebuffs()) { - getDebuffs().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getDebuffs())); + _debuffs.stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, _debuffs)); update = true; } if (hasDances()) { - getDances().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getDances())); + _dances.stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, _dances)); update = true; } if (hasToggles()) { - getToggles().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getToggles())); + _toggles.stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, _toggles)); update = true; } @@ -944,32 +944,32 @@ public final class CharEffectList { if (hasBuffs()) { - getBuffs().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getBuffs())); + _buffs.stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, _buffs)); update = true; } if (hasTriggered()) { - getTriggered().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getTriggered())); + _triggered.stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, _triggered)); update = true; } if (hasDances()) { - getDances().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getDances())); + _dances.stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, _dances)); update = true; } if (hasToggles()) { - getToggles().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getToggles())); + _toggles.stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, _toggles)); update = true; } } if (_hasDebuffsRemovedOnDamage && hasDebuffs()) { - getDebuffs().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getDebuffs())); + _debuffs.stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, _debuffs)); update = true; } // Update effect flags and icons. @@ -1070,7 +1070,7 @@ public final class CharEffectList boolean update = false; if (hasBuffs()) { - for (BuffInfo info : getBuffs()) + for (BuffInfo info : _buffs) { update |= function.apply(info); } @@ -1078,7 +1078,7 @@ public final class CharEffectList if (hasTriggered()) { - for (BuffInfo info : getTriggered()) + for (BuffInfo info : _triggered) { update |= function.apply(info); } @@ -1086,7 +1086,7 @@ public final class CharEffectList if (dances && hasDances()) { - for (BuffInfo info : getDances()) + for (BuffInfo info : _dances) { update |= function.apply(info); } @@ -1094,7 +1094,7 @@ public final class CharEffectList if (hasToggles()) { - for (BuffInfo info : getToggles()) + for (BuffInfo info : _toggles) { update |= function.apply(info); } @@ -1102,7 +1102,7 @@ public final class CharEffectList if (hasDebuffs()) { - for (BuffInfo info : getDebuffs()) + for (BuffInfo info : _debuffs) { update |= function.apply(info); } @@ -1163,15 +1163,15 @@ public final class CharEffectList } // Puts the effects in the list. - getPassives().stream().filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> + _passives.stream().filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> { // Removes the old stats from the creature if the skill was present. b.setInUse(false); b.removeStats(); - getPassives().remove(b); + _passives.remove(b); }); - getPassives().add(info); + _passives.add(info); // Initialize effects. info.initializeEffects(); @@ -1347,7 +1347,7 @@ public final class CharEffectList // Buffs. if (hasBuffs()) { - for (BuffInfo info : getBuffs()) + for (BuffInfo info : _buffs) { if (info.getSkill().isHealingPotionSkill()) { @@ -1363,7 +1363,7 @@ public final class CharEffectList // Triggered buffs. if (hasTriggered()) { - for (BuffInfo info : getTriggered()) + for (BuffInfo info : _triggered) { addIcon(info, asu, ps, psSummon, os, isSummon); } @@ -1372,7 +1372,7 @@ public final class CharEffectList // Songs and dances. if (hasDances()) { - for (BuffInfo info : getDances()) + for (BuffInfo info : _dances) { addIcon(info, asu, ps, psSummon, os, isSummon); } @@ -1381,7 +1381,7 @@ public final class CharEffectList // Toggles. if (hasToggles()) { - for (BuffInfo info : getToggles()) + for (BuffInfo info : _toggles) { addIcon(info, asu, ps, psSummon, os, isSummon); } @@ -1390,7 +1390,7 @@ public final class CharEffectList // Debuffs. if (hasDebuffs()) { - for (BuffInfo info : getDebuffs()) + for (BuffInfo info : _debuffs) { addIcon(info, asu, ps, psSummon, os, isSummon); } @@ -1489,7 +1489,7 @@ public final class CharEffectList { if (hasBuffs()) { - for (BuffInfo info : getBuffs()) + for (BuffInfo info : _buffs) { if (info == null) { @@ -1510,7 +1510,7 @@ public final class CharEffectList if (hasTriggered()) { - for (BuffInfo info : getTriggered()) + for (BuffInfo info : _triggered) { if (info == null) { @@ -1531,7 +1531,7 @@ public final class CharEffectList if (hasToggles()) { - for (BuffInfo info : getToggles()) + for (BuffInfo info : _toggles) { if (info == null) { @@ -1552,7 +1552,7 @@ public final class CharEffectList if (hasDebuffs()) { - for (BuffInfo info : getDebuffs()) + for (BuffInfo info : _debuffs) { if ((info != null) && info.getSkill().isRemovedOnDamage()) { @@ -1571,7 +1571,7 @@ public final class CharEffectList int flags = 0; if (hasBuffs()) { - for (BuffInfo info : getBuffs()) + for (BuffInfo info : _buffs) { if (info != null) { @@ -1585,7 +1585,7 @@ public final class CharEffectList if (hasTriggered()) { - for (BuffInfo info : getTriggered()) + for (BuffInfo info : _triggered) { if (info != null) { @@ -1599,7 +1599,7 @@ public final class CharEffectList if (hasDebuffs()) { - for (BuffInfo info : getDebuffs()) + for (BuffInfo info : _debuffs) { if (info != null) { @@ -1613,7 +1613,7 @@ public final class CharEffectList if (hasDances()) { - for (BuffInfo info : getDances()) + for (BuffInfo info : _dances) { if (info != null) { @@ -1627,7 +1627,7 @@ public final class CharEffectList if (hasToggles()) { - for (BuffInfo info : getToggles()) + for (BuffInfo info : _toggles) { if (info != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java index bc3506068c..96c8647425 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -73,7 +73,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java index f58cc60851..cadd146a2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -166,7 +166,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); } /** @@ -226,7 +226,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -262,7 +262,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -555,7 +555,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -593,7 +593,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -613,7 +613,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -873,8 +873,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -917,8 +917,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -935,8 +935,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -965,15 +965,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1002,19 +1002,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1060,7 +1060,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1073,12 +1073,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1098,7 +1098,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1135,7 +1135,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1166,7 +1166,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1222,7 +1222,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1333,7 +1333,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1341,7 +1341,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1578,7 +1578,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1767,7 +1767,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1857,7 +1857,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW); return null; @@ -1866,7 +1866,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1881,11 +1881,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1951,7 +1951,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1967,7 +1967,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2016,7 +2016,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2053,7 +2053,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2093,12 +2093,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2172,7 +2172,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2209,7 +2209,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2241,7 +2241,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2393,22 +2393,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2429,7 +2429,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2443,12 +2443,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2487,7 +2487,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2495,7 +2495,7 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; - switch (getLevel()) + switch (_level) { case 0: { @@ -2593,9 +2593,9 @@ public class L2Clan implements IIdentifiable, INamable case 5: { // Upgrade to 6 - if ((getReputationScore() >= Config.CLAN_LEVEL_6_COST) && (getMembersCount() >= Config.CLAN_LEVEL_6_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_6_COST) && (_members.size() >= Config.CLAN_LEVEL_6_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_6_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE); cr.addInt(Config.CLAN_LEVEL_6_COST); player.sendPacket(cr); @@ -2606,9 +2606,9 @@ public class L2Clan implements IIdentifiable, INamable case 6: { // Upgrade to 7 - if ((getReputationScore() >= Config.CLAN_LEVEL_7_COST) && (getMembersCount() >= Config.CLAN_LEVEL_7_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_7_COST) && (_members.size() >= Config.CLAN_LEVEL_7_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_7_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE); cr.addInt(Config.CLAN_LEVEL_7_COST); player.sendPacket(cr); @@ -2619,9 +2619,9 @@ public class L2Clan implements IIdentifiable, INamable case 7: { // Upgrade to 8 - if ((getReputationScore() >= Config.CLAN_LEVEL_8_COST) && (getMembersCount() >= Config.CLAN_LEVEL_8_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_8_COST) && (_members.size() >= Config.CLAN_LEVEL_8_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_8_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE); cr.addInt(Config.CLAN_LEVEL_8_COST); player.sendPacket(cr); @@ -2632,12 +2632,12 @@ public class L2Clan implements IIdentifiable, INamable case 8: { // Upgrade to 9 - if ((getReputationScore() >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (getMembersCount() >= Config.CLAN_LEVEL_9_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT)) { // itemId 9910 == Blood Oath if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE); cr.addInt(Config.CLAN_LEVEL_9_COST); player.sendPacket(cr); @@ -2653,12 +2653,12 @@ public class L2Clan implements IIdentifiable, INamable case 9: { // Upgrade to 10 - if ((getReputationScore() >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (getMembersCount() >= Config.CLAN_LEVEL_10_REQUIREMENT)) + if ((_reputationScore >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (_members.size() >= Config.CLAN_LEVEL_10_REQUIREMENT)) { // itemId 9911 == Blood Alliance if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE); cr.addInt(Config.CLAN_LEVEL_10_COST); player.sendPacket(cr); @@ -2683,9 +2683,9 @@ public class L2Clan implements IIdentifiable, INamable break; } } - if (hasTerritory && (getReputationScore() >= Config.CLAN_LEVEL_11_COST) && (getMembersCount() >= Config.CLAN_LEVEL_11_REQUIREMENT)) + if (hasTerritory && (_reputationScore >= Config.CLAN_LEVEL_11_COST) && (_members.size() >= Config.CLAN_LEVEL_11_REQUIREMENT)) { - setReputationScore(getReputationScore() - Config.CLAN_LEVEL_11_COST, true); + setReputationScore(_reputationScore - Config.CLAN_LEVEL_11_COST, true); final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE); cr.addInt(Config.CLAN_LEVEL_11_COST); player.sendPacket(cr); @@ -2712,7 +2712,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(new ItemList(player, false)); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2725,7 +2725,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2735,9 +2735,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2760,7 +2760,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2771,12 +2771,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2793,15 +2793,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2843,7 +2843,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2854,12 +2854,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index 876d50e7cd..c87a02686a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Crest.java index 61589f3602..65e880606e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,24 +94,24 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - activeChar.sendPacket(new ExPledgeEmblem(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + activeChar.sendPacket(new ExPledgeEmblem(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java index 1105b77ed5..c32500ec02 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Object.java @@ -150,15 +150,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -182,7 +177,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -244,7 +239,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -627,7 +622,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading(), getInstanceId()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get(), _instanceId.get()); } /** @@ -675,13 +670,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -719,7 +713,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public void setInstanceId(int instanceId) { - if ((instanceId < 0) || (getInstanceId() == instanceId)) + if ((instanceId < 0) || (_instanceId.get() == instanceId)) { return; } @@ -734,9 +728,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (isPlayer()) { final L2PcInstance player = getActingPlayer(); - if ((getInstanceId() > 0) && (oldI != null)) + if ((_instanceId.get() > 0) && (oldI != null)) { - oldI.removePlayer(getObjectId()); + oldI.removePlayer(_objectId); if (oldI.isShowTimer()) { sendInstanceUpdate(oldI, true); @@ -744,7 +738,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab } if (instanceId > 0) { - newI.addPlayer(getObjectId()); + newI.addPlayer(_objectId); if (newI.isShowTimer()) { sendInstanceUpdate(newI, false); @@ -758,7 +752,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab else if (isNpc()) { final L2Npc npc = (L2Npc) this; - if ((getInstanceId() > 0) && (oldI != null)) + if ((_instanceId.get() > 0) && (oldI != null)) { oldI.removeNpc(npc); } @@ -826,7 +820,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -896,7 +890,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -920,19 +914,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -944,6 +937,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java index 5aef8ac62a..db35e3c4ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java @@ -156,7 +156,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -183,7 +183,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -248,7 +248,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -267,7 +267,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -282,7 +282,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -293,14 +293,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if ((pMember != null) && pMember.hasSummon()) { @@ -316,7 +316,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -337,7 +337,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -396,19 +396,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isFestivalParticipant()) @@ -473,25 +473,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(new ExCloseMPCC()); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -553,7 +553,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -563,9 +563,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -598,7 +598,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -712,7 +712,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -828,11 +828,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java index 163a26b3a4..4ca60782ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -473,7 +473,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable // Call the constructor of the L2Npc final L2Npc npc = _constructor.newInstance(_template); - npc.setInstanceId(getInstanceId()); // Must be done before object is spawned into visible world + npc.setInstanceId(_location.getInstanceId()); // Must be done before object is spawned into visible world if (isSummonSpawn) { npc.setShowSummonAnimation(isSummonSpawn); @@ -507,7 +507,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocy = loc.getY(); newlocz = loc.getZ(); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -515,9 +515,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -547,16 +547,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable npc.getVariables().getSet().clear(); } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } if (npc instanceof L2Attackable) @@ -567,7 +567,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (npc.isMonster() && !getTemplate().isUndying() && !npc.isRaid() && !npc.isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (npc.getLevel() >= Config.CHAMP_MIN_LVL) && (npc.getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (npc.isMonster() && !_template.isUndying() && !npc.isRaid() && !npc.isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (npc.getLevel() >= Config.CHAMP_MIN_LVL) && (npc.getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (_location.getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -733,6 +733,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 3d24bfceb1..722c509db4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java index dc1266c27b..64ca59fe1d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Location.java @@ -210,6 +210,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading + " InstanceId: " + _instanceId; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading + " InstanceId: " + _instanceId; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java index e389bea0c3..98acd02709 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -135,16 +135,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -198,14 +198,14 @@ public final class MobGroup public L2ControllableMobInstance getRandomMob() { removeDead(); - return getActiveMobCount() == 0 ? null : getMobs().get(Rnd.nextInt(getActiveMobCount())); + return getMobs().size() == 0 ? null : getMobs().get(Rnd.nextInt(getMobs().size())); } public void unspawnGroup() { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroupTable.java index f37f2159e4..b0e48ce3dc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Petition.java index e8471bb1da..8ddc563b79 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENDING_PETITION_CONSULTATION_WITH_C1); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java index dbb6f584cf..94618423c6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java @@ -197,7 +197,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -211,13 +211,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -267,7 +267,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -314,7 +314,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -606,12 +606,12 @@ public class TradeList if (!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()) || !partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } else if (!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())) || !partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -620,7 +620,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); _owner.sendPacket(ownerIU != null ? ownerIU : new ItemList(_owner, false)); @@ -638,7 +638,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -694,7 +694,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index ada542e319..2ec0adb64a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -232,7 +232,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double damage, L2Character attacker, boolean awake, boolean isDOT, Skill skill) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -452,7 +452,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -461,8 +461,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -558,7 +558,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -569,8 +569,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -959,7 +959,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -999,7 +999,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1009,7 +1009,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion() && (drop.getCount() > 0)) + if (_isRaid && !_isRaidMinion && (drop.getCount() > 0)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2); sm.addString(getName()); @@ -1021,7 +1021,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (!Config.CHAMPION_ENABLE || !isChampion() || ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE <= 0) && (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE <= 0))) + if (!Config.CHAMPION_ENABLE || !_champion || ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE <= 0) && (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE <= 0))) { return; } @@ -1201,7 +1201,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() == getSpoilerObjectId()) || sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() == _spoilerObjectId) || sweeper.isInLooterParty(_spoilerObjectId)) { return true; } @@ -1405,7 +1405,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1695,7 +1695,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 48ab1e9427..ceb802e7b1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -481,7 +481,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -516,7 +516,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -581,8 +581,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -622,19 +622,19 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void broadcastStatusUpdate() { - if (getStatus().getStatusListener().isEmpty() || !needHpUpdate()) + if (_status.getStatusListener().isEmpty() || !needHpUpdate()) { return; } // Create the Server->Client packet StatusUpdate with current HP final StatusUpdate su = new StatusUpdate(this); - su.addAttribute(StatusUpdate.MAX_HP, getMaxHp()); - su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp()); + su.addAttribute(StatusUpdate.MAX_HP, _stat.getMaxHp()); + su.addAttribute(StatusUpdate.CUR_HP, (int) _status.getCurrentHp()); // Go through the StatusListener // Send the Server->Client packet StatusUpdate with current HP and MP - for (L2Character temp : getStatus().getStatusListener()) + for (L2Character temp : _status.getStatusListener()) { if (temp != null) { @@ -808,7 +808,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } mpConsume = (int) calcStat(Stats.BOW_MP_CONSUME_RATE, mpConsume, null, null); - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -820,7 +820,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } // Set the period of bow no re-use @@ -1340,8 +1340,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private boolean doAttackHitByPole(Attack attack, L2Character target, int sAtk) { // double angleChar; - final int maxRadius = getStat().getPhysicalAttackRange(); - final int maxAngleDiff = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRange(); + final int maxAngleDiff = _stat.getPhysicalAttackAngle(); // o1 x: 83420 y: 148158 (Giran) // o2 x: 83379 y: 148081 (Giran) @@ -1368,7 +1368,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // angleChar = Util.convertHeadingToDegree(getHeading()); // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - final int attackRandomCountMax = (int) getStat().calcStat(Stats.ATTACK_COUNT_MAX, 1, null, null); + final int attackRandomCountMax = (int) _stat.calcStat(Stats.ATTACK_COUNT_MAX, 1, null, null); int attackcount = 0; // if (angleChar <= 0) angleChar += 360; @@ -1392,7 +1392,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe continue; } - if (isAttackable() && obj.isPlayer() && getTarget().isAttackable()) + if (isAttackable() && obj.isPlayer() && _target.isAttackable()) { continue; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - target = (L2Character) getTarget(); + target = (L2Character) _target; } } } @@ -1741,7 +1741,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // queue herbs and potions - if (isCastingSimultaneouslyNow() && simultaneously) + if (_isCastingSimultaneouslyNow && simultaneously) { ThreadPool.schedule(() -> beginCast(skill, simultaneously, target, targets), 100); return; @@ -1795,12 +1795,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Check if this skill consume mp on start casting - final int initmpcons = getStat().getMpInitialConsume(skill); + final int initmpcons = _stat.getMpInitialConsume(skill); if (initmpcons > 0) { - getStatus().reduceMp(initmpcons); + _status.reduceMp(initmpcons); final StatusUpdate su = new StatusUpdate(this); - su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp()); + su.addAttribute(StatusUpdate.CUR_MP, (int) _status.getCurrentMp()); sendPacket(su); } @@ -1965,7 +1965,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Check if the caster has enough MP - if (getCurrentMp() < (getStat().getMpConsume(skill) + getStat().getMpInitialConsume(skill))) + if (_status.getCurrentMp() < (_stat.getMpConsume(skill) + _stat.getMpInitialConsume(skill))) { // Send a System Message to the caster sendPacket(SystemMessageId.NOT_ENOUGH_MP); @@ -1976,7 +1976,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Check if the caster has enough HP - if (getCurrentHp() <= skill.getHpConsume()) + if (_status.getCurrentHp() <= skill.getHpConsume()) { // Send a System Message to the caster sendPacket(SystemMessageId.NOT_ENOUGH_HP); @@ -2402,7 +2402,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -2419,7 +2419,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); stopAllEffectsExceptThoseThatLastThroughDeath(); @@ -2481,26 +2481,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -2651,7 +2651,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || isStunned() || isSleeping() || isAttackingNow() || isAlikeDead() || isParalyzed() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || isStunned() || isSleeping() || isAttackingNow() || isAlikeDead() || isParalyzed() || isPhysicalAttackMuted() || _AIdisabled; } public final Calculator[] getCalculators() @@ -2716,7 +2716,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return isStunned() || isRooted() || isSleeping() || isOverloaded() || isParalyzed() || isImmobilized() || isAlikeDead() || isTeleporting(); + return isStunned() || isRooted() || isSleeping() || _isOverloaded || isParalyzed() || _isImmobilized || isAlikeDead() || _isTeleporting; } /** @@ -2753,7 +2753,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2819,7 +2819,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2844,7 +2844,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -3052,15 +3052,15 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (ave.isEvent()) { - return (getAbnormalVisualEffectEvent() & ave.getMask()) == ave.getMask(); + return (_abnormalVisualEffectsEvent & ave.getMask()) == ave.getMask(); } if (ave.isSpecial()) { - return (getAbnormalVisualEffectSpecial() & ave.getMask()) == ave.getMask(); + return (_abnormalVisualEffectsSpecial & ave.getMask()) == ave.getMask(); } - return (getAbnormalVisualEffects() & ave.getMask()) == ave.getMask(); + return (_abnormalVisualEffects & ave.getMask()) == ave.getMask(); } /** @@ -3289,7 +3289,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopSkillEffects(false, AbnormalType.TRANSFORM); + _effectList.stopSkillEffects(false, AbnormalType.TRANSFORM); } // if this is a player instance, then untransform, also set the transform_id column equal to 0 if not cursed. @@ -3634,11 +3634,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (stat == Stats.POWER_ATTACK_SPEED) { - su.addAttribute(StatusUpdate.ATK_SPD, (int) getPAtkSpd()); + su.addAttribute(StatusUpdate.ATK_SPD, (int) _stat.getPAtkSpd()); } else if (stat == Stats.MAGIC_ATTACK_SPEED) { - su.addAttribute(StatusUpdate.CAST_SPD, getMAtkSpd()); + su.addAttribute(StatusUpdate.CAST_SPD, _stat.getMAtkSpd()); } else if (stat == Stats.MOVE_SPEED) { @@ -3680,7 +3680,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -3842,7 +3842,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final void abortCast() { - if (isCastingNow() || isCastingSimultaneouslyNow()) + if (_isCastingNow || _isCastingSimultaneouslyNow) { Future future = _skillCast; // cancels the skill hit scheduled task @@ -3949,7 +3949,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided && !isFloating) @@ -3964,7 +3964,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -4168,7 +4168,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -4195,7 +4195,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -4273,7 +4273,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -4402,7 +4402,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -4449,7 +4449,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -4769,11 +4769,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!isBow) // Do not absorb if weapon is of type bow { // Absorb HP from the damage inflicted - double absorbPercent = getStat().calcStat(Stats.ABSORB_DAMAGE_PERCENT, 0, null, null); + double absorbPercent = _stat.calcStat(Stats.ABSORB_DAMAGE_PERCENT, 0, null, null); if (absorbPercent > 0) { - final int maxCanAbsorb = (int) (getMaxRecoverableHp() - getCurrentHp()); + final int maxCanAbsorb = (int) (_stat.getMaxRecoverableHp() - _status.getCurrentHp()); int absorbDamage = (int) ((absorbPercent / 100.) * damage); if (absorbDamage > maxCanAbsorb) @@ -4783,16 +4783,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted - absorbPercent = getStat().calcStat(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0, null, null); + absorbPercent = _stat.calcStat(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0, null, null); if (absorbPercent > 0) { - final int maxCanAbsorb = (int) (getMaxRecoverableMp() - getCurrentMp()); + final int maxCanAbsorb = (int) (_stat.getMaxRecoverableMp() - _status.getCurrentMp()); int absorbDamage = (int) ((absorbPercent / 100.) * damage); if (absorbDamage > maxCanAbsorb) @@ -4802,7 +4802,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } @@ -4876,7 +4876,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void breakCast() { // damage can only cancel magical & static skills - if (isCastingNow() && canAbortCast() && (getLastSkillCast() != null) && (getLastSkillCast().isMagic() || getLastSkillCast().isStatic())) + if (_isCastingNow && canAbortCast() && (_lastSkillCast != null) && (_lastSkillCast.isMagic() || _lastSkillCast.isStatic())) { // Abort the cast of the L2Character and send Server->Client MagicSkillCanceld/ActionFailed packet. abortCast(); @@ -5044,7 +5044,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public int calculateTimeBetweenAttacks() { - return (int) (500000 / getPAtkSpd()); + return (int) (500000 / _stat.getPAtkSpd()); } /** @@ -5059,11 +5059,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { case BOW: { - return (int) ((1500 * 333 * getStat().getWeaponReuseModifier(null)) / getStat().getPAtkSpd()); + return (int) ((1500 * 333 * _stat.getWeaponReuseModifier(null)) / _stat.getPAtkSpd()); } case CROSSBOW: { - return (int) ((1200 * 333 * getStat().getWeaponReuseModifier(null)) / getStat().getPAtkSpd()); + return (int) ((1200 * 333 * _stat.getWeaponReuseModifier(null)) / _stat.getPAtkSpd()); } } } @@ -5073,7 +5073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return 0; } - return (int) ((weapon.getReuseDelay() * 333) / getPAtkSpd()); + return (int) ((weapon.getReuseDelay() * 333) / _stat.getPAtkSpd()); } /** @@ -5140,16 +5140,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (oldSkill != null) { // Stop casting if this skill is used right now - if ((getLastSkillCast() != null) && isCastingNow()) + if ((_lastSkillCast != null) && _isCastingNow) { - if (oldSkill.getId() == getLastSkillCast().getId()) + if (oldSkill.getId() == _lastSkillCast.getId()) { abortCast(); } } - if ((getLastSimultaneousSkillCast() != null) && isCastingSimultaneouslyNow()) + if ((_lastSimultaneousSkillCast != null) && _isCastingSimultaneouslyNow) { - if (oldSkill.getId() == getLastSimultaneousSkillCast().getId()) + if (oldSkill.getId() == _lastSimultaneousSkillCast.getId()) { abortCast(); } @@ -5288,7 +5288,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (target instanceof L2Character) { - if (!isInsideRadius(target.getX(), target.getY(), target.getZ(), escapeRange + getTemplate().getCollisionRadius(), true, false)) + if (!isInsideRadius(target.getX(), target.getY(), target.getZ(), escapeRange + _template.getCollisionRadius(), true, false)) { skipRange++; continue; @@ -5350,7 +5350,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Ensure that a cast is in progress // Check if player is using fake death. // Static skills can be used while faking death. - if ((mut.isSimultaneous() && !isCastingSimultaneouslyNow()) || (!mut.isSimultaneous() && !isCastingNow()) || (isAlikeDead() && !skill.isStatic())) + if ((mut.isSimultaneous() && !_isCastingSimultaneouslyNow) || (!mut.isSimultaneous() && !_isCastingNow) || (isAlikeDead() && !skill.isStatic())) { // now cancels both, simultaneous and normal getAI().notifyEvent(CtrlEvent.EVT_CANCEL); @@ -5417,19 +5417,19 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean isSendStatus = false; // Consume MP of the L2Character and Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform - final double mpConsume = getStat().getMpConsume(skill); + final double mpConsume = _stat.getMpConsume(skill); if (mpConsume > 0) { - if (mpConsume > getCurrentMp()) + if (mpConsume > _status.getCurrentMp()) { sendPacket(SystemMessageId.NOT_ENOUGH_MP); abortCast(); return; } - getStatus().reduceMp(mpConsume); - su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp()); + _status.reduceMp(mpConsume); + su.addAttribute(StatusUpdate.CUR_MP, (int) _status.getCurrentMp()); isSendStatus = true; } @@ -5438,16 +5438,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { final double consumeHp = skill.getHpConsume(); - if (consumeHp >= getCurrentHp()) + if (consumeHp >= _status.getCurrentHp()) { sendPacket(SystemMessageId.NOT_ENOUGH_HP); abortCast(); return; } - getStatus().reduceHp(consumeHp, this, true); + _status.reduceHp(consumeHp, this, true); - su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp()); + su.addAttribute(StatusUpdate.CUR_HP, (int) _status.getCurrentHp()); isSendStatus = true; } @@ -5535,7 +5535,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Attack target after skill use - if ((skill.nextActionIsAttack()) && (getTarget() instanceof L2Character) && (getTarget() != this) && (target != null) && (getTarget() == target) && target.canBeAttacked()) + if ((skill.nextActionIsAttack()) && (_target instanceof L2Character) && (_target != this) && (target != null) && (_target == target) && target.canBeAttacked()) { if ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)) { @@ -5869,7 +5869,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isBehindTarget() { - return isBehind(getTarget()); + return isBehind(_target); } /** @@ -5928,7 +5928,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isInFrontOfTarget() { - final L2Object target = getTarget(); + final L2Object target = _target; if (target instanceof L2Character) { return isInFrontOf((L2Character) target); @@ -6005,189 +6005,189 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final double calcStat(Stats stat, double init) { - return getStat().calcStat(stat, init, null, null); + return _stat.calcStat(stat, init, null, null); } // Stat - NEED TO REMOVE ONCE L2CHARSTAT IS COMPLETE public final double calcStat(Stats stat, double init, L2Character target, Skill skill) { - return getStat().calcStat(stat, init, target, skill); + return _stat.calcStat(stat, init, target, skill); } public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public final float getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(L2Character target, double init) { - return getStat().getCriticalDmg(target, init); + return _stat.getCriticalDmg(target, init); } public int getCriticalHit(L2Character target, Skill skill) { - return getStat().getCriticalHit(target, skill); + return _stat.getCriticalHit(target, skill); } public int getEvasionRate(L2Character target) { - return getStat().getEvasionRate(target); + return _stat.getEvasionRate(target); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public double getMAtk(L2Character target, Skill skill) { - return getStat().getMAtk(target, skill); + return _stat.getMAtk(target, skill); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit(L2Character target, Skill skill) { - return getStat().getMCriticalHit(target, skill); + return _stat.getMCriticalHit(target, skill); } public double getMDef(L2Character target, Skill skill) { - return getStat().getMDef(target, skill); + return _stat.getMDef(target, skill); } public double getMReuseRate(Skill skill) { - return getStat().getMReuseRate(skill); + return _stat.getMReuseRate(skill); } public double getPAtk(L2Character target) { - return getStat().getPAtk(target); + return _stat.getPAtk(target); } public double getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public double getPDef(L2Character target) { - return getStat().getPDef(target); + return _stat.getPDef(target); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void reduceCurrentHp(double i, L2Character attacker, Skill skill) @@ -6204,63 +6204,63 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(i / Config.CHAMPION_HP, attacker, awake, isDOT, false); + _status.reduceHp(i / Config.CHAMPION_HP, attacker, awake, isDOT, false); } else { - getStatus().reduceHp(i, attacker, awake, isDOT, false); + _status.reduceHp(i, attacker, awake, isDOT, false); } } public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } /** @@ -6325,17 +6325,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public byte getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(byte attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(byte defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -6634,7 +6634,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { return weapon.getItemType(); } - return getTemplate().getBaseAttackType(); + return _template.getBaseAttackType(); } public final boolean isInCategory(CategoryType type) @@ -6747,7 +6747,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -6777,7 +6777,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Decoy.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Decoy.java index c0a20f019d..c490a68d16 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Decoy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Decoy.java @@ -162,18 +162,18 @@ public abstract class L2Decoy extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 88d7d9b78b..a6d66df2d2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -309,7 +309,7 @@ public class L2Npc extends L2Character */ public boolean isRandomAnimationEnabled() { - return !isFakePlayer() && _isRandomAnimationEnabled; + return !_isFakePlayer && _isRandomAnimationEnabled; } public void setRandomWalking(boolean enabled) @@ -421,7 +421,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -562,7 +562,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -708,13 +708,13 @@ public class L2Npc extends L2Character { // if (canInteract(player)) { - if (isBusy() && (getBusyMessage().length() > 0)) + if (_isBusy && (_busyMessage.length() > 0)) { player.sendPacket(ActionFailed.STATIC_PACKET); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player, "data/html/npcbusy.htm"); - html.replace("%busymessage%", getBusyMessage()); + html.replace("%busymessage%", _busyMessage); html.replace("%npcname%", getName()); html.replace("%playername%", player.getName()); player.sendPacket(html); @@ -895,7 +895,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -1224,7 +1224,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getKarma() < 0)) @@ -1346,7 +1346,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1431,7 +1431,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1506,7 +1506,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1558,7 +1558,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1649,7 +1649,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1755,7 +1755,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 73017d0165..6d88f108d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -124,15 +124,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -235,19 +235,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getKarma() { - return getOwner() != null ? getOwner().getKarma() : 0; + return _owner != null ? _owner.getKarma() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -306,8 +306,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -319,7 +318,7 @@ public abstract class L2Summon extends L2Playable AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -374,7 +373,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); if (owner != null) @@ -400,12 +399,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } abortAttack(); @@ -458,7 +457,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -527,7 +526,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -572,7 +571,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable } // Set current pet skill - getOwner().setCurrentPetSkill(skill, forceUse, dontMove); + _owner.setCurrentPetSkill(skill, forceUse, dontMove); // Get the target for the skill L2Object target = null; @@ -600,7 +599,7 @@ public abstract class L2Summon extends L2Playable // OWNER_PET should be cast even if no target has been found case OWNER_PET: { - target = getOwner(); + target = _owner; break; } // PARTY, AURA, SELF should be cast even if no target has been found @@ -662,13 +661,13 @@ public abstract class L2Summon extends L2Playable // Check if this is bad magic skill if (skill.isBad()) { - if (getOwner() == target) + if (_owner == target) { return false; } // Summons can cast skills on NPCs inside peace zones. - if (isInsidePeaceZone(this, target) && !getOwner().getAccessLevel().allowPeaceAttack()) + if (isInsidePeaceZone(this, target) && !_owner.getAccessLevel().allowPeaceAttack()) { // If summon or target is in a peace zone, send a system message: sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); @@ -676,13 +675,13 @@ public abstract class L2Summon extends L2Playable } // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getOwner().getSiegeState()) && (target.getActingPlayer() != getOwner()) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == _owner.getSiegeState()) && (target.getActingPlayer() != _owner) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { if (TerritoryWarManager.getInstance().isTWInProgress()) { @@ -699,7 +698,7 @@ public abstract class L2Summon extends L2Playable // Check if the target is attackable if (target.isDoor()) { - if (!target.isAutoAttackable(getOwner())) + if (!target.isAutoAttackable(_owner)) { return false; } @@ -707,7 +706,7 @@ public abstract class L2Summon extends L2Playable else { // Summons can cast skills on NPCs inside peace zones. - if (!target.canBeAttacked() && !getOwner().getAccessLevel().allowPeaceAttack()) + if (!target.canBeAttacked() && !_owner.getAccessLevel().allowPeaceAttack()) { return false; } @@ -731,7 +730,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -753,13 +752,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (pcrit || mcrit) { @@ -773,7 +772,7 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } @@ -800,7 +799,7 @@ public abstract class L2Summon extends L2Playable public void reduceCurrentHp(double damage, L2Character attacker, Skill skill) { super.reduceCurrentHp(damage, attacker, skill); - if ((getOwner() != null) && (attacker != null)) + if ((_owner != null) && (attacker != null)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -813,7 +812,7 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); + final L2PcInstance actingPlayer = getOwner(); if (!actingPlayer.checkPvpSkill(getTarget(), skill) && !actingPlayer.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance @@ -830,18 +829,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -852,10 +851,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } updateEffectIcons(true); } @@ -864,7 +863,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -891,7 +890,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, 0)); // The PetInfo packet wipes the PartySpelled (list of active spells' icons). Re-add them @@ -917,7 +916,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -950,16 +949,16 @@ public abstract class L2Summon extends L2Playable */ public void doAttack() { - if (getOwner() != null) + if (_owner != null) { - final L2Object target = getOwner().getTarget(); + final L2Object target = _owner.getTarget(); if (target != null) { setTarget(target); getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -972,13 +971,13 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - final L2Object target = getOwner().getTarget(); - if ((target == null) || (this == target) || (getOwner() == target)) + final L2Object target = _owner.getTarget(); + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -987,7 +986,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -1007,21 +1006,21 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { if (TerritoryWarManager.getInstance().isTWInProgress()) { @@ -1035,7 +1034,7 @@ public abstract class L2Summon extends L2Playable return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -1048,7 +1047,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1068,18 +1067,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1120,14 +1119,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1138,7 +1137,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1150,14 +1149,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1165,13 +1164,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index ddf29f4da7..52bbae2e62 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -65,7 +65,7 @@ public class PcAppearance */ public final String getVisibleName() { - return _visibleName == null ? getOwner().getName() : _visibleName; + return _visibleName == null ? _owner.getName() : _visibleName; } /** @@ -81,7 +81,7 @@ public class PcAppearance */ public final String getVisibleTitle() { - return _visibleTitle == null ? getOwner().getTitle() : _visibleTitle; + return _visibleTitle == null ? _owner.getTitle() : _visibleTitle; } public final byte getFace() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index ec80c6f870..094bf22b1c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -68,7 +68,7 @@ public class L2DoorInstance extends L2Character /** The fort index in the array of L2Fort this L2NpcInstance belongs to */ private int _fortIndex = -2; private ClanHall _clanHall; - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isTargetable; private int _meshindex = 1; @@ -319,7 +319,7 @@ public class L2DoorInstance extends L2Character { return true; } - if ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).getSiegeZone().isActive() && getIsShowHp()) + if ((_clanHall != null) && _clanHall.isSiegableHall() && ((SiegableHall) _clanHall).getSiegeZone().isActive() && getIsShowHp()) { return true; } @@ -335,7 +335,7 @@ public class L2DoorInstance extends L2Character return false; } - if (getIsAttackableDoor()) + if (_isAttackableDoor) { return true; } @@ -346,9 +346,9 @@ public class L2DoorInstance extends L2Character final L2PcInstance actingPlayer = attacker.getActingPlayer(); - if (getClanHall() != null) + if (_clanHall != null) { - final SiegableHall hall = (SiegableHall) getClanHall(); + final SiegableHall hall = (SiegableHall) _clanHall; if (!hall.isSiegableHall()) { return false; @@ -430,7 +430,7 @@ public class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - oe = new OnEventTrigger(this, isOpen()); + oe = new OnEventTrigger(this, _open); } for (L2PcInstance player : knownPlayers) @@ -630,7 +630,7 @@ public class L2DoorInstance extends L2Character final boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress()); final boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress()); - final boolean isHall = ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).isInSiege()); + final boolean isHall = ((_clanHall != null) && _clanHall.isSiegableHall() && ((SiegableHall) _clanHall).isInSiege()); if (isFort || isCastle || isHall) { @@ -666,7 +666,7 @@ public class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - activeChar.sendPacket(new OnEventTrigger(this, isOpen())); + activeChar.sendPacket(new OnEventTrigger(this, _open)); } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -731,7 +731,7 @@ public class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -743,8 +743,7 @@ public class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -753,7 +752,7 @@ public class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index ffcd85412a..5621e4f650 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -98,7 +98,7 @@ public class L2MerchantInstance extends L2NpcInstance return; } - final double taxRate = (applyTax) ? getMpc().getTotalTaxRate() : 0; + final double taxRate = (applyTax) ? _mpc.getTotalTaxRate() : 0; player.setInventoryBlockingStatus(true); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 2917f7fa4f..c7d4e53734 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -102,11 +102,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -167,9 +167,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -223,7 +223,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -232,7 +232,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 1c67ca4e25..cffc06c3cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -511,7 +511,7 @@ public final class L2PcInstance extends L2Playable public int _telemode = 0; private boolean _inCrystallize; - private boolean _inCraftMode; + private boolean _isCrafting; private long _offlineShopStart = 0; @@ -1261,14 +1261,14 @@ public final class L2PcInstance extends L2Playable return getPrivateStoreType() != PrivateStoreType.NONE; } - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 06e35fa600..1415202ce2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -79,8 +79,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -171,7 +171,7 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - setCurrentFed(getCurrentFed() > getFeedConsume() ? getCurrentFed() - getFeedConsume() : 0); + setCurrentFed(_curFed > getFeedConsume() ? _curFed - getFeedConsume() : 0); broadcastStatusUpdate(); @@ -198,7 +198,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -315,7 +315,7 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)) { @@ -602,8 +602,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -619,7 +619,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -682,9 +682,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -736,11 +736,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DISAPPEARED); @@ -778,7 +778,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - ps.setInt(1, getControlObjectId()); + ps.setInt(1, _controlObjectId); ps.execute(); } catch (Exception e) @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit == null) { @@ -914,7 +914,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -925,7 +925,7 @@ public class L2PetInstance extends L2Summon _restoreSummon = false; } - final String req = !isRespawned() ? "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)" : "UPDATE pets SET name=?,level=?,curHp=?,curMp=?,exp=?,sp=?,fed=?,ownerId=?,restore=? WHERE item_obj_id = ?"; + final String req = !_respawned ? "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)" : "UPDATE pets SET name=?,level=?,curHp=?,curMp=?,exp=?,sp=?,fed=?,ownerId=?,restore=? WHERE item_obj_id = ?"; try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(req)) { @@ -935,10 +935,10 @@ public class L2PetInstance extends L2Summon ps.setDouble(4, getStatus().getCurrentMp()); ps.setLong(5, getStat().getExp()); ps.setLong(6, getStat().getSp()); - ps.setInt(7, getCurrentFed()); + ps.setInt(7, _curFed); ps.setInt(8, getOwner().getObjectId()); ps.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - ps.setInt(10, getControlObjectId()); + ps.setInt(10, _controlObjectId); ps.executeUpdate(); _respawned = true; @@ -981,7 +981,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1023,7 +1023,7 @@ public class L2PetInstance extends L2Summon storedSkills.add(skill.getReuseHashCode()); - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, info.getTime()); @@ -1050,7 +1050,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().containsPetId(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rs = ps1.executeQuery()) { while (rs.next()) @@ -1071,7 +1071,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1114,9 +1114,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1277,7 +1277,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1287,26 +1287,26 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); return weapon != null ? weapon.getId() : 0; } @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); return weapon != null ? weapon.getId() : 0; } public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); return weapon != null ? weapon.getId() : 0; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2f44398d04..f1771c0fb4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -223,7 +223,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe ps.setInt(1, getOwner().getObjectId()); ps.setInt(2, getOwner().getClassIndex()); - ps.setInt(3, getReferenceSkill()); + ps.setInt(3, _referenceSkill); ps.execute(); int buff_index = 0; @@ -269,7 +269,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -304,7 +304,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { ps.setInt(1, getOwner().getObjectId()); ps.setInt(2, getOwner().getClassIndex()); - ps.setInt(3, getReferenceSkill()); + ps.setInt(3, _referenceSkill); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -330,7 +330,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -424,12 +424,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -443,7 +443,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); updateEffectIcons(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index 8af45106f3..1c676a271b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java index fd7a72f10e..8d57ae6422 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java @@ -92,9 +92,9 @@ public class CharStat } // Apply transformation stats. - if (getActiveChar().isPlayer() && getActiveChar().isTransformed()) + if (_activeChar.isPlayer() && _activeChar.isTransformed()) { - final double val = getActiveChar().getTransformation().getStat(getActiveChar().getActingPlayer(), stat); + final double val = _activeChar.getTransformation().getStat(_activeChar.getActingPlayer(), stat); if (val > 0) { value = val; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index e7a01ca8ae..f98797e106 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -66,7 +66,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -130,13 +130,13 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return; } // invul handling - if (getActiveChar().isInvul() && !(isDOT || isHPConsumption)) + if (_activeChar.isInvul() && !(isDOT || isHPConsumption)) { return; } @@ -152,30 +152,30 @@ public class CharStatus if (!isDOT && !isHPConsumption) { - getActiveChar().stopEffectsOnDamage(awake); - if (getActiveChar().isStunned() && (Rnd.get(10) == 0)) + _activeChar.stopEffectsOnDamage(awake); + if (_activeChar.isStunned() && (Rnd.get(10) == 0)) { - getActiveChar().stopStunning(true); + _activeChar.stopStunning(true); } } if (value > 0) { - setCurrentHp(Math.max(getCurrentHp() - value, 0)); + setCurrentHp(Math.max(_currentHp - value, 0)); } - if ((getActiveChar().getCurrentHp() < 0.5) && getActiveChar().isMortal()) // Die + if ((_activeChar.getCurrentHp() < 0.5) && _activeChar.isMortal()) // Die { - getActiveChar().abortAttack(); - getActiveChar().abortCast(); + _activeChar.abortAttack(); + _activeChar.abortCast(); - getActiveChar().doDie(attacker); + _activeChar.doDie(attacker); } } public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -188,10 +188,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -249,12 +249,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -287,7 +287,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (hpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return hpWasChanged; @@ -297,7 +297,7 @@ public class CharStatus { if (setCurrentHp(newHp, false) | setCurrentMp(newMp, false)) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -320,12 +320,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -358,7 +358,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -367,10 +367,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + Formulas.calcHpRegen(getActiveChar()); - final double newMp = getCurrentMp() + Formulas.calcMpRegen(getActiveChar()); + final double newHp = _currentHp + Formulas.calcHpRegen(_activeChar); + final double newMp = _currentMp + Formulas.calcMpRegen(_activeChar); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index da01dd3feb..827e8d9929 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -46,7 +46,7 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - setCurrentCp(getCurrentCp() > value ? getCurrentCp() - value : 0); + setCurrentCp(_currentCp > value ? _currentCp - value : 0); } @Override @@ -69,7 +69,7 @@ public class PcStatus extends PlayableStatus } // If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken. - if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) + if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isCrafting() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) { return; } @@ -83,7 +83,7 @@ public class PcStatus extends PlayableStatus { getActiveChar().stopEffectsOnDamage(awake); // Attacked players in craft/shops stand up. - if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) + if (getActiveChar().isCrafting() || getActiveChar().isInStoreMode()) { getActiveChar().setPrivateStoreType(PrivateStoreType.NONE); getActiveChar().standUp(); @@ -212,14 +212,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -334,7 +334,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -385,9 +385,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + Formulas.calcCpRegen(getActiveChar()), false); + setCurrentCp(_currentCp + Formulas.calcCpRegen(getActiveChar()), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 72305e82a7..2cfb2f7edd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -268,7 +268,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 20817e8145..7d24708d09 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -215,13 +215,13 @@ public final class Transform implements IIdentifiable player.setIsFlying(true); } - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } // Set inventory blocks if needed. @@ -283,11 +283,11 @@ public final class Transform implements IIdentifiable player.setIsFlying(false); } - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index f8ecfde746..0754479290 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable ps.setInt(1, getType().ordinal()); ps.setString(2, getContent()); ps.setString(3, getAuthor()); - ps.setLong(4, getInitial()); - ps.setLong(5, getDelay()); - ps.setInt(6, getRepeat()); + ps.setLong(4, _initial); + ps.setLong(5, _delay); + ps.setInt(6, _repeat); ps.execute(); try (ResultSet rset = ps.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable ps.setInt(1, getType().ordinal()); ps.setString(2, getContent()); ps.setString(3, getAuthor()); - ps.setLong(4, getInitial()); - ps.setLong(5, getDelay()); - ps.setLong(6, getRepeat()); + ps.setLong(4, _initial); + ps.setLong(5, _delay); + ps.setLong(6, _repeat); ps.setLong(7, getId()); ps.execute(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/SubClass.java index 30989f69d8..5786cbdfb5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -131,7 +131,7 @@ public final class SubClass public void incLevel() { - if (getLevel() == _maxLevel) + if (_level == _maxLevel) { return; } @@ -142,7 +142,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java index 39be5c351c..f215c550c7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -68,12 +68,12 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() { - return _price < 0 ? getItem().getReferencePrice() : _price; + return _price < 0 ? _item.getReferencePrice() : _price; } public long getRestockDelay() @@ -113,7 +113,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(new RestockTask(), getRestockDelay()); + _restockTask = ThreadPool.schedule(new RestockTask(), _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -122,7 +122,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -140,7 +140,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -158,8 +158,8 @@ public final class Product try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { - ps.setInt(1, getBuyListId()); - ps.setInt(2, getItemId()); + ps.setInt(1, _buyListId); + ps.setInt(2, _item.getId()); ps.setLong(3, getCount()); ps.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -177,7 +177,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + getBuyListId() + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 4fdcd9bbc1..9dc04182e0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -233,13 +233,13 @@ public abstract class AbstractEffect */ public List getStatFuncs(L2Character caster, L2Character target, Skill skill) { - if (getFuncTemplates() == null) + if (_funcTemplates == null) { return Collections. emptyList(); } - final List functions = new ArrayList<>(getFuncTemplates().size()); - for (FuncTemplate functionTemplate : getFuncTemplates()) + final List functions = new ArrayList<>(_funcTemplates.size()); + for (FuncTemplate functionTemplate : _funcTemplates) { final AbstractFunction function = functionTemplate.getFunc(caster, target, skill, this); if (function != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/AbstractResidence.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/AbstractResidence.java index d6ea63d6d7..013ae4cc63 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/AbstractResidence.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/AbstractResidence.java @@ -119,6 +119,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + "(" + getResidenceId() + ")"; + return _name + "(" + _residenceId + ")"; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java index e482dfa5ad..113a5ef8c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Auction.java @@ -165,7 +165,7 @@ public class Auction try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("Select * from auction where id = ?")) { - ps.setInt(1, getId()); + ps.setInt(1, _id); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -200,7 +200,7 @@ public class Auction try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT bidderId, bidderName, maxBid, clan_name, time_bid FROM auction_bid WHERE auctionId = ? ORDER BY maxBid DESC")) { - ps.setInt(1, getId()); + ps.setInt(1, _id); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -266,14 +266,14 @@ public class Auction */ public synchronized void setBid(L2PcInstance bidder, long bid) { - final long requiredAdena = getHighestBidderName().equals(bidder.getClan().getLeaderName()) ? bid - getHighestBidderMaxBid() : bid; - if ((((getHighestBidderId() > 0) && (bid > getHighestBidderMaxBid())) || ((getHighestBidderId() == 0) && (bid >= getStartingBid()))) && takeItem(bidder, requiredAdena)) + final long requiredAdena = _highestBidderName.equals(bidder.getClan().getLeaderName()) ? bid - _highestBidderMaxBid : bid; + if ((((_highestBidderId > 0) && (bid > _highestBidderMaxBid)) || ((_highestBidderId == 0) && (bid >= _startingBid))) && takeItem(bidder, requiredAdena)) { updateInDB(bidder, bid); bidder.getClan().setAuctionBiddedAt(_id, true); return; } - if ((bid < getStartingBid()) || (bid <= getHighestBidderMaxBid())) + if ((bid < _startingBid) || (bid <= _highestBidderMaxBid)) { bidder.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); } @@ -347,7 +347,7 @@ public class Auction ps.setString(2, bidder.getClan().getLeaderName()); ps.setLong(3, bid); ps.setLong(4, System.currentTimeMillis()); - ps.setInt(5, getId()); + ps.setInt(5, _id); ps.setInt(6, bidder.getClanId()); ps.execute(); } @@ -357,7 +357,7 @@ public class Auction try (PreparedStatement ps = con.prepareStatement("INSERT INTO auction_bid (id, auctionId, bidderId, bidderName, maxBid, clan_name, time_bid) VALUES (?, ?, ?, ?, ?, ?, ?)")) { ps.setInt(1, IdFactory.getInstance().getNextId()); - ps.setInt(2, getId()); + ps.setInt(2, _id); ps.setInt(3, bidder.getClanId()); ps.setString(4, bidder.getName()); ps.setLong(5, bid); @@ -397,7 +397,7 @@ public class Auction try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _id); ps.execute(); } catch (Exception e) @@ -483,7 +483,7 @@ public class Auction try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=? AND bidderId=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _id); ps.setInt(2, bidder); ps.execute(); } @@ -512,7 +512,7 @@ public class Auction try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO auction (id, sellerId, sellerName, sellerClanName, itemType, itemId, itemObjectId, itemName, itemQuantity, startingBid, currentBid, endDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _id); ps.setInt(2, _sellerId); ps.setString(3, _sellerName); ps.setString(4, _sellerClanName); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 4e5835fc1c..79b293b863 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -527,7 +527,7 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - getHolder().broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((getStarterTime() - System.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints())); + _holder.broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((_startedTime - System.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints())); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java index b90efdefb7..ca6f0b2087 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -64,7 +64,7 @@ public final class Castle extends AbstractResidence protected static final Logger LOGGER = Logger.getLogger(Castle.class.getName()); private final List _doors = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -89,12 +89,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -151,7 +151,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -178,29 +178,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -216,11 +216,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -239,7 +239,7 @@ public final class Castle extends AbstractResidence */ _function = new ConcurrentHashMap<>(); initResidenceZone(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -276,7 +276,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -319,7 +319,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -348,7 +348,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -444,7 +444,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClanId() != getOwnerId()) + if (activeChar.getClanId() != _ownerId) { return; } @@ -479,7 +479,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -858,7 +858,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -883,7 +883,7 @@ public final class Castle extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1004,7 +1004,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index f0876a7b5b..15161225c5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -40,7 +40,7 @@ public abstract class ClanHall { protected static final Logger LOGGER = Logger.getLogger(ClanHall.class.getName()); - private final int _clanHallId; + final int _clanHallId; private ArrayList _doors; private final String _name; private int _ownerId; @@ -62,12 +62,12 @@ public abstract class ClanHall public class ClanHallFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; // first activating clanhall function is payed from player inventory, any others from clan warehouse @@ -157,18 +157,18 @@ public abstract class ClanHall } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -183,12 +183,12 @@ public abstract class ClanHall try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clanhall_functions (hall_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { - ps.setInt(1, getId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(1, _clanHallId); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -215,7 +215,7 @@ public abstract class ClanHall final L2Clan clan = ClanTable.getInstance().getClan(_ownerId); if (clan != null) { - clan.setHideoutId(getId()); + clan.setHideoutId(_clanHallId); } else { @@ -321,7 +321,7 @@ public abstract class ClanHall */ public boolean checkIfInZone(int x, int y, int z) { - return getZone().isInsideZone(x, y, z); + return _zone.isInsideZone(x, y, z); } /** @@ -358,7 +358,7 @@ public abstract class ClanHall } _ownerId = clan.getId(); _isFree = false; - clan.setHideoutId(getId()); + clan.setHideoutId(_clanHallId); // Announce to Online member new ClanHall clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); updateDb(); @@ -372,7 +372,7 @@ public abstract class ClanHall */ public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar != null) && (activeChar.getClanId() == getOwnerId())) + if ((activeChar != null) && (activeChar.getClanId() == _ownerId)) { openCloseDoor(doorId, open); } @@ -400,7 +400,7 @@ public abstract class ClanHall public void openCloseDoors(L2PcInstance activeChar, boolean open) { - if ((activeChar != null) && (activeChar.getClanId() == getOwnerId())) + if ((activeChar != null) && (activeChar.getClanId() == _ownerId)) { openCloseDoors(open); } @@ -429,11 +429,11 @@ public abstract class ClanHall { if (_zone != null) { - _zone.banishForeigners(getOwnerId()); + _zone.banishForeigners(_ownerId); } else { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Zone is null for clan hall: " + getId() + " " + getName()); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Zone is null for clan hall: " + _clanHallId + " " + _name); } } @@ -443,7 +443,7 @@ public abstract class ClanHall try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM clanhall_functions WHERE hall_id = ?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanHallId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -468,7 +468,7 @@ public abstract class ClanHall try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM clanhall_functions WHERE hall_id=? AND type=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanHallId); ps.setInt(2, functionType); ps.execute(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java index b2cc81d951..150142d146 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -678,7 +678,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -699,7 +699,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java index 17f8d22556..74d882d227 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -238,7 +238,7 @@ public final class Fort extends AbstractResidence load(); loadFlagPoles(); _function = new ConcurrentHashMap<>(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -439,7 +439,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -503,7 +503,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -778,7 +778,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -862,7 +862,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -990,8 +990,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1057,7 +1057,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index f0fde84c75..892a46cbad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -71,7 +71,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -102,7 +102,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -116,7 +116,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -185,7 +185,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -206,7 +206,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -229,7 +229,7 @@ public class FortSiege implements Siegable // Fort setting protected List _commanders = new CopyOnWriteArrayList<>(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private FortSiegeGuardManager _siegeGuardManager; ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -249,7 +249,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -260,19 +260,19 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); - final int ownerId = getFort().getOwnerClan() != null ? getFort().getOwnerClan().getId() : -1; - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + final int ownerId = _fort.getOwnerClan() != null ? _fort.getOwnerClan().getId() : -1; + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders getSiegeGuardManager().unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info("Siege of " + getFort().getName() + " fort finished."); + LOGGER.info("Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -305,7 +305,7 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -313,11 +313,11 @@ public class FortSiege implements Siegable if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -328,24 +328,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info("Siege of " + getFort().getName() + " fort started."); + LOGGER.info("Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -359,7 +359,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -367,7 +367,7 @@ public class FortSiege implements Siegable member.sendPacket(sm); } } - if (getFort().getOwnerClan() == null) + if (_fort.getOwnerClan() == null) { return; } @@ -390,7 +390,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -405,7 +405,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -415,7 +415,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() == null) + if (_fort.getOwnerClan() == null) { return; } @@ -437,7 +437,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -465,7 +465,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return isInProgress() && getFort().checkIfInZone(x, y, z); // Fort zone during siege + return _isInProgress && _fort.checkIfInZone(x, y, z); // Fort zone during siege } /** @@ -485,7 +485,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - return (clan != null) && (getFort().getOwnerClan() == clan); + return (clan != null) && (_fort.getOwnerClan() == clan); } /** Clear all registered siege clans from database for fort */ @@ -494,22 +494,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -530,7 +530,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -540,7 +540,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { for (L2PcInstance player : ClanTable.getInstance().getClan(siegeclan.getClanId()).getOnlineMembers(0)) { @@ -558,7 +558,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -567,10 +567,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -593,7 +593,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if (_commanders.isEmpty() || (getFort() == null)) + if (_commanders.isEmpty() || (_fort == null)) { return; } @@ -640,14 +640,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -657,11 +657,11 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); if (_siegeRestore == null) { _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); @@ -670,7 +670,7 @@ public class FortSiege implements Siegable } else { - LOGGER.warning("FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning("FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } @@ -685,7 +685,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -714,7 +714,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player dont havee enough adena to register } @@ -744,7 +744,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -778,7 +778,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(query)) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); if (clanId != 0) { ps.setInt(2, clanId); @@ -786,9 +786,9 @@ public class FortSiege implements Siegable ps.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -833,7 +833,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -865,7 +865,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info("Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -886,9 +886,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -917,7 +917,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -938,7 +938,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -981,18 +981,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1032,7 +1032,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1054,8 +1054,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, getFort().getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1079,7 +1079,7 @@ public class FortSiege implements Siegable PreparedStatement ps = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { ps.setInt(1, clan.getId()); - ps.setInt(2, getFort().getResidenceId()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); addAttacker(clan.getId()); @@ -1156,7 +1156,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1186,7 +1186,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1208,7 +1208,7 @@ public class FortSiege implements Siegable { if (_siegeGuardManager == null) { - _siegeGuardManager = new FortSiegeGuardManager(getFort()); + _siegeGuardManager = new FortSiegeGuardManager(_fort); } return _siegeGuardManager; @@ -1219,7 +1219,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public List getCommanders() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/NevitSystem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/NevitSystem.java index 7e5e9d1c1c..7ec3c2dc2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/NevitSystem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/NevitSystem.java @@ -124,22 +124,22 @@ public class NevitSystem implements IUniqueId { case 45: { - getPlayer().sendPacket(SystemMessageId.YOU_ARE_STARTING_TO_FEEL_THE_EFFECTS_OF_NEVIT_S_ADVENT_BLESSING); + _player.sendPacket(SystemMessageId.YOU_ARE_STARTING_TO_FEEL_THE_EFFECTS_OF_NEVIT_S_ADVENT_BLESSING); break; } case 50: { - getPlayer().sendPacket(SystemMessageId.YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT_CONTINUE_TO_BATTLE_EVIL_WHEREVER_IT_MAY_LURK); + _player.sendPacket(SystemMessageId.YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT_CONTINUE_TO_BATTLE_EVIL_WHEREVER_IT_MAY_LURK); break; } case 75: { - getPlayer().sendPacket(SystemMessageId.NEVIT_S_ADVENT_BLESSING_SHINES_STRONGLY_FROM_ABOVE_YOU_CAN_ALMOST_SEE_HIS_DIVINE_AURA); + _player.sendPacket(SystemMessageId.NEVIT_S_ADVENT_BLESSING_SHINES_STRONGLY_FROM_ABOVE_YOU_CAN_ALMOST_SEE_HIS_DIVINE_AURA); break; } } - getPlayer().sendPacket(new ExNevitAdventPointInfoPacket(getAdventPoints())); + _player.sendPacket(new ExNevitAdventPointInfoPacket(getAdventPoints())); } public void startAdventTask() @@ -151,7 +151,7 @@ public class NevitSystem implements IUniqueId if ((_adventTask == null) && (getAdventTime() < Config.NEVIT_ADVENT_TIME)) { _adventTask = ThreadPool.schedule(new AdventTask(), 30000); - getPlayer().sendPacket(new ExNevitAdventTimeChange(getAdventTime(), false)); + _player.sendPacket(new ExNevitAdventTimeChange(getAdventTime(), false)); } } } @@ -173,7 +173,7 @@ public class NevitSystem implements IUniqueId addPoints(72); if ((getAdventTime() % 60) == 0) { - getPlayer().sendPacket(new ExNevitAdventTimeChange(getAdventTime(), false)); + _player.sendPacket(new ExNevitAdventTimeChange(getAdventTime(), false)); } } stopAdventTask(false); @@ -189,7 +189,7 @@ public class NevitSystem implements IUniqueId } if (sendPacket) { - getPlayer().sendPacket(new ExNevitAdventTimeChange(getAdventTime(), true)); + _player.sendPacket(new ExNevitAdventTimeChange(getAdventTime(), true)); } } @@ -202,10 +202,10 @@ public class NevitSystem implements IUniqueId } if ((Config.NEVIT_IGNORE_ADVENT_TIME || (getAdventTime() < Config.NEVIT_ADVENT_TIME)) && (time > 0)) { - getPlayer().getVariables().set("nevit_b", time); - getPlayer().sendPacket(new ExNevitAdventEffect(time)); - getPlayer().sendPacket(SystemMessageId.THE_ANGEL_NEVIT_HAS_BLESSED_YOU_FROM_ABOVE_YOU_ARE_IMBUED_WITH_FULL_VITALITY_AS_WELL_AS_A_VITALITY_REPLENISHING_EFFECT_AND_SHOULD_YOU_DIE_YOU_WILL_NOT_LOSE_EXP); - getPlayer().startAbnormalVisualEffect(true, AbnormalVisualEffect.NAVIT_ADVENT); + _player.getVariables().set("nevit_b", time); + _player.sendPacket(new ExNevitAdventEffect(time)); + _player.sendPacket(SystemMessageId.THE_ANGEL_NEVIT_HAS_BLESSED_YOU_FROM_ABOVE_YOU_ARE_IMBUED_WITH_FULL_VITALITY_AS_WELL_AS_A_VITALITY_REPLENISHING_EFFECT_AND_SHOULD_YOU_DIE_YOU_WILL_NOT_LOSE_EXP); + _player.startAbnormalVisualEffect(true, AbnormalVisualEffect.NAVIT_ADVENT); _nevitEffectTask = ThreadPool.schedule(new NevitEffectEnd(), time * 1000); } } @@ -219,11 +219,11 @@ public class NevitSystem implements IUniqueId { setAdventTime(0); } - getPlayer().getVariables().remove("nevit_b"); - getPlayer().sendPacket(new ExNevitAdventEffect(0)); - getPlayer().sendPacket(new ExNevitAdventPointInfoPacket(getAdventPoints())); - getPlayer().sendPacket(SystemMessageId.NEVIT_S_ADVENT_BLESSING_HAS_ENDED_CONTINUE_YOUR_JOURNEY_AND_YOU_WILL_SURELY_MEET_HIS_FAVOR_AGAIN_SOMETIME_SOON); - getPlayer().stopAbnormalVisualEffect(true, AbnormalVisualEffect.NAVIT_ADVENT); + _player.getVariables().remove("nevit_b"); + _player.sendPacket(new ExNevitAdventEffect(0)); + _player.sendPacket(new ExNevitAdventPointInfoPacket(getAdventPoints())); + _player.sendPacket(SystemMessageId.NEVIT_S_ADVENT_BLESSING_HAS_ENDED_CONTINUE_YOUR_JOURNEY_AND_YOU_WILL_SURELY_MEET_HIS_FAVOR_AGAIN_SOMETIME_SOON); + _player.stopAbnormalVisualEffect(true, AbnormalVisualEffect.NAVIT_ADVENT); stopNevitEffectTask(false); } } @@ -237,11 +237,11 @@ public class NevitSystem implements IUniqueId final int time = getEffectTime(); if (time > 0) { - getPlayer().getVariables().set("nevit_b", time); + _player.getVariables().set("nevit_b", time); } else { - getPlayer().getVariables().remove("nevit_b"); + _player.getVariables().remove("nevit_b"); } } _nevitEffectTask.cancel(true); @@ -281,21 +281,21 @@ public class NevitSystem implements IUniqueId public void setAdventPoints(int points) { - getPlayer().getVariables().set("hunting_points", points); + _player.getVariables().set("hunting_points", points); } public void setAdventTime(int time) { - getPlayer().getVariables().set("hunting_time", time); + _player.getVariables().set("hunting_time", time); } public int getAdventPoints() { - return Config.NEVIT_ENABLED ? getPlayer().getVariables().getInt("hunting_points", 0) : 0; + return Config.NEVIT_ENABLED ? _player.getVariables().getInt("hunting_points", 0) : 0; } public int getAdventTime() { - return Config.NEVIT_ENABLED ? getPlayer().getVariables().getInt("hunting_time", 0) : 0; + return Config.NEVIT_ENABLED ? _player.getVariables().getInt("hunting_time", 0) : 0; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java index 4f12ca9fec..8ba624c369 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -90,7 +90,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -158,7 +158,7 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } @@ -227,7 +227,7 @@ public class Siege implements Siegable private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); private final Castle _castle; - private boolean _isInProgress = false; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,7 +246,7 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); sm.addCastleId(getCastle().getResidenceId()); @@ -377,7 +377,7 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { if (getCastle().getOwnerId() > 0) { @@ -473,7 +473,7 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { _firstOwnerClanId = getCastle().getOwnerId(); @@ -687,7 +687,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return isInProgress() && getCastle().checkIfInZone(x, y, z); // Castle zone during siege + return _isInProgress && getCastle().checkIfInZone(x, y, z); // Castle zone during siege } /** @@ -741,7 +741,7 @@ public class Siege implements Siegable getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -758,7 +758,7 @@ public class Siege implements Siegable ps.setInt(1, getCastle().getResidenceId()); ps.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); sm.addCastleId(getCastle().getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1242,7 +1242,7 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) if (getCastle().getOwnerId() > 0) @@ -1618,7 +1618,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventListener.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventListener.java index dd72dc6bdf..815115a231 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventListener.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventListener.java @@ -34,7 +34,7 @@ public final class TvTEventListener implements IEventListener @Override public boolean isOnEvent() { - return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(getPlayer().getObjectId()); + return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_player.getObjectId()); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventPlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventPlayer.java index dc1d6b85ab..99d72a78c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventPlayer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventPlayer.java @@ -32,7 +32,7 @@ public class TvTEventPlayer public boolean isOnEvent() { - return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(getPlayer().getObjectId()); + return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_player.getObjectId()); } public boolean isBlockingExit() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java index c9e67f43cb..941ae1948b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java @@ -38,7 +38,7 @@ public final class AuctionableHall extends ClanHall protected long _paidUntil; private final int _grade; protected boolean _paid; - private final int _lease; + final int _lease; private final int _chRate = 604800000; public AuctionableHall(StatsSet set) @@ -192,7 +192,7 @@ public final class AuctionableHall extends ClanHall { updateDb(); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); + sm.addInt(_lease); Clan.broadcastToOnlineMembers(sm); if ((_time + (3600000 * 24)) <= (_paidUntil + _chRate)) { @@ -219,8 +219,8 @@ public final class AuctionableHall extends ClanHall PreparedStatement ps = con.prepareStatement("UPDATE clanhall SET ownerId=?, paidUntil=?, paid=? WHERE id=?")) { ps.setInt(1, getOwnerId()); - ps.setLong(2, getPaidUntil()); - ps.setInt(3, getPaid() ? 1 : 0); + ps.setLong(2, _paidUntil); + ps.setInt(3, _paid ? 1 : 0); ps.setInt(4, getId()); ps.execute(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index ec57a05333..42c6f82bb4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -87,7 +87,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall.setSiege(this); _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000); - LOGGER.config(_hall.getName() + " siege scheduled for " + getSiegeDate().getTime() + "."); + LOGGER.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime() + "."); loadAttackers(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java index 2c2593f7d3..f4ee12c056 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java @@ -195,23 +195,23 @@ public final class SiegableHall extends ClanHall public final void addAttacker(L2Clan clan) { - if (getSiege() != null) + if (_siege != null) { - getSiege().getAttackers().put(clan.getId(), new L2SiegeClan(clan.getId(), SiegeClanType.ATTACKER)); + _siege.getAttackers().put(clan.getId(), new L2SiegeClan(clan.getId(), SiegeClanType.ATTACKER)); } } public final void removeAttacker(L2Clan clan) { - if (getSiege() != null) + if (_siege != null) { - getSiege().getAttackers().remove(clan.getId()); + _siege.getAttackers().remove(clan.getId()); } } public final boolean isRegistered(L2Clan clan) { - return (getSiege() != null) && getSiege().checkIsAttacker(clan); + return (_siege != null) && _siege.checkIsAttacker(clan); } public SiegeStatus getSiegeStatus() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index 09d756af14..a40cdfb746 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index 8678ca97a9..43b21e6b72 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -252,7 +252,7 @@ public final class Instance { if (_doorTemplates.contains(set)) { - LOGGER.warning("Door ID " + set.getInt("DoorId") + " already exists in instance " + getId()); + LOGGER.warning("Door ID " + set.getInt("DoorId") + " already exists in instance " + _id); return; } _doorTemplates.add(set); @@ -269,7 +269,7 @@ public final class Instance final int doorId = template.getInt("DoorId"); final StatsSet doorTemplate = DoorData.getInstance().getDoorTemplate(doorId); final L2DoorInstance newdoor = new L2DoorInstance(new L2DoorTemplate(doorTemplate)); - newdoor.setInstanceId(getId()); + newdoor.setInstanceId(_id); newdoor.setCurrentHp(newdoor.getMaxHp()); newdoor.spawnMe(newdoor.getTemplate().getX(), newdoor.getTemplate().getY(), newdoor.getTemplate().getZ()); @@ -361,12 +361,12 @@ public final class Instance for (Integer objectId : _players) { final L2PcInstance player = L2World.getInstance().getPlayer(objectId); - if ((player != null) && (player.getInstanceId() == getId())) + if ((player != null) && (player.getInstanceId() == _id)) { player.setInstanceId(0); - if (getExitLoc() != null) + if (_exitLocation != null) { - player.teleToLocation(getExitLoc(), true); + player.teleToLocation(_exitLocation, true); } else { @@ -435,7 +435,7 @@ public final class Instance spawnDat.setAmount(1); spawnDat.setHeading(set.getInt("heading")); spawnDat.setRespawnDelay(set.getInt("respawn"), set.getInt("respawnRandom")); - spawnDat.setInstanceId(getId()); + spawnDat.setInstanceId(_id); spawnDat.setRandomWalking(set.getBoolean("allowRandomWalk")); final L2Npc spawned = spawnDat.doSpawn(); if ((set.getInt("delay") >= 0) && (spawned instanceof L2Attackable)) @@ -806,7 +806,7 @@ public final class Instance interval = 300000; final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES); sm.addString(Integer.toString(timeLeft)); - Broadcast.toPlayersInInstance(sm, getId()); + Broadcast.toPlayersInInstance(sm, _id); remaining = remaining - 300000; } else if (remaining > 60000) @@ -815,7 +815,7 @@ public final class Instance interval = 60000; final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_DUNGEON_WILL_EXPIRE_IN_S1_MINUTE_S_YOU_WILL_BE_FORCED_OUT_OF_THE_DUNGEON_WHEN_THE_TIME_EXPIRES); sm.addString(Integer.toString(timeLeft)); - Broadcast.toPlayersInInstance(sm, getId()); + Broadcast.toPlayersInInstance(sm, _id); remaining = remaining - 60000; } else if (remaining > 30000) @@ -837,7 +837,7 @@ public final class Instance for (Integer objectId : _players) { final L2PcInstance player = L2World.getInstance().getPlayer(objectId); - if ((player != null) && (player.getInstanceId() == getId())) + if ((player != null) && (player.getInstanceId() == _id)) { player.sendPacket(cs); } @@ -887,12 +887,12 @@ public final class Instance // Start eject task _ejectDeadTasks.put(player.getObjectId(), ThreadPool.schedule(() -> { - if (player.isDead() && (player.getInstanceId() == getId())) + if (player.isDead() && (player.getInstanceId() == _id)) { player.setInstanceId(0); - if (getExitLoc() != null) + if (_exitLocation != null) { - player.teleToLocation(getExitLoc(), true); + player.teleToLocation(_exitLocation, true); } else { @@ -945,7 +945,7 @@ public final class Instance public boolean isRemoveBuffEnabled() { - return getRemoveBuffType() != InstanceRemoveBuffType.NONE; + return _removeBuffType != InstanceRemoveBuffType.NONE; } public InstanceRemoveBuffType getRemoveBuffType() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java index 4d7694424a..d4f0d80129 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java @@ -168,7 +168,7 @@ public class InstanceWorld */ public List getAliveNpcs() { - return getNpcs().stream().filter(n -> n.getCurrentHp() > 0).collect(Collectors.toList()); + return _instance.getNpcs().stream().filter(n -> n.getCurrentHp() > 0).collect(Collectors.toList()); } /** @@ -178,7 +178,7 @@ public class InstanceWorld */ public List getNpcs(int... id) { - return getNpcs().stream().filter(n -> CommonUtil.contains(id, n.getId())).collect(Collectors.toList()); + return _instance.getNpcs().stream().filter(n -> CommonUtil.contains(id, n.getId())).collect(Collectors.toList()); } /** @@ -191,7 +191,7 @@ public class InstanceWorld @SafeVarargs public final List getNpcs(Class clazz, int... ids) { - return getNpcs().stream().filter(n -> (ids.length == 0) || CommonUtil.contains(ids, n.getId())).filter(clazz::isInstance).map(clazz::cast).collect(Collectors.toList()); + return _instance.getNpcs().stream().filter(n -> (ids.length == 0) || CommonUtil.contains(ids, n.getId())).filter(clazz::isInstance).map(clazz::cast).collect(Collectors.toList()); } /** @@ -204,7 +204,7 @@ public class InstanceWorld @SafeVarargs public final List getAliveNpcs(Class clazz, int... ids) { - return getNpcs().stream().filter(n -> ((ids.length == 0) || CommonUtil.contains(ids, n.getId())) && (n.getCurrentHp() > 0)).filter(clazz::isInstance).map(clazz::cast).collect(Collectors.toList()); + return _instance.getNpcs().stream().filter(n -> ((ids.length == 0) || CommonUtil.contains(ids, n.getId())) && (n.getCurrentHp() > 0)).filter(clazz::isInstance).map(clazz::cast).collect(Collectors.toList()); } /** @@ -214,7 +214,7 @@ public class InstanceWorld */ public List getAliveNpcs(int... id) { - return getNpcs().stream().filter(n -> (n.getCurrentHp() > 0) && CommonUtil.contains(id, n.getId())).collect(Collectors.toList()); + return _instance.getNpcs().stream().filter(n -> (n.getCurrentHp() > 0) && CommonUtil.contains(id, n.getId())).collect(Collectors.toList()); } /** @@ -224,7 +224,7 @@ public class InstanceWorld */ public L2Npc getNpc(int id) { - return getNpcs().stream().filter(n -> n.getId() == id).findFirst().orElse(null); + return _instance.getNpcs().stream().filter(n -> n.getId() == id).findFirst().orElse(null); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index f10d7cb539..f517b8f27f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -182,12 +182,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -251,7 +251,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -342,7 +342,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 1ba21949ee..ea4928fc99 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -119,15 +119,15 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT object_id, item_id, count, enchant_level, loc, loc_data, custom_type1, custom_type2, mana_left, time FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - ps.setInt(1, getOwnerId()); + ps.setInt(1, _ownerId); ps.setString(2, getBaseLocation().name()); - ps.setInt(3, getMessageId()); + ps.setInt(3, _messageId); try (ResultSet inv = ps.executeQuery()) { L2ItemInstance item; while (inv.next()) { - item = L2ItemInstance.restoreFromDb(getOwnerId(), inv); + item = L2ItemInstance.restoreFromDb(_ownerId, inv); if (item == null) { continue; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index c15f2cc8e0..3d357dc6df 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -141,7 +141,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -180,7 +180,7 @@ public class PcInventory extends Inventory } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -267,7 +267,7 @@ public class PcInventory extends Inventory final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { - if ((item == null) || !item.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(item.getId())) + if ((item == null) || !item.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(item.getId())) { continue; } @@ -330,7 +330,7 @@ public class PcInventory extends Inventory final List list = new LinkedList<>(); for (L2ItemInstance item : _items) { - if ((item != null) && item.isAvailable(getOwner(), false, false)) + if ((item != null) && item.isAvailable(_owner, false, false)) { final TradeItem adjItem = tradeList.adjustAvailableItem(item); if (adjItem != null) @@ -697,12 +697,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (item.getObjectId() == getOwner().getActiveEnchantItemId()) + if (item.getObjectId() == _owner.getActiveEnchantItemId()) { - getOwner().setActiveEnchantItemId(L2PcInstance.ID_NONE); + _owner.setActiveEnchantItemId(L2PcInstance.ID_NONE); } if (item.getId() == ADENA_ID) @@ -736,7 +736,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(); + _owner.refreshOverloaded(); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 783c5580ba..bccee4fb8b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -118,7 +118,7 @@ public class PetInventory extends Inventory // check for equiped items from other pets for (L2ItemInstance item : _items) { - if (item.isEquipped() && !item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (item.isEquipped() && !item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 3e9085e12c..c3d98742c7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -108,7 +108,7 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index 47456bce98..3f532b2b35 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -137,7 +137,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java index 157d34655b..8f250e39fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -452,11 +452,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -473,11 +473,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -572,7 +572,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -629,7 +629,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -802,7 +802,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar instanceof L2PcInstance) && activeChar.getActingPlayer().isInOlympiadMode()) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar instanceof L2PcInstance) && activeChar.getActingPlayer().isInOlympiadMode()) { if (isEquipable()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 60c3e42b2b..4d7c77a631 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -202,7 +202,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 67ab1eb2b6..a6bce2e4f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -107,7 +107,7 @@ public final class EnchantScroll extends AbstractEnchantItem } else if ((supportItem != null)) { - if (isBlessed()) + if (_isBlessed) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 13b2ad125c..657b495108 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -260,15 +260,14 @@ public final class L2ItemInstance extends L2Object } // if this item is a mercenary ticket, remove the spawns! - final int itemId = getId(); - if (MercTicketManager.getInstance().getTicketCastleId(itemId) > 0) + if (MercTicketManager.getInstance().getTicketCastleId(_itemId) > 0) { MercTicketManager.getInstance().removeTicket(this); ItemsOnGroundManager.getInstance().removeObject(this); } - if (!Config.DISABLE_TUTORIAL && ((itemId == ADENA_ID) || (itemId == 6353))) + if (!Config.DISABLE_TUTORIAL && ((_itemId == ADENA_ID) || (_itemId == 6353))) { // Note from UnAfraid: // Unhardcode this? @@ -278,7 +277,7 @@ public final class L2ItemInstance extends L2Object final QuestState qs = actor.getQuestState("Q00255_Tutorial"); if ((qs != null) && (qs.getQuest() != null)) { - qs.getQuest().notifyEvent("CE" + itemId, null, actor); + qs.getQuest().notifyEvent("CE" + _itemId, null, actor); } } } @@ -306,14 +305,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -322,7 +321,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -344,7 +343,7 @@ public final class L2ItemInstance extends L2Object final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -460,7 +459,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -482,12 +481,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -497,7 +496,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -520,7 +519,7 @@ public final class L2ItemInstance extends L2Object final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -537,7 +536,7 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - return (getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL) ? getItem().isEnchantable() : 0; + return (_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL) ? _item.isEnchantable() : 0; } /** @@ -630,7 +629,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -828,7 +827,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -840,14 +839,14 @@ public final class L2ItemInstance extends L2Object public boolean isAvailable(L2PcInstance player, boolean allowAdena, boolean allowNonTradeable) { return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && (!player.hasSummon() || (getObjectId() != player.getSummon().getControlObjectId())) // Not Control item of currently summoned pet && (player.getActiveEnchantItemId() != getObjectId()) // Not momentarily used enchant scroll && (player.getActiveEnchantSupportItemId() != getObjectId()) // Not momentarily used enchant support item && (player.getActiveEnchantAttrItemId() != getObjectId()) // Not momentarily used enchant attribute item - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != getId())) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != _itemId)) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -902,7 +901,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1062,9 +1061,9 @@ public final class L2ItemInstance extends L2Object { return -2; } - else if (getItem().getElementals() != null) + else if (_item.getElementals() != null) { - return getItem().getElementals()[0].getElement(); + return _item.getElementals()[0].getElement(); } else if (_elementals != null) { @@ -1079,9 +1078,9 @@ public final class L2ItemInstance extends L2Object { return 0; } - else if (getItem().getElementals() != null) + else if (_item.getElementals() != null) { - return getItem().getElementals()[0].getValue(); + return _item.getElementals()[0].getValue(); } else if (_elementals != null) { @@ -1096,9 +1095,9 @@ public final class L2ItemInstance extends L2Object { return 0; } - else if (getItem().getElementals() != null) + else if (_item.getElementals() != null) { - final Elementals elm = getItem().getElemental(element); + final Elementals elm = _item.getElemental(element); if (elm != null) { return elm.getValue(); @@ -1343,7 +1342,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1373,7 +1372,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1409,7 +1408,7 @@ public final class L2ItemInstance extends L2Object */ public List getStatFuncs(L2Character player) { - return getItem().getStatFuncs(this, player); + return _item.getStatFuncs(this, player); } /** @@ -1622,11 +1621,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1658,12 +1657,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1836,7 +1835,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1977,28 +1976,28 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - return ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) && getItem().isElementable(); + return ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) && _item.isElementable(); } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -2020,7 +2019,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && getItem().hasSkills(); + return (_item.getItemType() == EtcItemType.RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && _item.hasSkills(); } public void giveSkillsToOwner() @@ -2034,7 +2033,7 @@ public final class L2ItemInstance extends L2Object if (player != null) { - for (SkillHolder sh : getItem().getSkills()) + for (SkillHolder sh : _item.getSkills()) { if (sh.getSkill().isPassive()) { @@ -2055,7 +2054,7 @@ public final class L2ItemInstance extends L2Object if (player != null) { - for (SkillHolder sh : getItem().getSkills()) + for (SkillHolder sh : _item.getSkills()) { if (sh.getSkill().isPassive()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index a1dc044f18..421e94d500 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java index 809125a573..48ac1e6360 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java @@ -156,19 +156,19 @@ public class Options public void apply(L2PcInstance player) { - if (hasFuncs()) + if (!_funcs.isEmpty()) { player.addStatFuncs(getStatFuncs(null, player)); } if (hasActiveSkill()) { - addSkill(player, getActiveSkill().getSkill()); + addSkill(player, _activeSkill.getSkill()); } if (hasPassiveSkill()) { - addSkill(player, getPassiveSkill().getSkill()); + addSkill(player, _passiveSkill.getSkill()); } - if (hasActivationSkills()) + if (!_activationSkills.isEmpty()) { for (OptionsSkillHolder holder : _activationSkills) { @@ -181,19 +181,19 @@ public class Options public void remove(L2PcInstance player) { - if (hasFuncs()) + if (!_funcs.isEmpty()) { player.removeStatsOwner(this); } if (hasActiveSkill()) { - player.removeSkill(getActiveSkill().getSkill(), false, false); + player.removeSkill(_activeSkill.getSkill(), false, false); } if (hasPassiveSkill()) { - player.removeSkill(getPassiveSkill().getSkill(), false, true); + player.removeSkill(_passiveSkill.getSkill(), false, true); } - if (hasActivationSkills()) + if (!_activationSkills.isEmpty()) { for (OptionsSkillHolder holder : _activationSkills) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java index 1988f57140..fc27bfc345 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2445,7 +2445,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2458,9 +2457,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 7d3b0816a1..020bb14a3f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -260,7 +260,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -683,7 +683,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 1fc05bca77..3d32fc7a41 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,12 +53,12 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; private final ScheduledFuture _schedular; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index 9b37d45148..6d1067227d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -310,7 +310,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -343,7 +343,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java index 662160a192..29806749ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -243,15 +243,15 @@ public final class Skill implements IIdentifiable _abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -319,8 +319,8 @@ public final class Skill implements IIdentifiable _targetType = set.getEnum("targetType", L2TargetType.class, L2TargetType.SELF); _power = set.getFloat("power", 0.f); - _pvpPower = set.getFloat("pvpPower", (float) getPower()); - _pvePower = set.getFloat("pvePower", (float) getPower()); + _pvpPower = set.getFloat("pvpPower", (float) _power); + _pvePower = set.getFloat("pvePower", (float) _power); _magicLevel = set.getInt("magicLvl", 0); _lvlBonusRate = set.getInt("lvlBonusRate", 0); _activateRate = set.getInt("activateRate", -1); @@ -946,7 +946,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getChargeConsume() @@ -1373,7 +1373,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isInvulAgainst(getId(), getLevel())) + if (effected.isInvulAgainst(_id, _level)) { return; } @@ -1402,9 +1402,9 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature including healing herbs. if (effected.isPlayer() && effected.hasServitor() && (_abnormalType != AbnormalType.TRANSFORM)) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - applyEffects(effector, effected.getSummon(), isRecoveryHerb(), 0); + applyEffects(effector, effected.getSummon(), _isRecoveryHerb, 0); } } } @@ -1429,7 +1429,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && info.getEffected().isPlayer() && info.getEffected().hasServitor() && isContinuous() && !isDebuff() && (getId() != CommonSkill.SERVITOR_SHARE.getId())) + if (addContinuousEffects && info.getEffected().isPlayer() && info.getEffected().hasServitor() && isContinuous() && !_isDebuff && (getId() != CommonSkill.SERVITOR_SHARE.getId())) { applyEffects(effector, info.getEffected().getSummon(), false, 0); } @@ -1471,7 +1471,7 @@ public final class Skill implements IIdentifiable */ private void activateSkill(L2Character caster, L2CubicInstance cubic, L2Object... targets) { - switch (getId()) + switch (_id) { // TODO: replace with AI case 5852: @@ -1537,9 +1537,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0); } @@ -1556,7 +1556,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1664,7 +1664,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispeled() && (getId() != CommonSkill.SERVITOR_SHARE.getId()); + return !isPassive() && !isToggle() && !_isDebuff && !_isHeroSkill && !_isGMSkill && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispeled && (getId() != CommonSkill.SERVITOR_SHARE.getId()); } public boolean isClanSkill() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 0e4cbb60d5..3f5c97d18c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -98,7 +98,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -162,7 +162,7 @@ public class SkillChannelizer implements Runnable if (chars.isCharacter()) { targetList.add((L2Character) chars); - ((L2Character) chars).getSkillChannelized().addChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) chars).getSkillChannelized().addChannelizer(_skill.getChannelingSkillId(), _channelizer); } } @@ -199,12 +199,12 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer() && skill.isBad()) + if (character.isPlayable() && _channelizer.isPlayer() && skill.isBad()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } - skill.applyEffects(getChannelizer(), character); + skill.applyEffects(_channelizer, character); // Reduce shots. if (_skill.useSpiritShot()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index c92b7db907..08912831e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -188,7 +188,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -392,12 +392,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -557,7 +557,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 81d8db8c83..18f90cd502 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -233,7 +233,7 @@ public class L2EffectZone extends L2ZoneType { for (L2Character temp : getCharactersInside()) { - if ((temp != null) && !temp.isDead() && (Rnd.get(100) < getChance())) + if ((temp != null) && !temp.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index 78ff34c8a4..4835bd27cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java index b87f7b713e..5946a6d3f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -247,7 +247,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -538,7 +538,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -617,11 +617,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 7a33b6d919..4a07a0474c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -1323,7 +1323,7 @@ public final class RequestActionUse implements IClientIncomingPacket } SystemMessage sm; - if (requester.isInStoreMode() || requester.isInCraftMode()) + if (requester.isInStoreMode() || requester.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_SHOP_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(requester); @@ -1402,7 +1402,7 @@ public final class RequestActionUse implements IClientIncomingPacket // Checks for partner. final L2PcInstance partner = target.getActingPlayer(); - if (partner.isInStoreMode() || partner.isInCraftMode()) + if (partner.isInStoreMode() || partner.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_SHOP_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(partner); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 03150002cf..5542fdfb3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -56,7 +56,7 @@ public final class RequestRecipeItemMakeSelf implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 3147f1dfee..21c8dbaf53 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -79,7 +79,7 @@ public final class RequestRecipeShopMakeItem implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index d1ebb8ed74..33b635775d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -326,7 +326,7 @@ public abstract class AbstractMessagePacket> protected final void writeMe(PacketWriter packet) { - packet.writeD(getId()); + packet.writeD(_smId.getId()); packet.writeD(_params.length); SMParam param; for (int i = 0; i < _paramIndex; i++) @@ -386,7 +386,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) @@ -441,12 +441,12 @@ public abstract class AbstractMessagePacket> public final T getLocalizedMessage(String lang) { - if (!Config.MULTILANG_SM_ENABLE || (getSystemMessageId() == SystemMessageId.S1)) + if (!Config.MULTILANG_SM_ENABLE || (_smId == SystemMessageId.S1)) { return (T) this; } - final SMLocalisation sml = getSystemMessageId().getLocalisation(lang); + final SMLocalisation sml = _smId.getLocalisation(lang); if (sml == null) { return (T) this; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java index 77abb2f414..83acb6ebee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 258f386360..5b02d5599a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -68,7 +68,7 @@ public final class OfflineTradeUtil } default: { - canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isInCraftMode(); + canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isCrafting(); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java index ddae96705f..7ad31f7916 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java index ca59943897..9f3a35ea49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 5ada9ffff8..8563b4b64a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -167,7 +167,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -195,10 +195,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -223,7 +223,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 59ca8fcc83..6251faab77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -40,7 +40,7 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING); return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/SocialAction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/SocialAction.java index f7db8c36f7..fde530a2b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/SocialAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/SocialAction.java @@ -149,7 +149,7 @@ public final class SocialAction implements IPlayerActionHandler } SystemMessage sm; - if (player.isInStoreMode() || player.isInCraftMode()) + if (player.isInStoreMode() || player.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(player); @@ -228,7 +228,7 @@ public final class SocialAction implements IPlayerActionHandler // Checks for partner. final L2PcInstance partner = target.getActingPlayer(); - if (partner.isInStoreMode() || partner.isInCraftMode()) + if (partner.isInStoreMode() || partner.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(partner); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/PacketReader.java index ea90113f43..bdf5c76ac8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/RecipeController.java index dba4334dd6..8fda49f426 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/RecipeController.java @@ -199,7 +199,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -291,7 +291,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -438,7 +438,7 @@ public class RecipeController // update load and mana bar of craft window updateCurMp(); _activeMakers.remove(_player.getObjectId()); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendItemList(false); } @@ -654,7 +654,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player.getObjectId()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java index cad4fb54da..717f999c27 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -608,7 +608,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -648,7 +648,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -680,7 +680,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player)) + if (_actor.isVisibleFor(player)) { if (_clientMoving) { @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (getTarget() instanceof L2Character) && (getIntention() == AI_INTENTION_FOLLOW); + return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); } /** @@ -737,7 +737,7 @@ public abstract class AbstractAI implements Ctrl return; } - final L2Object followTarget = getTarget(); // copy to prevent NPE + final L2Object followTarget = _target; // copy to prevent NPE if (followTarget == null) { if (_actor.isSummon()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8826f4e507..3880807630 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -166,7 +166,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, max_range); } @@ -216,7 +216,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -256,7 +256,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 4f3a018802..0052f4791d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -224,7 +224,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtAttacked(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } @@ -239,7 +239,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtEvaded(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/cache/HtmCache.java index 3127c4156e..265a5a6758 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -66,7 +66,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index 316e1ed757..dd22855ae4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 5aac2716cf..d0cd743b0f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -134,7 +134,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -349,7 +349,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index ff236652e3..c60afbd78a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -48,9 +48,9 @@ public class AttendanceRewardData implements IGameXmlReader { if (Config.ENABLE_ATTENDANCE_REWARDS) { - getRewards().clear(); + _rewards.clear(); parseDatapackFile("data/AttendanceRewards.xml"); - _rewardsCount = getRewards().size(); + _rewardsCount = _rewards.size(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _rewardsCount + " rewards."); } else @@ -73,7 +73,7 @@ public class AttendanceRewardData implements IGameXmlReader } else { - getRewards().add(new ItemHolder(itemId, itemCount)); + _rewards.add(new ItemHolder(itemId, itemCount)); } })); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java index 712d1febdd..6618dcdf1d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java @@ -108,7 +108,7 @@ public final class CastleData implements IGameXmlReader guards.add(new SiegeGuardHolder(castleId, itemId, type, stationary, npcId, npcMaxAmount)); } } - getSiegeGuards().put(castleId, guards); + _siegeGuards.put(castleId, guards); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b0b755ac92..db7fdf9fa6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -258,7 +258,7 @@ public class RecipeData implements IGameXmlReader if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage("No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java index ac3c07c3c9..d5266c07ef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/enums/AttributeType.java @@ -63,7 +63,7 @@ public enum AttributeType */ public AttributeType getOpposite() { - return ATTRIBUTE_TYPES[((getClientId() % 2) == 0) ? (getClientId() + 1) : (getClientId() - 1)]; + return ATTRIBUTE_TYPES[((_clientId % 2) == 0) ? (_clientId + 1) : (_clientId - 1)]; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2615be0ddf..f0275d4660 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 792edf3cba..afc836f427 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -68,7 +68,7 @@ public final class CastleManager implements InstanceListManager if (nearestCastle == null) { double distance; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { distance = castle.getDistance(obj); if (maxDistance > distance) @@ -88,7 +88,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastleByOwner(L2Clan clan) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getOwnerId() == clan.getId()) { @@ -100,7 +100,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(String name) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getName().equalsIgnoreCase(name.trim())) { @@ -112,7 +112,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(int x, int y, int z) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.checkIfInZone(x, y, z)) { @@ -135,7 +135,7 @@ public final class CastleManager implements InstanceListManager public boolean hasOwnedCastle() { boolean hasOwnedCastle = false; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { if (castle.getOwnerId() > 0) { @@ -224,7 +224,7 @@ public final class CastleManager implements InstanceListManager final int castleId = rs.getInt("id"); _castles.put(castleId, new Castle(castleId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCastles().size() + " castles."); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.values().size() + " castles."); } catch (Exception e) { @@ -240,7 +240,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { castle.activateInstance(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index dc63278e16..37f7cd0a21 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -47,7 +47,7 @@ public final class FortManager implements InstanceListManager Fort nearestFort = getFort(obj); if (nearestFort == null) { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { final double distance = fort.getDistance(obj); if (maxDistance > distance) @@ -62,7 +62,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getResidenceId() == fortId) { @@ -74,7 +74,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getOwnerClan() == clan) { @@ -86,7 +86,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -98,7 +98,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.checkIfInZone(x, y, z)) { @@ -131,8 +131,8 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); - for (Fort fort : getForts()) + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.values().size() + " fortress"); + for (Fort fort : _forts.values()) { fort.getSiege().loadSiegeGuard(); } @@ -151,7 +151,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { fort.activateInstance(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 58b75f592d..0b4c7601cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -102,7 +102,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -115,7 +115,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -128,7 +128,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -141,7 +141,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -159,7 +159,7 @@ public final class MailManager public int getMailsInProgress(int objectId) { int count = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getMailType() == MailType.REGULAR)) { @@ -179,7 +179,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 41216a0555..30581681f4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -244,7 +244,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return (currPetition.getState() == PetitionState.IN_PROCESS); } @@ -252,7 +252,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -283,7 +283,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -302,7 +302,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -312,7 +312,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -330,7 +330,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -363,12 +363,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("

There are no currently pending petitions.
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -379,7 +379,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -419,7 +419,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -440,7 +440,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 964757069c..20b6c07319 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -171,7 +171,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java index 1b0e62c021..83b903b671 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -277,7 +277,7 @@ public final class CharEffectList */ public int getBuffCount() { - return _actives != null ? (_buffCount.intValue() - _hiddenBuffs.get()) : 0; + return _actives != null ? (_buffCount.get() - _hiddenBuffs.get()) : 0; } /** @@ -287,7 +287,7 @@ public final class CharEffectList */ public int getDanceCount() { - return _danceCount.intValue(); + return _danceCount.get(); } /** @@ -297,7 +297,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return _triggerBuffCount.intValue(); + return _triggerBuffCount.get(); } /** @@ -307,7 +307,7 @@ public final class CharEffectList */ public int getToggleCount() { - return _toggleCount.intValue(); + return _toggleCount.get(); } /** @@ -317,7 +317,7 @@ public final class CharEffectList */ public int getDebuffCount() { - return _debuffCount.intValue(); + return _debuffCount.get(); } /** @@ -352,7 +352,7 @@ public final class CharEffectList */ public void stopAllToggles() { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { // Ignore necessary toggles. stopEffects(b -> b.getSkill().isToggle() && !b.getSkill().isNecessaryToggle() && !b.getSkill().isIrreplacableBuff(), true, true); @@ -361,7 +361,7 @@ public final class CharEffectList public void stopAllTogglesOfGroup(int toggleGroup) { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { stopEffects(b -> b.getSkill().isToggle() && (b.getSkill().getToggleGroupId() == toggleGroup), true, true); } @@ -508,7 +508,7 @@ public final class CharEffectList */ public void stopEffectsOnAction() { - if (_hasBuffsRemovedOnAnyAction.intValue() > 0) + if (_hasBuffsRemovedOnAnyAction.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnAnyActionExceptMove(), true, true); } @@ -516,7 +516,7 @@ public final class CharEffectList public void stopEffectsOnDamage() { - if (_hasBuffsRemovedOnDamage.intValue() > 0) + if (_hasBuffsRemovedOnDamage.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnDamage(), true, true); } @@ -535,16 +535,16 @@ public final class CharEffectList { case TRIGGER: { - return (getTriggeredBuffCount() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); + return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); } case DANCE: { - return (getDanceCount() > Config.DANCES_MAX_AMOUNT); + return (_danceCount.get() > Config.DANCES_MAX_AMOUNT); } // case TOGGLE: Do toggles have limit? case DEBUFF: { - return (getDebuffCount() > 24); + return (_debuffCount.get() > 24); } case BUFF: { @@ -1106,7 +1106,7 @@ public final class CharEffectList final Skill skill = info.getSkill(); // Handle hidden buffs. Check if there was such abnormal before so we can continue. - if ((getHiddenBuffsCount() > 0) && _stackedEffects.contains(skill.getAbnormalType())) + if ((_hiddenBuffs.get() > 0) && _stackedEffects.contains(skill.getAbnormalType())) { // If incoming buff isnt hidden, remove any hidden buffs with its abnormal type. if (info.isInUse()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 8de8a2fb0e..2265d6876c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -71,7 +71,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java index 2e13b5d8d6..772f812e21 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java @@ -110,7 +110,7 @@ public class Fishing public synchronized void startFishing() { - if (isFishing()) + if (_isFishing) { return; } @@ -132,7 +132,7 @@ public class Fishing if (!canFish()) { - if (isFishing()) + if (_isFishing) { _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); } @@ -182,7 +182,7 @@ public class Fishing return; } - if (_player.isInCraftMode() || _player.isInStoreMode()) + if (_player.isCrafting() || _player.isInStoreMode()) { _player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -201,7 +201,7 @@ public class Fishing _baitLocation = calculateBaitLocation(); if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null)) { - if (isFishing()) + if (_isFishing) { // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -262,7 +262,7 @@ public class Fishing private void reelIn(FishingEndReason reason, boolean consumeBait) { - if (!isFishing()) + if (!_isFishing) { return; } @@ -326,7 +326,7 @@ public class Fishing public synchronized void stopFishing(FishingEndType endType) { - if (isFishing()) + if (_isFishing) { reelIn(FishingEndReason.STOP, false); _isFishing = false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index ec834bcb34..c05e0915be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -177,7 +177,7 @@ public final class L2ArmorSet public int getLowestSetEnchant(L2PcInstance player) { // Player don't have full set - if (getPiecesCount(player, L2ItemInstance::getId) < getMinimumPieces()) + if (getPiecesCount(player, L2ItemInstance::getId) < _minimumPieces) { return 0; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java index a43461d1a7..e1430183ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -170,7 +170,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); final ClanRewardBonus availableOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(this); if ((_lastMembersOnlineBonus == null) && (availableOnlineBonus != null)) @@ -242,7 +242,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -278,7 +278,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - LOGGER.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + _name + " without clan leader!"); return ""; } return _leader.getName(); @@ -570,7 +570,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -608,7 +608,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -628,7 +628,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -882,8 +882,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -926,8 +926,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -942,8 +942,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -978,15 +978,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1015,19 +1015,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1071,7 +1071,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1084,12 +1084,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1109,7 +1109,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1146,7 +1146,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1177,7 +1177,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1237,7 +1237,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1364,7 +1364,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1372,7 +1372,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1612,7 +1612,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1765,7 +1765,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1855,7 +1855,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); return null; @@ -1864,7 +1864,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1879,11 +1879,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1949,7 +1949,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1965,7 +1965,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2014,7 +2014,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2026,7 +2026,7 @@ public class L2Clan implements IIdentifiable, INamable LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } - for (L2ClanMember cm : getMembers()) + for (L2ClanMember cm : _members.values()) { if (cm.isOnline()) { @@ -2050,7 +2050,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2090,12 +2090,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2169,7 +2169,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2206,7 +2206,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2238,7 +2238,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2390,22 +2390,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2426,7 +2426,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2439,12 +2439,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2483,7 +2483,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2491,13 +2491,13 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; - // Such as https://l2wiki.com/classic/Clans_–_Clan_Level - switch (getLevel()) + // Such as https://l2wiki.com/classic/Clans_–_Clan_Level + switch (_level) { case 0: { // Upgrade to 1 - if ((player.getSp() >= 1000) && (player.getAdena() >= 150000) && (getMembersCount() >= 1)) + if ((player.getSp() >= 1000) && (player.getAdena() >= 150000) && (_members.size() >= 1)) { if (player.reduceAdena("ClanLvl", 150000, player.getTarget(), true)) { @@ -2513,7 +2513,7 @@ public class L2Clan implements IIdentifiable, INamable case 1: { // Upgrade to 2 - if ((player.getSp() >= 15000) && (player.getAdena() >= 300000) && (getMembersCount() >= 1)) + if ((player.getSp() >= 15000) && (player.getAdena() >= 300000) && (_members.size() >= 1)) { if (player.reduceAdena("ClanLvl", 300000, player.getTarget(), true)) { @@ -2529,7 +2529,7 @@ public class L2Clan implements IIdentifiable, INamable case 2: { // Upgrade to 3 - if ((player.getSp() >= 100000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 100000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 100, player.getTarget(), true)) @@ -2549,7 +2549,7 @@ public class L2Clan implements IIdentifiable, INamable case 3: { // Upgrade to 4 - if ((player.getSp() >= 1000000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 1000000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 5000, player.getTarget(), true)) @@ -2569,7 +2569,7 @@ public class L2Clan implements IIdentifiable, INamable case 4: { // Upgrade to 5 - if ((player.getSp() >= 5000000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 5000000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 10000, player.getTarget(), true)) @@ -2605,7 +2605,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendItemList(false); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2618,7 +2618,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2628,9 +2628,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2653,7 +2653,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2664,12 +2664,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2686,15 +2686,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2736,7 +2736,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2747,12 +2747,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -3022,7 +3022,7 @@ public class L2Clan implements IIdentifiable, INamable getVariables().set("PREVIOUS_HUNTING_POINTS", getHuntingPoints()); // Reset - getMembers().forEach(L2ClanMember::resetBonus); + _members.values().forEach(L2ClanMember::resetBonus); getVariables().remove("HUNTING_POINTS"); // force store @@ -3040,7 +3040,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_vars == null) { - _vars = new ClanVariables(getId()); + _vars = new ClanVariables(_clanId); if (Config.CLAN_VARIABLES_STORE_INTERVAL > 0) { ThreadPool.scheduleAtFixedRate(this::storeVariables, Config.CLAN_VARIABLES_STORE_INTERVAL, Config.CLAN_VARIABLES_STORE_INTERVAL); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ClanMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ClanMember.java index 7f0fa86028..8827f75a89 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ClanMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2ClanMember.java @@ -855,7 +855,6 @@ public class L2ClanMember private PlayerVariables getVariables() { - final L2PcInstance player = getPlayerInstance(); - return player != null ? player.getVariables() : new PlayerVariables(_objectId); + return _player != null ? _player.getVariables() : new PlayerVariables(_objectId); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index d91e7e0554..df5da1b8ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Crest.java index dc3c3497a3..24eedf1679 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,42 +94,41 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - final byte[] data = getData(); - if (data != null) + if (_data != null) { for (int i = 0; i <= 4; i++) { if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); - activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); + System.arraycopy(_data, (14336 * i), fullChunk, 0, 14336); + activeChar.sendPacket(new ExPledgeEmblem(_id, fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); - activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); + System.arraycopy(_data, (14336 * i), lastChunk, 0, 8320); + activeChar.sendPacket(new ExPledgeEmblem(_id, lastChunk, 0, i)); } } } - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java index a1eb3d2480..5c086b9d83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -52,7 +52,7 @@ public class L2Mentee try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT char_name, level, base_class FROM characters WHERE charId = ?")) { - statement.setInt(1, getObjectId()); + statement.setInt(1, _objectId); try (ResultSet rset = statement.executeQuery()) { if (rset.next()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java index 171ad1e543..70a2a9e6e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Object.java @@ -148,15 +148,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -180,7 +175,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -242,7 +237,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -632,7 +627,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get()); } /** @@ -680,13 +675,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -781,7 +775,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -806,7 +800,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -880,19 +874,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -904,6 +897,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java index 9636853228..d01a52009e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java @@ -168,7 +168,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -195,7 +195,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -260,7 +260,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -279,7 +279,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -294,7 +294,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -305,14 +305,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if (pMember != null) { @@ -333,7 +333,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -357,7 +357,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -439,7 +439,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(target, tacticalSignId)); m.sendPacket(sm); @@ -450,7 +450,7 @@ public class L2Party extends AbstractPlayerGroup // Sign already assigned // If the sign is applied on the same target, remove it _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); + _members.forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); } else { @@ -462,7 +462,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); @@ -502,19 +502,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isInDuel()) @@ -573,25 +573,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(ExCloseMPCC.STATIC_PACKET); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -653,7 +653,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -663,9 +663,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -800,7 +800,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -930,11 +930,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2SiegeClan.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2SiegeClan.java index 2ba2a8a219..57266247c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2SiegeClan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2SiegeClan.java @@ -53,12 +53,12 @@ public class L2SiegeClan flag.deleteMe(); - return getFlag().remove(flag); + return _flags.remove(flag); } public void removeFlags() { - for (L2Npc flag : getFlag()) + for (L2Npc flag : _flags) { removeFlag(flag); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java index 1b7cb26b50..f36fed74eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -511,7 +511,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocz = loc.getZ(); setLocation(loc); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -519,9 +519,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -539,16 +539,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } // Set custom Npc server side name and title @@ -670,7 +670,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } public final boolean getRandomWalking() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 97608b326d..4a88a92311 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java index 4b5e290517..3794527a37 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Location.java @@ -190,6 +190,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java index 4eb38cf27b..ef36048457 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -136,16 +136,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -200,12 +200,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + int choice = Rnd.nextInt(getMobs().size()); for (L2ControllableMobInstance mob : getMobs()) { if (--choice == 0) @@ -220,7 +220,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroupTable.java index da1b620a40..121e34e9c4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Petition.java index cbed80441a..ff4816d7ef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TempItem.java index fa918cfc55..db4b2f817f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TempItem.java @@ -28,7 +28,7 @@ public final class TempItem { private final int _itemId; private int _quantity; - private final int _referencePrice; + private final long _referencePrice; private final String _itemName; /** @@ -60,7 +60,7 @@ public final class TempItem _quantity = quantity; } - public int getReferencePrice() + public long getReferencePrice() { return _referencePrice; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java index 197f137df5..7d0fa18073 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/TradeList.java @@ -195,7 +195,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -209,13 +209,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -265,7 +265,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -312,7 +312,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -607,15 +607,15 @@ public class TradeList boolean success = false; // check weight and slots - if (!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()) || !partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())) + if ((!_owner.getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if (!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())) || !partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))) + else if ((!_owner.getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -624,7 +624,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -649,7 +649,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -705,7 +705,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 0acc52a711..00b850b661 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -208,7 +208,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -239,7 +239,7 @@ public class L2Attackable extends L2Npc addDamage(attacker, (int) value, skill); // Check Raidboss attack. Character will be petrified if attacking a raid that's more than 8 levels lower. In retail you deal damage to raid before curse. - if (isRaid() && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) + if (_isRaid && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) { if (attacker.getLevel() > (getLevel() + 8)) { @@ -386,7 +386,7 @@ public class L2Attackable extends L2Npc } // Calculate raidboss points - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final L2PcInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer(); broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); @@ -480,7 +480,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -489,8 +489,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -515,7 +515,7 @@ public class L2Attackable extends L2Npc } clan.addHuntingPoints(attacker, this, finalExp); } - attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, isRaid()), true, false); + attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp); } } @@ -592,7 +592,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -603,8 +603,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -984,7 +984,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1036,7 +1036,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); sm.addString(getName()); @@ -1048,7 +1048,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) + if (Config.CHAMPION_ENABLE && _champion && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY); final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty); @@ -1230,7 +1230,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() != _spoilerObjectId) && !sweeper.isInLooterParty(_spoilerObjectId)) { if (sendMessage) { @@ -1384,7 +1384,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1458,7 +1458,7 @@ public class L2Attackable extends L2Npc if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (isMonster() && !getTemplate().isUndying() && !_isRaid && !_isRaidMinion && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -1683,7 +1683,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b8662c6e57..a5d7f51aa7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -499,13 +499,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public double getCollisionRadius() { - final double defaultCollisionRadius = getTemplate().getCollisionRadius(); + final double defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } public double getCollisionHeight() { - final double defaultCollisionHeight = getTemplate().getCollisionHeight(); + final double defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -530,7 +530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -550,9 +550,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Stop on creature see task and clear the data @@ -584,7 +584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -649,8 +649,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -703,8 +703,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // HP - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); - su.addUpdate(StatusUpdateType.CUR_HP, (int) getCurrentHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); + su.addUpdate(StatusUpdateType.CUR_HP, (int) _status.getCurrentHp()); // MP computeStatusUpdate(su, StatusUpdateType.MAX_MP); @@ -1053,7 +1053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe mpConsume = weaponItem.getReducedMpConsume(); } mpConsume = isAffected(EffectFlag.CHEAPSHOT) ? 0 : mpConsume; - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1065,7 +1065,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } } } @@ -1073,7 +1073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final WeaponType attackType = getAttackType(); final boolean isTwoHanded = (weaponItem != null) && (weaponItem.getBodyPart() == L2Item.SLOT_LR_HAND); - final int timeAtk = Formulas.calculateTimeBetweenAttacks(getPAtkSpd()); + final int timeAtk = Formulas.calculateTimeBetweenAttacks(_stat.getPAtkSpd()); final int timeToHit = Formulas.calculateTimeToHit(timeAtk, weaponType, isTwoHanded, false); _attackEndTime = System.nanoTime() + (TimeUnit.MILLISECONDS.toNanos(timeAtk)); @@ -1196,12 +1196,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackCountMax = (int) getStat().getValue(Stats.ATTACK_COUNT_MAX, 1); - if ((attackCountMax > 1) && !(getStat().getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) + int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1); + if ((attackCountMax > 1) && !(_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) { final double headingAngle = Util.convertHeadingToDegree(getHeading()); - final int maxRadius = getStat().getPhysicalAttackRadius(); - final int physicalAttackAngle = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRadius(); + final int physicalAttackAngle = _stat.getPhysicalAttackAngle(); for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius)) { // Skip main target. @@ -1251,7 +1251,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss) { shld = Formulas.calcShldUse(this, target); - crit = Formulas.calcCrit(getStat().getCriticalHit(), this, target, null); + crit = Formulas.calcCrit(_stat.getCriticalHit(), this, target, null); damage = (int) Formulas.calcAutoAttackDamage(this, target, shld, crit, shotConsumed); if (halfDamage) { @@ -1294,7 +1294,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Try casting the skill - final SkillCaster skillCaster = SkillCaster.castSkill(this, getTarget(), skill, item, castingType, ctrlPressed, shiftPressed); + final SkillCaster skillCaster = SkillCaster.castSkill(this, _target, skill, item, castingType, ctrlPressed, shiftPressed); if ((skillCaster == null) && isPlayer()) { // Skill casting failed, notify player. @@ -1612,7 +1612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); if (isMonster()) { @@ -1676,9 +1676,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Remove all effects, do not broadcast changes. @@ -1696,26 +1696,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -1855,7 +1855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; } public final boolean isConfused() @@ -1915,7 +1915,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return hasBlockActions() || isRooted() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting(); + return hasBlockActions() || isRooted() || _isOverloaded || _isImmobilized || isAlikeDead() || _isTeleporting; } public final boolean isOverloaded() @@ -1934,7 +1934,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2023,7 +2023,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2048,7 +2048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2379,7 +2379,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.STUN); + _effectList.stopEffects(AbnormalType.STUN); } if (!isPlayer()) @@ -2402,11 +2402,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.TRANSFORM); - getEffectList().stopEffects(AbnormalType.CHANGEBODY); + _effectList.stopEffects(AbnormalType.TRANSFORM); + _effectList.stopEffects(AbnormalType.CHANGEBODY); } - if (isTransformed()) + if (_transform.isPresent()) { untransform(); } @@ -2517,7 +2517,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet. - if (isMoving() && (getMoveSpeed() <= 0)) + if (isMoving() && (_stat.getMoveSpeed() <= 0)) { stopMove(null); } @@ -2585,7 +2585,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxCp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp()); } break; } @@ -2597,7 +2597,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); } break; } @@ -2609,7 +2609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxMp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp()); } break; } @@ -2682,7 +2682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2924,7 +2924,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided @@ -2940,7 +2940,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -3147,7 +3147,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -3174,7 +3174,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -3252,7 +3252,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -3381,7 +3381,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -3428,7 +3428,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -3623,7 +3623,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void onHitTimeNotDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3652,7 +3652,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onFirstHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime, int delayForSecondAttack) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3682,7 +3682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onSecondHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime1, int hitTime2, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3970,10 +3970,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Stop all effects of that skill if (oldSkill.isPassive()) { - getEffectList().stopSkillEffects(true, oldSkill); + _effectList.stopSkillEffects(true, oldSkill); } - getStat().recalculateStats(true); + _stat.recalculateStats(true); } if (newSkill.isPassive()) @@ -4008,7 +4008,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) { stopSkillEffects(true, oldSkill.getId()); - getStat().recalculateStats(true); + _stat.recalculateStats(true); } } @@ -4105,7 +4105,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - final int random = (int) getStat().getValue(Stats.RANDOM_DAMAGE); + final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE); return (1 + ((double) Rnd.get(-random, random) / 100)); } @@ -4127,193 +4127,193 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public int getMagicAccuracy() { - return getStat().getMagicAccuracy(); + return _stat.getMagicAccuracy(); } public int getMagicEvasionRate() { - return getStat().getMagicEvasionRate(); + return _stat.getMagicEvasionRate(); } public final double getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(int init) { - return getStat().getCriticalDmg(init); + return _stat.getCriticalDmg(init); } public int getCriticalHit() { - return getStat().getCriticalHit(); + return _stat.getCriticalHit(); } public int getEvasionRate() { - return getStat().getEvasionRate(); + return _stat.getEvasionRate(); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public int getMAtk() { - return getStat().getMAtk(); + return _stat.getMAtk(); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit() { - return getStat().getMCriticalHit(); + return _stat.getMCriticalHit(); } public int getMDef() { - return getStat().getMDef(); + return _stat.getMDef(); } public int getPAtk() { - return getStat().getPAtk(); + return _stat.getPAtk(); } public int getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public int getPDef() { - return getStat().getPDef(); + return _stat.getPDef(); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } public int getLUC() { - return getStat().getLUC(); + return _stat.getLUC(); } public int getCHA() { - return getStat().getCHA(); + return _stat.getCHA(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) @@ -4338,7 +4338,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // RearDamage effect bonus. if (isBehind(target)) { - damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1); } // Counterattacks happen before damage received. @@ -4383,27 +4383,27 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Absorb HP from the damage inflicted double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1); - if ((absorbPercent > 0) && (Rnd.nextDouble() < getStat().getValue(Stats.ABSORB_DAMAGE_CHANCE))) + if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE))) { - int absorbDamage = (int) Math.min(absorbPercent * damage, getMaxRecoverableHp() - getCurrentHp()); + int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp()); if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted. Unconfirmed for skill attacks. if (skill == null) { - absorbPercent = getStat().getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); + absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); if (absorbPercent > 0) { - int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, getMaxRecoverableMp() - getCurrentMp()); + int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp()); if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } } @@ -4448,7 +4448,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - final double damageCap = getStat().getValue(Stats.DAMAGE_LIMIT); + final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT); if (damageCap > 0) { value = Math.min(value, damageCap); @@ -4459,17 +4459,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + getStat().getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; } else { - value *= (100 + getStat().getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; } } if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } else if (isPlayer()) { @@ -4477,7 +4477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } if (attacker != null) @@ -4488,83 +4488,83 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final int getCurrentCpPercent() { - return (int) ((getCurrentCp() * 100) / getMaxCp()); + return (int) ((_status.getCurrentCp() * 100) / _stat.getMaxCp()); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final void setCurrentCp(double newCp, boolean broadcast) { - getStatus().setCurrentCp(newCp, broadcast); + _status.setCurrentCp(newCp, broadcast); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final int getCurrentHpPercent() { - return (int) ((getCurrentHp() * 100) / getMaxHp()); + return (int) ((_status.getCurrentHp() * 100) / _stat.getMaxHp()); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHp(double newHp, boolean broadcast) { - getStatus().setCurrentHp(newHp, broadcast); + _status.setCurrentHp(newHp, broadcast); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final int getCurrentMpPercent() { - return (int) ((getCurrentMp() * 100) / getMaxMp()); + return (int) ((_status.getCurrentMp() * 100) / _stat.getMaxMp()); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } public final void setCurrentMp(double newMp, boolean broadcast) { - getStatus().setCurrentMp(newMp, false); + _status.setCurrentMp(newMp, false); } /** @@ -4577,7 +4577,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); - return (int) getStat().getValue(Stats.WEIGHT_LIMIT, baseLoad); + return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad); } return 0; } @@ -4586,7 +4586,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (isPlayer() || isPet()) { - return (int) getStat().getValue(Stats.WEIGHT_PENALTY, 1); + return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1); } return 0; } @@ -4623,17 +4623,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public AttributeType getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(AttributeType attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(AttributeType defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -4852,8 +4852,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return weapon.getItemType(); } - final WeaponType defaultWeaponType = getTemplate().getBaseAttackType(); - return getTransformation().map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); + final WeaponType defaultWeaponType = _template.getBaseAttackType(); + return _transform.map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); } public final boolean isInCategory(CategoryType type) @@ -5001,7 +5001,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).collect(Collectors.toList()); + return _skillCasters.values().stream().filter(filter).collect(Collectors.toList()); } @SafeVarargs @@ -5012,7 +5012,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).findAny().orElse(null); + return _skillCasters.values().stream().filter(filter).findAny().orElse(null); } /** @@ -5098,7 +5098,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -5128,7 +5128,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override @@ -5200,7 +5200,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean hasAbnormalType(AbnormalType abnormalType) { - return getEffectList().hasAbnormalType(abnormalType); + return _effectList.hasAbnormalType(abnormalType); } public void addBlockActionsAllowedSkill(int skillId) @@ -5267,11 +5267,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public MoveType getMoveType() { - if (isMoving() && isRunning()) + if (isMoving() && _isRunning) { return MoveType.RUNNING; } - else if (isMoving() && !isRunning()) + else if (isMoving() && !_isRunning) { return MoveType.WALKING; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 87e507807a..c6d0dec751 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -372,7 +372,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -514,7 +514,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -745,7 +745,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -925,7 +925,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getReputation() >= 0)) @@ -999,10 +999,9 @@ public class L2Npc extends L2Character DecayTaskManager.getInstance().add(this); - final L2Spawn spawn = getSpawn(); - if (spawn != null) + if (_spawn != null) { - final NpcSpawnTemplate npcTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcTemplate = _spawn.getNpcSpawnTemplate(); if (npcTemplate != null) { npcTemplate.notifyNpcDeath(this, killer); @@ -1140,7 +1139,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1228,7 +1227,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1299,7 +1298,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1318,7 +1317,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1394,7 +1393,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic, boolean fish) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1474,7 +1473,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** @@ -1784,10 +1783,9 @@ public class L2Npc extends L2Character return _params; } - final L2Spawn spawn = getSpawn(); - if (spawn != null) // Minions doesn't have L2Spawn object bound + if (_spawn != null) // Minions doesn't have L2Spawn object bound { - final NpcSpawnTemplate npcSpawnTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { final StatsSet params = getTemplate().getParameters(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 67b1130e8f..4c28ea1dcb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -118,15 +118,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -196,7 +196,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if (player == getOwner()) + if (player == _owner) { player.sendPacket(new PetInfo(this, 1)); return; @@ -242,19 +242,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getReputation() { - return getOwner() != null ? getOwner().getReputation() : 0; + return _owner != null ? _owner.getReputation() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -313,8 +313,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -326,7 +325,7 @@ public abstract class L2Summon extends L2Playable final AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -392,7 +391,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); } @@ -434,12 +433,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } @@ -477,7 +476,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -546,7 +545,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, L2ItemInstance item, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -654,7 +653,7 @@ public abstract class L2Summon extends L2Playable if (skill.isBad()) { // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; @@ -673,7 +672,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -695,13 +694,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (crit) { @@ -715,14 +714,14 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } final SystemMessage sm; - if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF))) + if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF))) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } @@ -744,7 +743,7 @@ public abstract class L2Summon extends L2Playable { super.reduceCurrentHp(damage, attacker, skill); - if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) + if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -757,14 +756,13 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); - if ((skill.getTarget(this, false, false, false) == null) && !actingPlayer.getAccessLevel().allowPeaceAttack()) + if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance - actingPlayer.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + _owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // Send a Server->Client packet ActionFailed to the L2PcInstance - actingPlayer.sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -774,18 +772,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -796,10 +794,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } } @@ -807,7 +805,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -842,7 +840,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, isDead() ? 0 : 1)); if (isPet()) @@ -870,7 +868,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -904,7 +902,7 @@ public abstract class L2Summon extends L2Playable */ public void doAttack(L2Object target) { - if (getOwner() != null) + if (_owner != null) { if (target != null) { @@ -912,7 +910,7 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -926,12 +924,12 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(L2Object target, boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - if ((target == null) || (this == target) || (getOwner() == target)) + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -940,7 +938,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -960,28 +958,28 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -994,7 +992,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1014,18 +1012,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1041,14 +1039,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1059,7 +1057,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1071,14 +1069,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1086,13 +1084,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() @@ -1144,7 +1142,7 @@ public abstract class L2Summon extends L2Playable public void sendInventoryUpdate(InventoryUpdate iu) { - final L2PcInstance owner = getOwner(); + final L2PcInstance owner = _owner; if (owner != null) { owner.sendInventoryUpdate(iu); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index fe1f4c81cf..a03a262e08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -74,7 +74,7 @@ public class PcAppearance { if (_visibleName == null) { - return getOwner().getName(); + return _owner.getName(); } return _visibleName; } @@ -94,7 +94,7 @@ public class PcAppearance { if (_visibleTitle == null) { - return getOwner().getTitle(); + return _owner.getTitle(); } return _visibleTitle; } @@ -220,27 +220,27 @@ public class PcAppearance public int getVisibleClanId() { - return _visibleClanId != -1 ? _visibleClanId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanId(); + return _visibleClanId != -1 ? _visibleClanId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanId(); } public int getVisibleClanCrestId() { - return _visibleClanCrestId != -1 ? _visibleClanCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestId(); + return _visibleClanCrestId != -1 ? _visibleClanCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestId(); } public int getVisibleClanLargeCrestId() { - return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestLargeId(); + return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestLargeId(); } public int getVisibleAllyId() { - return _visibleAllyId != -1 ? _visibleAllyId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyId(); + return _visibleAllyId != -1 ? _visibleAllyId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyId(); } public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 91548e2a10..7aae137ada 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -53,7 +53,7 @@ public class L2DecoyInstance extends L2Character _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; final int skilllevel = getTemplate().getDisplayId() - 13070; - _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); + _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -269,18 +269,18 @@ public class L2DecoyInstance extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index baab09b858..d82f30b44d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class L2DoorInstance extends L2Character { - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isInverted = false; private int _meshindex = 1; @@ -293,7 +293,7 @@ public final class L2DoorInstance extends L2Character { return false; } - else if (getIsAttackableDoor()) + else if (_isAttackableDoor) { return true; } @@ -369,13 +369,13 @@ public final class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - oe = new OnEventTrigger(getEmitter(), !isOpen()); + oe = new OnEventTrigger(getEmitter(), !_open); } else { - oe = new OnEventTrigger(getEmitter(), isOpen()); + oe = new OnEventTrigger(getEmitter(), _open); } } @@ -592,13 +592,13 @@ public final class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), !isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), !_open)); } else { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), _open)); } } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -649,7 +649,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -661,8 +661,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -671,7 +670,7 @@ public final class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 35cb265650..53df3b876a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -75,7 +75,7 @@ public class L2MonsterInstance extends L2Attackable } // Check if the L2MonsterInstance target is aggressive - if (Config.GUARD_ATTACK_AGGRO_MOB && isAggressive() && (attacker instanceof L2GuardInstance)) + if (Config.GUARD_ATTACK_AGGRO_MOB && getTemplate().isAggressive() && (attacker instanceof L2GuardInstance)) { return true; } @@ -108,11 +108,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -173,9 +173,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -229,7 +229,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -238,7 +238,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 073c17bae0..d492ebdb42 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -503,7 +503,7 @@ public final class L2PcInstance extends L2Playable private AdminTeleportType _teleportType = AdminTeleportType.NORMAL; private boolean _inCrystallize; - private boolean _inCraftMode; + private boolean _isCrafting; private long _offlineShopStart = 0; @@ -908,7 +908,7 @@ public final class L2PcInstance extends L2Playable public String getAccountName() { - return _client == null ? getAccountNamePlayer() : _client.getAccountName(); + return _client == null ? _accountName : _client.getAccountName(); } public String getAccountNamePlayer() @@ -925,7 +925,7 @@ public final class L2PcInstance extends L2Playable { int result = 0; - if (getClan() != null) + if (_clan != null) { result |= RelationChanged.RELATION_CLAN_MEMBER; if (getClan() == target.getClan()) @@ -944,9 +944,9 @@ public final class L2PcInstance extends L2Playable if ((getParty() != null) && (getParty() == target.getParty())) { result |= RelationChanged.RELATION_HAS_PARTY; - for (int i = 0; i < getParty().getMembers().size(); i++) + for (int i = 0; i < _party.getMembers().size(); i++) { - if (getParty().getMembers().get(i) != this) + if (_party.getMembers().get(i) != this) { continue; } @@ -1000,7 +1000,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getSiegeState() != 0) + if (_siegeState != 0) { result |= RelationChanged.RELATION_INSIEGE; if (getSiegeState() != target.getSiegeState()) @@ -1011,7 +1011,7 @@ public final class L2PcInstance extends L2Playable { result |= RelationChanged.RELATION_ALLY; } - if (getSiegeState() == 1) + if (_siegeState == 1) { result |= RelationChanged.RELATION_ATTACKER; } @@ -1027,7 +1027,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getBlockCheckerArena() != -1) + if (_handysBlockCheckerEventArena != -1) { result |= RelationChanged.RELATION_INSIEGE; final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); @@ -1207,17 +1207,17 @@ public final class L2PcInstance extends L2Playable public boolean isInStoreMode() { - return getPrivateStoreType() != PrivateStoreType.NONE; + return _privateStoreType != PrivateStoreType.NONE; } - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** @@ -1294,7 +1294,7 @@ public final class L2PcInstance extends L2Playable LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) { @@ -1427,13 +1427,13 @@ public final class L2PcInstance extends L2Playable return; } - final L2Npc target = getLastFolkNPC(); + final L2Npc target = _lastFolkNpc; if ((target != null) && isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false)) { quest.notifyEvent(event, target, this); } - else if (getLastQuestNpcObject() > 0) + else if (_questNpcObject > 0) { final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); @@ -1634,7 +1634,7 @@ public final class L2PcInstance extends L2Playable @Override public void updatePvPFlag(int value) { - if (getPvpFlag() == value) + if (_pvpFlag == value) { return; } @@ -1652,7 +1652,7 @@ public final class L2PcInstance extends L2Playable if (hasSummon()) { final RelationChanged rc = new RelationChanged(); - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, getRelation(this), false); @@ -1679,7 +1679,7 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, relation, isAutoAttackable(player)); @@ -2086,7 +2086,7 @@ public final class L2PcInstance extends L2Playable weaponPenalty = weaponPenalty - expertiseLevel - bonus; weaponPenalty = Math.min(Math.max(weaponPenalty, 0), 4); - if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) + if ((_expertiseWeaponPenalty != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) { _expertiseWeaponPenalty = weaponPenalty; if (_expertiseWeaponPenalty > 0) @@ -2104,7 +2104,7 @@ public final class L2PcInstance extends L2Playable armorPenalty = armorPenalty - expertiseLevel - bonus; armorPenalty = Math.min(Math.max(armorPenalty, 0), 4); - if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) + if ((_expertiseArmorPenalty != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) { _expertiseArmorPenalty = armorPenalty; if (_expertiseArmorPenalty > 0) @@ -2147,20 +2147,20 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - final int slot = getInventory().getSlotFromItem(item); + final int slot = _inventory.getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { - items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + items = _inventory.unEquipItemInSlotAndRecord(item.getLocationSlot()); } else { - items = getInventory().unEquipItemInBodySlotAndRecord(slot); + items = _inventory.unEquipItemInBodySlotAndRecord(slot); } } else { - items = getInventory().equipItemAndRecord(item); + items = _inventory.equipItemAndRecord(item); if (item.isEquipped()) { @@ -2272,7 +2272,7 @@ public final class L2PcInstance extends L2Playable */ public void increaseRaidbossPoints(int increasePoints) { - setRaidbossPoints(getRaidbossPoints() + increasePoints); + setRaidbossPoints(_raidbossPoints + increasePoints); } /** @@ -2298,17 +2298,17 @@ public final class L2PcInstance extends L2Playable { if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.THIRD)) { - if (getLvlJoinedAcademy() <= 16) + if (_lvlJoinedAcademy <= 16) { _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); } - else if (getLvlJoinedAcademy() >= 39) + else if (_lvlJoinedAcademy >= 39) { _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -2320,7 +2320,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES); // receive graduation gift - getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet + _inventory.addItem("Gift", 8181, 1, this, null); // give academy circlet } if (isSubClassActive()) { @@ -2341,12 +2341,12 @@ public final class L2PcInstance extends L2Playable // Update class icon in party and clan if (isInParty()) { - getParty().broadcastPacket(new PartySmallWindowUpdate(this, true)); + _party.broadcastPacket(new PartySmallWindowUpdate(this, true)); } - if (getClan() != null) + if (_clan != null) { - getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); + _clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); } sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED)); @@ -2495,33 +2495,32 @@ public final class L2PcInstance extends L2Playable } // Add Hero skills if hero - if (isHero()) + if (_hero) { setHero(true); } // Add clan skills - if (getClan() != null) + if (_clan != null) { - final L2Clan clan = getClan(); - clan.addSkillEffects(this); + _clan.addSkillEffects(this); - if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) + if ((_clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) { SiegeManager.getInstance().addSiegeSkills(this); } - if (getClan().getCastleId() > 0) + if (_clan.getCastleId() > 0) { CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this); } - if (getClan().getFortId() > 0) + if (_clan.getFortId() > 0) { FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this); } } // Reload passive skills from armors / jewels / weapons - getInventory().reloadEquippedItems(); + _inventory.reloadEquippedItems(); } /** @@ -2668,13 +2667,12 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info - if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) + if ((_clan != null) && (_clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -2812,7 +2810,7 @@ public final class L2PcInstance extends L2Playable */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().isSitForced()) + if (L2Event.isParticipant(this) && eventStatus.isSitForced()) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -2966,7 +2964,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAdena()) + if (count > _inventory.getAdena()) { if (sendMessage) { @@ -3016,7 +3014,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceBeautyTickets(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getBeautyTickets()) + if (count > _inventory.getBeautyTickets()) { if (sendMessage) { @@ -3110,7 +3108,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAncientAdena()) + if (count > _inventory.getAncientAdena()) { if (sendMessage) { @@ -3516,7 +3514,7 @@ public final class L2PcInstance extends L2Playable { return null; } - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3600,7 +3598,7 @@ public final class L2PcInstance extends L2Playable */ public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) { - final PcInventory inv = getInventory(); + final PcInventory inv = _inventory; if (!inv.validateCapacityByItemId(rewardId, count)) { if (sendMessage) @@ -3802,7 +3800,7 @@ public final class L2PcInstance extends L2Playable return null; } - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -3823,8 +3821,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return null; } @@ -4028,10 +4025,8 @@ public final class L2PcInstance extends L2Playable final boolean needHpUpdate = needHpUpdate(); final boolean needMpUpdate = needMpUpdate(); - final L2Party party = getParty(); - // Check if a party is in progress and party window update is usefull - if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) + if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) { final PartySmallWindowUpdate partyWindow = new PartySmallWindowUpdate(this, false); if (needCpUpdate) @@ -4049,10 +4044,10 @@ public final class L2PcInstance extends L2Playable partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP); partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP); } - party.broadcastToPartyMembers(this, partyWindow); + _party.broadcastToPartyMembers(this, partyWindow); } - if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) + if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) { final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); if ((game != null) && game.isBattleStarted()) @@ -4062,7 +4057,7 @@ public final class L2PcInstance extends L2Playable } // In duel MP updated only with CP or HP - if (isInDuel() && (needCpUpdate || needHpUpdate)) + if (_isInDuel && (needCpUpdate || needHpUpdate)) { DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this)); } @@ -4149,10 +4144,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4190,10 +4184,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4222,15 +4215,15 @@ public final class L2PcInstance extends L2Playable public int getAllyCrestId() { - if (getClanId() == 0) + if (_clanId == 0) { return 0; } - if (getClan().getAllyId() == 0) + if (_clan.getAllyId() == 0) { return 0; } - return getClan().getAllyCrestId(); + return _clan.getAllyCrestId(); } /** @@ -4269,22 +4262,21 @@ public final class L2PcInstance extends L2Playable { if (target instanceof L2PcInstance) { - final L2PcInstance temp = (L2PcInstance) target; + final L2PcInstance targetPlayer = (L2PcInstance) target; sendPacket(ActionFailed.STATIC_PACKET); - if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) + if ((targetPlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (targetPlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) { - sendPacket(new PrivateStoreListSell(this, temp)); + sendPacket(new PrivateStoreListSell(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.BUY) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.BUY) { - sendPacket(new PrivateStoreListBuy(this, temp)); + sendPacket(new PrivateStoreListBuy(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) { - sendPacket(new RecipeShopSellList(this, temp)); + sendPacket(new RecipeShopSellList(this, targetPlayer)); } - } else if (target != null) // _interactTarget=null should never happen but one never knows ^^; { @@ -4309,7 +4301,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) { - getParty().distributeItem(this, itemId, itemCount, false, target); + _party.distributeItem(this, itemId, itemCount, false, target); } else if (itemId == Inventory.ADENA_ID) { @@ -4389,7 +4381,7 @@ public final class L2PcInstance extends L2Playable return; } - if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) + if (((isInParty() && (_party.getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -4498,9 +4490,9 @@ public final class L2PcInstance extends L2Playable // Check if a Party is in progress if (isInParty()) { - getParty().distributeItem(this, target); + _party.distributeItem(this, target); } - else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) + else if ((target.getId() == Inventory.ADENA_ID) && (_inventory.getAdenaInstance() != null)) { addAdena("Pickup", target.getCount(), null, true); ItemTable.getInstance().destroyItem("Pickup", target, this, null); @@ -4509,7 +4501,7 @@ public final class L2PcInstance extends L2Playable { addItem("Pickup", target, null, true); // Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts. - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { final L2EtcItem etcItem = target.getEtcItem(); @@ -4558,13 +4550,13 @@ public final class L2PcInstance extends L2Playable } } - return !isSellingBuffs() && !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); + return !_isSellingBuffs && !isAlikeDead() && !_inOlympiadMode && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); } @Override public int getMinShopDistance() { - return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return _waitTypeSitting ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4572,13 +4564,13 @@ public final class L2PcInstance extends L2Playable // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death) if (canOpenPrivateStore()) { - if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) + if ((_privateStoreType == PrivateStoreType.BUY) || (_privateStoreType == PrivateStoreType.BUY_MANAGE)) { setPrivateStoreType(PrivateStoreType.NONE); } - if (getPrivateStoreType() == PrivateStoreType.NONE) + if (_privateStoreType == PrivateStoreType.NONE) { - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -4620,7 +4612,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -4705,7 +4697,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getActiveWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); } /** @@ -4717,7 +4709,7 @@ public final class L2PcInstance extends L2Playable final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { - return getFistsWeaponItem(); + return _fistsWeaponItem; } return (L2Weapon) weapon.getItem(); @@ -4725,12 +4717,12 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance getChestArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); } public L2ItemInstance getLegsArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LEGS); } public L2Armor getActiveChestArmorItem() @@ -4771,7 +4763,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) { return true; } @@ -4793,7 +4785,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) { return true; } @@ -4815,7 +4807,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) { return true; } @@ -4829,7 +4821,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getSecondaryWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); } /** @@ -4839,7 +4831,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -4879,12 +4871,12 @@ public final class L2PcInstance extends L2Playable !(Config.DISABLE_REWARDS_IN_PVP_ZONES && isInsideZone(ZoneId.PVP))) { // pvp - if (Config.REWARD_PVP_ITEM && (getPvpFlag() != 0)) + if (Config.REWARD_PVP_ITEM && (_pvpFlag != 0)) { pk.addItem("PvP Item Reward", Config.REWARD_PVP_ITEM_ID, Config.REWARD_PVP_ITEM_AMOUNT, this, Config.REWARD_PVP_ITEM_MESSAGE); } // pk - if (Config.REWARD_PK_ITEM && (getPvpFlag() == 0)) + if (Config.REWARD_PK_ITEM && (_pvpFlag == 0)) { pk.addItem("PK Item Reward", Config.REWARD_PK_ITEM_ID, Config.REWARD_PK_ITEM_AMOUNT, this, Config.REWARD_PK_ITEM_MESSAGE); } @@ -4895,7 +4887,7 @@ public final class L2PcInstance extends L2Playable if (Config.ANNOUNCE_PK_PVP && (((pk != null) && !pk.isGM()) || fpcKill)) { String msg = ""; - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4909,7 +4901,7 @@ public final class L2PcInstance extends L2Playable Broadcast.toAllOnlinePlayers(msg, false); } } - else if (getPvpFlag() != 0) + else if (_pvpFlag != 0) { msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4925,7 +4917,7 @@ public final class L2PcInstance extends L2Playable } } - if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (getPvpFlag() == 0) && (getReputation() >= 0)) + if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (_pvpFlag == 0) && (getReputation() >= 0)) { killer.setReputation(killer.getReputation() - 150); } @@ -4946,7 +4938,7 @@ public final class L2PcInstance extends L2Playable { CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer); } - else if (isCombatFlagEquipped()) + else if (_combatFlagEquippedId) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -4955,9 +4947,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } else @@ -4970,7 +4962,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && (pk != null)) { final L2Clan pkClan = pk.getClan(); - if ((pkClan != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pkClan != null) && (_clan != null) && !isAcademyMember() && !(pk.isAcademyMember())) { final ClanWar clanWar = _clan.getWarWith(pkClan.getId()); if ((clanWar != null) && AntiFeedManager.getInstance().check(killer, this)) @@ -5012,7 +5004,7 @@ public final class L2PcInstance extends L2Playable getSkillChannelized().abortChannelization(); } - if (getAgathionId() != 0) + if (_agathionId != 0) { setAgathionId(0); } @@ -5040,8 +5032,8 @@ public final class L2PcInstance extends L2Playable } final L2PcInstance pk = killer.getActingPlayer(); - if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) - // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) + if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) + // || _clan.isAtWarWith(((L2PcInstance)killer).getClanId()) )) { return; @@ -5057,7 +5049,7 @@ public final class L2PcInstance extends L2Playable int dropPercent = 0; // Classic calculation. - if (killer.isPlayable() && (getReputation() < 0) && (getPkKills() >= Config.KARMA_PK_LIMIT)) + if (killer.isPlayable() && (getReputation() < 0) && (_pkKills >= Config.KARMA_PK_LIMIT)) { isKarmaDrop = true; dropPercent = Config.KARMA_RATE_DROP; @@ -5079,16 +5071,15 @@ public final class L2PcInstance extends L2Playable { int dropCount = 0; int itemDropPercent = 0; - final L2Summon pet = getPet(); - for (L2ItemInstance itemDrop : getInventory().getItems()) + for (L2ItemInstance itemDrop : _inventory.getItems()) { // Don't drop if (itemDrop.isShadowItem() || // Dont drop Shadow Items itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items !itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena (itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items - ((pet != null) && (pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet + ((_pet != null) && (_pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list )) @@ -5100,7 +5091,7 @@ public final class L2PcInstance extends L2Playable { // Set proper chance according to Item type of equipped Item itemDropPercent = itemDrop.getItem().getType2() == L2Item.TYPE2_WEAPON ? dropEquipWeapon : dropEquip; - getInventory().unEquipItemInSlot(itemDrop.getLocationSlot()); + _inventory.unEquipItemInSlot(itemDrop.getLocationSlot()); } else { @@ -5133,80 +5124,78 @@ public final class L2PcInstance extends L2Playable public void onPlayerKill(L2Playable killedPlayable) { - final L2PcInstance player = getActingPlayer(); final L2PcInstance killedPlayer = killedPlayable.getActingPlayer(); // Avoid nulls && check if player != killedPlayer - if ((player == null) || (killedPlayer == null) || (player == killedPlayer)) + if ((killedPlayer == null) || (this == killedPlayer)) { return; } // Cursed weapons progress - if (player.isCursedWeaponEquipped() && killedPlayer.isPlayer()) + if (isCursedWeaponEquipped() && killedPlayer.isPlayer()) { CursedWeaponsManager.getInstance().increaseKills(getCursedWeaponEquippedId()); return; } // Duel support - if (player.isInDuel() && killedPlayer.getActingPlayer().isInDuel()) + if (isInDuel() && killedPlayer.isInDuel()) { return; } // Do nothing if both players are in PVP zone - if (player.isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) + if (isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) { return; } // If both players are in SIEGE zone just increase siege kills/deaths - if (player.isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) + if (isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) { - if ((player.getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (player.getSiegeState() != killedPlayer.getSiegeState())) + if ((getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (getSiegeState() != killedPlayer.getSiegeState())) { - final L2Clan killerClan = player.getClan(); final L2Clan targetClan = killedPlayer.getClan(); - if ((killerClan != null) && (targetClan != null)) + if ((_clan != null) && (targetClan != null)) { - killerClan.addSiegeKill(); + _clan.addSiegeKill(); targetClan.addSiegeDeath(); } } return; } - if (player.checkIfPvP(killedPlayer)) + if (checkIfPvP(killedPlayer)) { // Check if player should get + rep if (killedPlayer.getReputation() < 0) { - final int levelDiff = killedPlayer.getLevel() - player.getLevel(); - if ((player.getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours + final int levelDiff = killedPlayer.getLevel() - getLevel(); + if ((getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours { - player.setReputation(player.getReputation() + Config.REPUTATION_INCREASE); + setReputation(getReputation() + Config.REPUTATION_INCREASE); } } - player.setPvpKills(player.getPvpKills() + 1); + setPvpKills(_pvpKills + 1); } - else if ((getReputation() > 0) && (getPkKills() == 0)) + else if ((getReputation() > 0) && (_pkKills == 0)) { - player.setReputation(0); - player.setPkKills(player.getPkKills() + 1); + setReputation(0); + setPkKills(getPkKills() + 1); } else { // Calculate new karma and increase pk count - player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killedPlayable.isSummon())); - player.setPkKills(player.getPkKills() + 1); + setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); + setPkKills(getPkKills() + 1); } final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); - player.sendPacket(ui); - player.checkItemRestriction(); + sendPacket(ui); + checkItemRestriction(); } public void updatePvPStatus() @@ -5217,7 +5206,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5241,7 +5230,7 @@ public final class L2PcInstance extends L2Playable return; } - if (isInDuel() && (player_target.getDuelId() == getDuelId())) + if (_isInDuel && (player_target.getDuelId() == getDuelId())) { return; } @@ -5255,7 +5244,7 @@ public final class L2PcInstance extends L2Playable { setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5276,10 +5265,10 @@ public final class L2PcInstance extends L2Playable */ public void restoreExp(double restorePercent) { - if (getExpBeforeDeath() > 0) + if (_expBeforeDeath > 0) { // Restore the specified % of lost experience. - getStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100)); + getStat().addExp(Math.round(((_expBeforeDeath - getExp()) * restorePercent) / 100)); setExpBeforeDeath(0); } } @@ -5397,10 +5386,9 @@ public final class L2PcInstance extends L2Playable final List summons = new ArrayList<>(); summons.addAll(getServitors().values()); - final L2PetInstance pet = getPet(); - if (pet != null) + if (_pet != null) { - summons.add(pet); + summons.add(_pet); } return summons; @@ -5797,11 +5785,11 @@ public final class L2PcInstance extends L2Playable */ public boolean isClanLeader() { - if (getClan() == null) + if (_clan == null) { return false; } - return getObjectId() == getClan().getLeaderId(); + return getObjectId() == _clan.getLeaderId(); } /** @@ -5811,22 +5799,22 @@ public final class L2PcInstance extends L2Playable @Override protected boolean checkAndEquipAmmunition(EtcItemType type) { - L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + L2ItemInstance arrows = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (arrows == null) { final L2Weapon weapon = getActiveWeaponItem(); if (type == EtcItemType.ARROW) { - arrows = getInventory().findArrowForBow(weapon); + arrows = _inventory.findArrowForBow(weapon); } else if (type == EtcItemType.BOLT) { - arrows = getInventory().findBoltForCrossBow(weapon); + arrows = _inventory.findBoltForCrossBow(weapon); } if (arrows != null) { // Equip arrows needed in left hand - getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); + _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); sendItemList(false); return true; } @@ -5845,7 +5833,7 @@ public final class L2PcInstance extends L2Playable public boolean disarmWeapons() { // If there is no weapon to disarm then return true. - final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance wpn = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (wpn == null) { return true; @@ -5858,7 +5846,7 @@ public final class L2PcInstance extends L2Playable } // Don't allow disarming a Combat Flag or Territory Ward. - if (isCombatFlagEquipped()) + if (_combatFlagEquippedId) { return false; } @@ -5869,7 +5857,7 @@ public final class L2PcInstance extends L2Playable return false; } - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -5906,10 +5894,10 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -6017,7 +6005,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE); return false; } - else if (isSitting()) + else if (_waitTypeSitting) { // A strider can be ridden only when standing sendPacket(ActionFailed.STATIC_PACKET); @@ -6037,7 +6025,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); return false; } - else if (getInventory().getItemByItemId(9819) != null) + else if (_inventory.getItemByItemId(9819) != null) { sendPacket(ActionFailed.STATIC_PACKET); // FIXME: Wrong Message @@ -6067,7 +6055,7 @@ public final class L2PcInstance extends L2Playable } else if (isMounted()) { - if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) + if ((_mountType == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION); @@ -6216,12 +6204,12 @@ public final class L2PcInstance extends L2Playable public boolean isInCommandChannel() { - return isInParty() && getParty().isInCommandChannel(); + return isInParty() && _party.isInCommandChannel(); } public L2CommandChannel getCommandChannel() { - return (isInCommandChannel()) ? getParty().getCommandChannel() : null; + return (isInCommandChannel()) ? _party.getCommandChannel() : null; } /** @@ -6230,7 +6218,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isGM() { - return getAccessLevel().isGm(); + return _accessLevel.isGm(); } /** @@ -6261,8 +6249,8 @@ public final class L2PcInstance extends L2Playable _accessLevel = accessLevel; - getAppearance().setNameColor(_accessLevel.getNameColor()); - getAppearance().setTitleColor(_accessLevel.getTitleColor()); + _appearance.setNameColor(_accessLevel.getNameColor()); + _appearance.setTitleColor(_accessLevel.getTitleColor()); if (broadcast) { broadcastUserInfo(); @@ -6350,10 +6338,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -6423,32 +6410,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(8, getCurrentCp()); statement.setInt(9, getMaxMp()); statement.setDouble(10, getCurrentMp()); - statement.setInt(11, getAppearance().getFace()); - statement.setInt(12, getAppearance().getHairStyle()); - statement.setInt(13, getAppearance().getHairColor()); - statement.setInt(14, getAppearance().getSex() ? 1 : 0); + statement.setInt(11, _appearance.getFace()); + statement.setInt(12, _appearance.getHairStyle()); + statement.setInt(13, _appearance.getHairColor()); + statement.setInt(14, _appearance.getSex() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); - statement.setInt(18, getFame()); - statement.setInt(19, getRaidbossPoints()); - statement.setInt(20, getPvpKills()); - statement.setInt(21, getPkKills()); - statement.setInt(22, getClanId()); + statement.setInt(18, _fame); + statement.setInt(19, _raidbossPoints); + statement.setInt(20, _pvpKills); + statement.setInt(21, _pkKills); + statement.setInt(22, _clanId); statement.setInt(23, getRace().ordinal()); statement.setInt(24, getClassId().getId()); - statement.setLong(25, getDeleteTimer()); + statement.setLong(25, _deleteTimer); statement.setInt(26, hasDwarvenCraft() ? 1 : 0); statement.setString(27, getTitle()); - statement.setInt(28, getAppearance().getTitleColor()); + statement.setInt(28, _appearance.getTitleColor()); statement.setInt(29, isOnlineInt()); - statement.setInt(30, getClanPrivileges().getBitmask()); - statement.setInt(31, getWantsPeace()); - statement.setInt(32, getBaseClass()); + statement.setInt(30, _clanPrivileges.getBitmask()); + statement.setInt(31, _wantsPeace); + statement.setInt(32, _baseClass); statement.setInt(33, isNoble() ? 1 : 0); statement.setLong(34, 0); statement.setInt(35, PcStat.MIN_VITALITY_POINTS); - statement.setDate(36, new Date(getCreateDate().getTimeInMillis())); + statement.setDate(36, new Date(_createDate.getTimeInMillis())); statement.executeUpdate(); } catch (Exception e) @@ -7082,32 +7069,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(5, getCurrentCp()); statement.setInt(6, getMaxMp()); statement.setDouble(7, getCurrentMp()); - statement.setInt(8, getAppearance().getFace()); - statement.setInt(9, getAppearance().getHairStyle()); - statement.setInt(10, getAppearance().getHairColor()); - statement.setInt(11, getAppearance().getSex() ? 1 : 0); + statement.setInt(8, _appearance.getFace()); + statement.setInt(9, _appearance.getHairStyle()); + statement.setInt(10, _appearance.getHairColor()); + statement.setInt(11, _appearance.getSex() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); statement.setInt(15, _lastLoc != null ? _lastLoc.getZ() : getZ()); statement.setLong(16, exp); - statement.setLong(17, getExpBeforeDeath()); + statement.setLong(17, _expBeforeDeath); statement.setLong(18, sp); statement.setInt(19, getReputation()); - statement.setInt(20, getFame()); - statement.setInt(21, getRaidbossPoints()); - statement.setInt(22, getPvpKills()); - statement.setInt(23, getPkKills()); - statement.setInt(24, getClanId()); + statement.setInt(20, _fame); + statement.setInt(21, _raidbossPoints); + statement.setInt(22, _pvpKills); + statement.setInt(23, _pkKills); + statement.setInt(24, _clanId); statement.setInt(25, getRace().ordinal()); statement.setInt(26, getClassId().getId()); - statement.setLong(27, getDeleteTimer()); + statement.setLong(27, _deleteTimer); statement.setString(28, getTitle()); - statement.setInt(29, getAppearance().getTitleColor()); + statement.setInt(29, _appearance.getTitleColor()); statement.setInt(30, isOnlineInt()); - statement.setInt(31, getClanPrivileges().getBitmask()); - statement.setInt(32, getWantsPeace()); - statement.setInt(33, getBaseClass()); + statement.setInt(31, _clanPrivileges.getBitmask()); + statement.setInt(32, _wantsPeace); + statement.setInt(33, _baseClass); long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) @@ -7117,29 +7104,29 @@ public final class L2PcInstance extends L2Playable statement.setLong(34, totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); - statement.setInt(36, getPowerGrade()); - statement.setInt(37, getPledgeType()); - statement.setInt(38, getLvlJoinedAcademy()); - statement.setLong(39, getApprentice()); - statement.setLong(40, getSponsor()); - statement.setLong(41, getClanJoinExpiryTime()); - statement.setLong(42, getClanCreateExpiryTime()); + statement.setInt(36, _powerGrade); + statement.setInt(37, _pledgeType); + statement.setInt(38, _lvlJoinedAcademy); + statement.setLong(39, _apprentice); + statement.setLong(40, _sponsor); + statement.setLong(41, _clanJoinExpiryTime); + statement.setLong(42, _clanCreateExpiryTime); statement.setString(43, getName()); - statement.setInt(44, getBookMarkSlot()); + statement.setInt(44, _bookmarkslot); statement.setInt(45, getStat().getBaseVitalityPoints()); - statement.setString(46, getLang()); + statement.setString(46, _lang); int factionId = 0; - if (isGood()) + if (_isGood) { factionId = 1; } - if (isEvil()) + if (_isEvil) { factionId = 2; } statement.setInt(47, factionId); - statement.setInt(48, getPcCafePoints()); + statement.setInt(48, _pcCafePoints); statement.setInt(49, getObjectId()); statement.execute(); @@ -7194,7 +7181,7 @@ public final class L2PcInstance extends L2Playable { // Delete all current stored effects for char to avoid dupe delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.execute(); int buff_index = 0; @@ -7260,7 +7247,7 @@ public final class L2PcInstance extends L2Playable statement.setDouble(7, (t != null) && t.hasNotPassed() ? t.getStamp() : 0); statement.setInt(8, 0); // Store type 0, active buffs/debuffs. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7292,7 +7279,7 @@ public final class L2PcInstance extends L2Playable statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); statement.setInt(8, 1); // Restore type 1, skill reuse. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7431,7 +7418,7 @@ public final class L2PcInstance extends L2Playable // Remove or update a L2PcInstance skill from the character_skills table of the database statement.setInt(1, oldSkill.getId()); statement.setInt(2, getObjectId()); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7447,7 +7434,7 @@ public final class L2PcInstance extends L2Playable if (skill != null) { - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) { @@ -7550,7 +7537,7 @@ public final class L2PcInstance extends L2Playable { // Retrieve all skills of this L2PcInstance from the database statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7601,7 +7588,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_SKILL_SAVE)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7639,7 +7626,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement delete = con.prepareStatement(DELETE_SKILL_SAVE)) { delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.executeUpdate(); } } @@ -7677,7 +7664,7 @@ public final class L2PcInstance extends L2Playable isInInventory = true; // Using item Id - L2ItemInstance item = getInventory().getItemByItemId(itemId); + L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { item = getWarehouse().getItemByItemId(itemId); @@ -7729,7 +7716,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_HENNAS)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { int slot; @@ -7837,7 +7824,7 @@ public final class L2PcInstance extends L2Playable { statement.setInt(1, getObjectId()); statement.setInt(2, slot); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7866,7 +7853,7 @@ public final class L2PcInstance extends L2Playable } if (henna.getCancelCount() > 0) { - getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); + _inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(henna.getDyeItemId()); sm.addLong(henna.getCancelCount()); @@ -7919,7 +7906,7 @@ public final class L2PcInstance extends L2Playable statement.setInt(1, getObjectId()); statement.setInt(2, henna.getDyeId()); statement.setInt(3, i); - statement.setInt(4, getClassIndex()); + statement.setInt(4, _classIndex); statement.execute(); } catch (Exception e) @@ -8063,7 +8050,7 @@ public final class L2PcInstance extends L2Playable if (Config.UPDATE_ITEMS_ON_CHAR_STORE) { - getInventory().updateDatabase(); + _inventory.updateDatabase(); getWarehouse().updateDatabase(); } } @@ -8114,7 +8101,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker isn't the L2PcInstance Pet - if ((attacker == this) || (attacker == getPet()) || attacker.hasServitor(attacker.getObjectId())) + if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { return false; } @@ -8132,13 +8119,13 @@ public final class L2PcInstance extends L2Playable } // is AutoAttackable if both players are in the same duel and the duel is still going on - if (attacker.isPlayable() && (getDuelState() == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) + if (attacker.isPlayable() && (_duelState == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { return true; } // Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. - if (isInParty() && getParty().getMembers().contains(attacker)) + if (isInParty() && _party.getMembers().contains(attacker)) { return false; } @@ -8146,14 +8133,14 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) + if (_inOlympiadMode && _OlympiadStart && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) { return true; } return false; } - if (isOnCustomEvent() && (getTeam() == attacker.getTeam())) + if (_isOnCustomEvent && (getTeam() == attacker.getTeam())) { return false; } @@ -8175,7 +8162,7 @@ public final class L2PcInstance extends L2Playable // Get L2PcInstance final L2PcInstance attackerPlayer = attacker.getActingPlayer(); - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) @@ -8208,7 +8195,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker is not in the same clan - if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) + if ((_clan != null) && _clan.isMember(attacker.getObjectId())) { return false; } @@ -8233,10 +8220,10 @@ public final class L2PcInstance extends L2Playable if (attacker instanceof L2DefenderInstance) { - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return ((siege != null) && siege.checkIsAttacker(_clan)); } } @@ -8246,7 +8233,7 @@ public final class L2PcInstance extends L2Playable } // Check if the L2PcInstance has Karma - if ((getReputation() < 0) || (getPvpFlag() > 0)) + if ((getReputation() < 0) || (_pvpFlag > 0)) { return true; } @@ -8333,7 +8320,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (inObserverMode()) + if (_observerMode) { sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(ActionFailed.STATIC_PACKET); @@ -8381,7 +8368,7 @@ public final class L2PcInstance extends L2Playable } // Check if the caster is sitting - if (isSitting()) + if (_waitTypeSitting) { sendPacket(SystemMessageId.YOU_CANNOT_USE_ACTIONS_AND_SKILLS_WHILE_THE_CHARACTER_IS_SITTING); sendPacket(ActionFailed.STATIC_PACKET); @@ -8417,7 +8404,7 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill final L2Object target = skill.getTarget(this, forceUse, dontMove, true); - final Location worldPosition = getCurrentSkillWorldPosition(); + final Location worldPosition = _currentSkillWorldPosition; if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { @@ -8473,7 +8460,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (getQueuedSkill() != null) + if (_queuedSkill != null) { setQueuedSkill(null, null, false, false); } @@ -8488,14 +8475,14 @@ public final class L2PcInstance extends L2Playable final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel - if (isInParty() && getParty().isInCommandChannel() && (looter != null)) + if (isInParty() && _party.isInCommandChannel() && (looter != null)) { - return getParty().getCommandChannel().getMembers().contains(looter); + return _party.getCommandChannel().getMembers().contains(looter); } if (isInParty() && (looter != null)) { - return getParty().getMembers().contains(looter); + return _party.getMembers().contains(looter); } return false; @@ -8738,7 +8725,7 @@ public final class L2PcInstance extends L2Playable { for (int itemId : _activeSoulShots) { - final L2ItemInstance item = getInventory().getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { removeAutoSoulShot(itemId); @@ -8832,23 +8819,23 @@ public final class L2PcInstance extends L2Playable public void updateActiveBroochJewel() { // Update active Ruby jewel. - if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV1); } @@ -8857,23 +8844,23 @@ public final class L2PcInstance extends L2Playable setActiveRubyJewel(null); } // Update active Sapphire jewel. - if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1); } @@ -9000,10 +8987,9 @@ public final class L2PcInstance extends L2Playable public void enterOlympiadObserverMode(Location loc, int id) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.unSummon(this); + _pet.unSummon(this); } if (hasServitors()) @@ -9021,13 +9007,13 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoCubic(this)); } - if (getParty() != null) + if (_party != null) { - getParty().removePartyMember(this, MessageType.EXPELLED); + _party.removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -9349,12 +9335,12 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; return false; } - if (isInDuel()) + if (_isInDuel) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL; return false; } - if (isInOlympiadMode() || isOnEvent(CeremonyOfChaosEvent.class)) + if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class)) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS; return false; @@ -9369,7 +9355,7 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE; return false; } - if (getPrivateStoreType() != PrivateStoreType.NONE) + if (_privateStoreType != PrivateStoreType.NONE) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE; return false; @@ -9432,10 +9418,9 @@ public final class L2PcInstance extends L2Playable { super.setTeam(team); broadcastUserInfo(); - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.broadcastStatusUpdate(); + _pet.broadcastStatusUpdate(); } if (hasServitors()) { @@ -9472,9 +9457,9 @@ public final class L2PcInstance extends L2Playable for (Skill s : getSkillList()) { - if (getClan() != null) + if (_clan != null) { - isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0); + isDisabled = s.isClanSkill() && (_clan.getReputationScore() < 0); } sl.addSkill(s.getDisplayId(), s.getReuseDelayGroup(), s.getDisplayLevel(), s.getSubLevel(), s.isPassive(), isDisabled, s.isEnchantable()); @@ -9785,7 +9770,7 @@ public final class L2PcInstance extends L2Playable // Remove active item skills before saving char to database // because next time when choosing this class, weared items can // be different - for (L2ItemInstance item : getInventory().getPaperdollItems(L2ItemInstance::isAugmented)) + for (L2ItemInstance item : _inventory.getPaperdollItems(L2ItemInstance::isAugmented)) { if ((item != null) && item.isEquipped()) { @@ -9823,7 +9808,7 @@ public final class L2PcInstance extends L2Playable if (classIndex == 0) { - setClassTemplate(getBaseClass()); + setClassTemplate(_baseClass); } else { @@ -9841,7 +9826,7 @@ public final class L2PcInstance extends L2Playable if (isInParty()) { - getParty().recalculatePartyLevel(); + _party.recalculatePartyLevel(); } // Update the character's change in class status. @@ -9876,7 +9861,7 @@ public final class L2PcInstance extends L2Playable sendPacket(new EtcStatusUpdate(this)); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 4; i++) { _henna[i] = null; } @@ -9947,7 +9932,7 @@ public final class L2PcInstance extends L2Playable if (_taskRentPet != null) { // if the rent of a wyvern expires while over a flying zone, tp to down before unmounting - if (checkLandingState() && (getMountType() == MountType.WYVERN)) + if (checkLandingState() && (_mountType == MountType.WYVERN)) { teleToLocation(TeleportWhereType.TOWN); } @@ -10036,7 +10021,7 @@ public final class L2PcInstance extends L2Playable { sendMessage("Entering world in Invisible mode."); } - if (isSilenceMode()) + if (_silenceMode) { sendMessage("Entering world in Silence mode."); } @@ -10142,7 +10127,7 @@ public final class L2PcInstance extends L2Playable restoreExp(revivePower); } - public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int power) + public void reviveRequest(L2PcInstance reviver, Skill skill, boolean isPet, int power) { if (isResurrectionBlocked()) { @@ -10151,11 +10136,11 @@ public final class L2PcInstance extends L2Playable if (_reviveRequested == 1) { - if (_revivePet == Pet) + if (_revivePet == isPet) { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } - else if (Pet) + else if (isPet) { reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. } @@ -10165,12 +10150,11 @@ public final class L2PcInstance extends L2Playable } return; } - final L2Summon pet = getPet(); - if ((Pet && (pet != null) && pet.isDead()) || (!Pet && isDead())) + if ((isPet && (_pet != null) && _pet.isDead()) || (!isPet && isDead())) { _reviveRequested = 1; _revivePower = Formulas.calculateSkillResurrectRestorePercent(power, reviver); - _revivePet = Pet; + _revivePet = isPet; if (hasCharmOfCourage()) { @@ -10180,7 +10164,7 @@ public final class L2PcInstance extends L2Playable return; } - final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); + final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100); final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); @@ -10191,8 +10175,7 @@ public final class L2PcInstance extends L2Playable public void reviveAnswer(int answer) { - final L2Summon pet = getPet(); - if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (pet != null) && !pet.isDead())) + if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (_pet != null) && !_pet.isDead())) { return; } @@ -10210,15 +10193,15 @@ public final class L2PcInstance extends L2Playable doRevive(); } } - else if (pet != null) + else if (_pet != null) { if (_revivePower != 0) { - pet.doRevive(_revivePower); + _pet.doRevive(_revivePower); } else { - pet.doRevive(); + _pet.doRevive(); } } } @@ -10287,7 +10270,7 @@ public final class L2PcInstance extends L2Playable @Override public void teleToLocation(ILocational loc, boolean allowRandomOffset) { - if ((getVehicle() != null) && !getVehicle().isTeleporting()) + if ((_vehicle != null) && !_vehicle.isTeleporting()) { setVehicle(null); } @@ -10318,31 +10301,30 @@ public final class L2PcInstance extends L2Playable checkItemRestriction(); - if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !isInOlympiadMode()) + if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !_inOlympiadMode) { setTeleportProtection(true); } // Trained beast is lost after teleport - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.deleteMe(); } - getTrainedBeasts().clear(); + _tamedBeast.clear(); } // Modify the position of the pet if necessary - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.setFollowStatus(false); - pet.teleToLocation(getLocation(), false); - ((L2SummonAI) pet.getAI()).setStartFollowController(true); - pet.setFollowStatus(true); - pet.setInstance(getInstanceWorld()); - pet.updateAndBroadcastStatus(0); + _pet.setFollowStatus(false); + _pet.teleToLocation(getLocation(), false); + ((L2SummonAI) _pet.getAI()).setStartFollowController(true); + _pet.setFollowStatus(true); + _pet.setInstance(getInstanceWorld()); + _pet.updateAndBroadcastStatus(0); } getServitors().values().forEach(s -> @@ -10432,9 +10414,9 @@ public final class L2PcInstance extends L2Playable super.reduceCurrentHp(value, attacker, skill, isDOT, directlyToHp, critical, reflect); // notify the tamed beast of attacks - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.onOwnerGotAttacked(attacker); } @@ -10567,7 +10549,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -10576,8 +10558,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return false; } @@ -10719,7 +10700,7 @@ public final class L2PcInstance extends L2Playable // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) try { - if (!isOnline()) + if (!_isOnline) { LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } @@ -10732,7 +10713,7 @@ public final class L2PcInstance extends L2Playable try { - if (Config.ENABLE_BLOCK_CHECKER_EVENT && (getBlockCheckerArena() != -1)) + if (Config.ENABLE_BLOCK_CHECKER_EVENT && (_handysBlockCheckerEventArena != -1)) { HandysBlockCheckerManager.getInstance().onDisconnect(this); } @@ -10757,7 +10738,7 @@ public final class L2PcInstance extends L2Playable // remove combat flag try { - if (getInventory().getItemByItemId(9819) != null) + if (_inventory.getItemByItemId(9819) != null) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -10766,9 +10747,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } } @@ -10894,13 +10875,13 @@ public final class L2PcInstance extends L2Playable { try { - L2Summon pet = getPet(); + L2Summon pet = _pet; if (pet != null) { pet.setRestoreSummon(true); pet.unSummon(this); // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) - pet = getPet(); + pet = _pet; if (pet != null) { pet.broadcastNpcInfo(0); @@ -10919,12 +10900,12 @@ public final class L2PcInstance extends L2Playable } // returns pet to control item } - if (getClan() != null) + if (_clan != null) { // set the status for pledge member list to OFFLINE try { - final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = _clan.getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -10961,14 +10942,14 @@ public final class L2PcInstance extends L2Playable { // Check if the L2PcInstance is in observer mode to set its position to its position // before entering in observer mode - if (inObserverMode()) + if (_observerMode) { setLocationInvisible(_lastLoc); } - if (getVehicle() != null) + if (_vehicle != null) { - getVehicle().oustPlayer(this); + _vehicle.oustPlayer(this); } } catch (Exception e) @@ -11002,7 +10983,7 @@ public final class L2PcInstance extends L2Playable // Update database with items in its inventory and remove them from the world try { - getInventory().deleteMe(); + _inventory.deleteMe(); } catch (Exception e) { @@ -11025,7 +11006,7 @@ public final class L2PcInstance extends L2Playable try { - getFreight().deleteMe(); + _freight.deleteMe(); } catch (Exception e) { @@ -11053,10 +11034,10 @@ public final class L2PcInstance extends L2Playable } } - if (getClanId() > 0) + if (_clanId > 0) { - getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); - getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan())); + _clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); + _clan.broadcastToOnlineMembers(new ExPledgeCount(_clan)); // ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); } @@ -11090,7 +11071,7 @@ public final class L2PcInstance extends L2Playable try { notifyFriends(L2FriendStatus.MODE_OFFLINE); - getBlockList().playerLogout(); + _blockList.playerLogout(); } catch (Exception e) { @@ -11346,12 +11327,12 @@ public final class L2PcInstance extends L2Playable { _souls -= count; - if (getChargedSouls() < 0) + if (_souls < 0) { _souls = 0; } - if (getChargedSouls() == 0) + if (_souls == 0) { stopSoulTask(); } @@ -11514,10 +11495,10 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = _inventory.getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { - getInventory().unEquipItemInSlot(i); + _inventory.unEquipItemInSlot(i); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); @@ -11667,10 +11648,9 @@ public final class L2PcInstance extends L2Playable } if (hasPet()) { - final L2Summon pet = getPet(); - setCurrentFeed(((L2PetInstance) pet).getCurrentFed()); - _controlItemId = pet.getControlObjectId(); - sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); + setCurrentFeed(_pet.getCurrentFed()); + _controlItemId = _pet.getControlObjectId(); + sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); if (!isDead()) { _mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000); @@ -11679,7 +11659,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -11739,7 +11719,7 @@ public final class L2PcInstance extends L2Playable { final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -11755,7 +11735,7 @@ public final class L2PcInstance extends L2Playable public boolean isHungry() { - return hasPet() && _canFeed && (getCurrentFeed() < ((getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())); + return hasPet() && _canFeed && (_curFeed < ((getPetData(_mountNpcId).getHungryLimit() / 100f) * getPetLevelData(_mountNpcId).getPetMaxFeed())); } public void enteredNoLanding(int delay) @@ -11781,7 +11761,7 @@ public final class L2PcInstance extends L2Playable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(req)) { - statement.setInt(1, getCurrentFeed()); + statement.setInt(1, _curFeed); statement.setInt(2, _controlItemId); statement.executeUpdate(); _controlItemId = 0; @@ -11950,7 +11930,7 @@ public final class L2PcInstance extends L2Playable { return; } - if (getInventory().getInventoryItemCount(13016, 0) == 0) + if (_inventory.getInventoryItemCount(13016, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; @@ -11962,7 +11942,7 @@ public final class L2PcInstance extends L2Playable final TeleportBookmark bookmark = _tpbookmarks.get(id); if (bookmark != null) { - destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(13016).getObjectId(), 1, null, false); teleToLocation(bookmark, false); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -11975,12 +11955,12 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE); return false; } - else if (isInSiege() || (getSiegeState() != 0)) + else if (_isInSiege || (_siegeState != 0)) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_A_LARGE_SCALE_BATTLE_SUCH_AS_A_CASTLE_SIEGE_FORTRESS_SIEGE_OR_CLAN_HALL_SIEGE); return false; } - else if (isInDuel()) + else if (_isInDuel) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL); return false; @@ -11990,7 +11970,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING); return false; } - else if (isInOlympiadMode()) + else if (_inOlympiadMode) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH); return false; @@ -12049,7 +12029,7 @@ public final class L2PcInstance extends L2Playable return; } - if (getInventory().getInventoryItemCount(20033, 0) == 0) + if (_inventory.getInventoryItemCount(20033, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG); return; @@ -12065,7 +12045,7 @@ public final class L2PcInstance extends L2Playable } _tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name)); - destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); @@ -12119,7 +12099,7 @@ public final class L2PcInstance extends L2Playable setXYZ(getBoat().getLocation()); activeChar.sendPacket(new CharInfo(this, isInvisible() && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS))); - activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition())); + activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); } else if (isInAirShip()) { @@ -12137,10 +12117,9 @@ public final class L2PcInstance extends L2Playable rc1.addRelation(this, relation1, isAutoAttackable(activeChar)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc1.addRelation(pet, relation1, isAutoAttackable(activeChar)); + rc1.addRelation(_pet, relation1, isAutoAttackable(activeChar)); } if (hasServitors()) { @@ -12154,10 +12133,9 @@ public final class L2PcInstance extends L2Playable rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this)); if (activeChar.hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this)); + rc2.addRelation(_pet, relation2, activeChar.isAutoAttackable(this)); } if (hasServitors()) { @@ -12166,7 +12144,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(rc2); - switch (getPrivateStoreType()) + switch (_privateStoreType) { case SELL: { @@ -12193,7 +12171,7 @@ public final class L2PcInstance extends L2Playable public void playMovie(MovieHolder holder) { - if (getMovieHolder() != null) + if (_movieHolder != null) { return; } @@ -12209,7 +12187,7 @@ public final class L2PcInstance extends L2Playable public void stopMovie() { - sendPacket(new ExStopScenePlayer(getMovieHolder().getMovie())); + sendPacket(new ExStopScenePlayer(_movieHolder.getMovie())); setMovieHolder(null); } @@ -12287,7 +12265,7 @@ public final class L2PcInstance extends L2Playable public int getBirthdays() { - long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12456,24 +12434,24 @@ public final class L2PcInstance extends L2Playable @Override public double getCollisionRadius() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override public double getCollisionHeight() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -12615,7 +12593,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || (getMovieHolder() != null) || _fishing.isFishing(); + return super.isMovementDisabled() || (_movieHolder != null) || _fishing.isFishing(); } public String getHtmlPrefix() @@ -12725,7 +12703,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return ((_privateStoreType == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); } public void setMultiSocialAction(int id, int targetId) @@ -12825,7 +12803,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); } /** @@ -12835,7 +12813,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder80(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); } public boolean havePetInvItems() @@ -12921,8 +12899,8 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("REPLACE INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?)")) { ps.setInt(1, getObjectId()); - ps.setInt(2, getRecomHave()); - ps.setInt(3, getRecomLeft()); + ps.setInt(2, _recomHave); + ps.setInt(3, _recomLeft); ps.setLong(4, 0); ps.execute(); } @@ -13349,7 +13327,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHair() { - return getVariables().getInt("visualHairId", getAppearance().getHairStyle()); + return getVariables().getInt("visualHairId", _appearance.getHairStyle()); } /** @@ -13357,7 +13335,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHairColor() { - return getVariables().getInt("visualHairColorId", getAppearance().getHairColor()); + return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); } /** @@ -13365,7 +13343,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualFace() { - return getVariables().getInt("visualFaceId", getAppearance().getFace()); + return getVariables().getInt("visualFaceId", _appearance.getFace()); } /** @@ -13464,7 +13442,7 @@ public final class L2PcInstance extends L2Playable */ public CastleSide getPlayerSide() { - if ((getClan() == null) || (getClan().getCastleId() == 0)) + if ((_clan == null) || (_clan.getCastleId() == 0)) { return CastleSide.NEUTRAL; } @@ -13809,7 +13787,7 @@ public final class L2PcInstance extends L2Playable @Override public MoveType getMoveType() { - if (isSitting()) + if (_waitTypeSitting) { return MoveType.SITTING; } @@ -13828,10 +13806,9 @@ public final class L2PcInstance extends L2Playable private void updateOnlineTime() { - final L2Clan clan = getClan(); - if (clan != null) + if (_clan != null) { - clan.addMemberOnlineTime(this); + _clan.addMemberOnlineTime(this); } } @@ -13846,7 +13823,7 @@ public final class L2PcInstance extends L2Playable public GroupType getGroupType() { - return isInParty() ? (getParty().isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; + return isInParty() ? (_party.isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; } public boolean isTrueHero() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 10429b5b5b..f1112eee76 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -83,8 +83,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,skill_sub_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -140,9 +140,9 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - else if (getCurrentFed() > getFeedConsume()) + else if (_curFed > getFeedConsume()) { - setCurrentFed(getCurrentFed() - getFeedConsume()); + setCurrentFed(_curFed - getFeedConsume()); } else { @@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -333,9 +333,9 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - if (getInventory() != null) + if (_inventory != null) { - return getInventory().getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); + return _inventory.getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); } return null; } @@ -622,8 +622,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -639,7 +639,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -702,9 +702,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -756,11 +756,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - statement.setInt(1, getControlObjectId()); + statement.setInt(1, _controlObjectId); statement.execute(); } catch (Exception e) @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -817,7 +817,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -921,7 +921,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -933,7 +933,7 @@ public class L2PetInstance extends L2Summon } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -951,10 +951,10 @@ public class L2PetInstance extends L2Summon statement.setDouble(4, getStatus().getCurrentMp()); statement.setLong(5, getStat().getExp()); statement.setLong(6, getStat().getSp()); - statement.setInt(7, getCurrentFed()); + statement.setInt(7, _curFed); statement.setInt(8, getOwner().getObjectId()); statement.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - statement.setInt(10, getControlObjectId()); + statement.setInt(10, _controlObjectId); statement.executeUpdate(); _respawned = true; @@ -997,7 +997,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1045,7 +1045,7 @@ public class L2PetInstance extends L2Summon continue; } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, skill.getSubLevel()); @@ -1073,7 +1073,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rset = ps1.executeQuery()) { while (rset.next()) @@ -1094,7 +1094,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1147,9 +1147,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1340,13 +1340,13 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1357,7 +1357,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1367,7 +1367,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 42bd49e7f9..8ed3a9f1d3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -240,7 +240,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable final Map> servitorEffects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()); if (servitorEffects != null) { - final List effects = servitorEffects.get(getReferenceSkill()); + final List effects = servitorEffects.get(_referenceSkill); if ((effects != null) && !effects.isEmpty()) { for (SummonEffect effect : effects) @@ -294,7 +294,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.execute(); int buff_index = 0; @@ -348,7 +348,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -397,7 +397,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -437,7 +437,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -554,12 +554,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -573,7 +573,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); // Using same task to check if owner is in visible range if (calculateDistance(getOwner(), true, false) > 2000) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java index 285b9af507..aa681dd5f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java @@ -51,7 +51,7 @@ public class L2ShuttleInstance extends L2Vehicle public void closeDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { @@ -63,7 +63,7 @@ public class L2ShuttleInstance extends L2Vehicle public void openDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index e5e5d055c4..32f94719bb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index a7276d30f8..f1d5b120e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -72,7 +72,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -136,7 +136,7 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - final L2Character activeChar = getActiveChar(); + final L2Character activeChar = _activeChar; if (activeChar.isDead()) { return; @@ -169,14 +169,14 @@ public class CharStatus } if (Formulas.calcRealTargetBreak()) { - getActiveChar().getEffectList().stopEffects(AbnormalType.REAL_TARGET); + _activeChar.getEffectList().stopEffects(AbnormalType.REAL_TARGET); } } if (value > 0) { - final double oldHp = getCurrentHp(); - final double newHp = Math.max(getCurrentHp() - value, activeChar.isUndying() ? 1 : 0); + final double oldHp = _currentHp; + final double newHp = Math.max(_currentHp - value, activeChar.isUndying() ? 1 : 0); setCurrentHp(newHp); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureHpChange(activeChar, oldHp, newHp), activeChar); } @@ -189,7 +189,7 @@ public class CharStatus public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -202,10 +202,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -269,12 +269,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getStat().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getStat().getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -324,7 +324,7 @@ public class CharStatus if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -337,7 +337,7 @@ public class CharStatus hpOrMpWasChanged |= setCurrentMp(newMp, false); if (hpOrMpWasChanged) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -360,12 +360,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getStat().getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -398,7 +398,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -407,10 +407,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE); - final double newMp = getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE); + final double newHp = _currentHp + _activeChar.getStat().getValue(Stats.REGENERATE_HP_RATE); + final double newMp = _currentMp + _activeChar.getStat().getValue(Stats.REGENERATE_MP_RATE); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 4d221ab370..813634b659 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -48,9 +48,9 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -78,7 +78,7 @@ public class PcStatus extends PlayableStatus } // If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken. - if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) + if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isCrafting() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) { return; } @@ -100,7 +100,7 @@ public class PcStatus extends PlayableStatus getActiveChar().stopEffectsOnDamage(); } // Attacked players in craft/shops stand up. - if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) + if (getActiveChar().isCrafting() || getActiveChar().isInStoreMode()) { getActiveChar().setPrivateStoreType(PrivateStoreType.NONE); getActiveChar().standUp(); @@ -238,14 +238,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -337,7 +337,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -388,9 +388,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); + setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 8287b081c4..f9e325c275 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -279,7 +279,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 1ce3ab05ca..6ee4d7e704 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -262,13 +262,13 @@ public final class Transform implements IIdentifiable if (creature.isPlayer()) { - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } if (addSkills) @@ -374,11 +374,11 @@ public final class Transform implements IIdentifiable final L2PcInstance player = creature.getActingPlayer(); final boolean hasTransformSkills = player.hasTransformSkills(); - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index ebee3cd82c..1adc7b039f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setInt(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setInt(6, _repeat); st.execute(); try (ResultSet rset = st.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setLong(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setLong(6, _repeat); st.setLong(7, getId()); st.execute(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/base/SubClass.java index 0e65764560..e318f331ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -140,7 +140,7 @@ public final class SubClass public void incLevel() { - if (!_dualClass && (getLevel() == _maxLevel)) + if (!_dualClass && (_level == _maxLevel)) { return; } @@ -151,7 +151,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java index 03b1a51b6b..8360f7712c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -69,7 +69,7 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() @@ -124,7 +124,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(this::restock, getRestockDelay()); + _restockTask = ThreadPool.schedule(this::restock, _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -133,7 +133,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -151,7 +151,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -161,7 +161,7 @@ public final class Product PreparedStatement statement = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { statement.setInt(1, _buyListId); - statement.setInt(2, getItemId()); + statement.setInt(2, _item.getId()); statement.setLong(3, getCount()); statement.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index ce7a68dcc7..4e95946a36 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -538,9 +538,9 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - getHolder().broadCastPacketToTeam(changePoints); + _holder.broadCastPacketToTeam(changePoints); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java index 4fa38d85d4..9b249a9069 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -72,7 +72,7 @@ public final class Castle extends AbstractResidence private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -96,12 +96,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -158,7 +158,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -185,29 +185,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -223,11 +223,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -244,7 +244,7 @@ public final class Castle extends AbstractResidence initResidenceZone(); initFunctions(); spawnSideNpcs(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -287,7 +287,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -338,7 +338,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -380,7 +380,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -460,7 +460,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -481,7 +481,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, String doorName, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -516,7 +516,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -877,7 +877,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -897,12 +897,12 @@ public final class Castle extends AbstractResidence public final L2DoorInstance getDoor(int doorId) { - return getDoors().stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); } public final L2DoorInstance getDoor(String doorName) { - return getDoors().stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); } public final List getDoors() @@ -957,7 +957,7 @@ public final class Castle extends AbstractResidence public final int getTaxPercent(TaxType type) { final int taxPercent; - switch (getSide()) + switch (_castleSide) { case LIGHT: { @@ -1036,7 +1036,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -1156,7 +1156,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); + final Skill skill = _castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); player.addSkill(skill); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index d41afdb68a..6fc9b45046 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -58,7 +58,7 @@ public final class ClanHall extends AbstractResidence private final ClanHallGrade _grade; private final ClanHallType _type; private final int _minBid; - private final int _lease; + final int _lease; private final int _deposit; private final List _npcs; private final List _doors; @@ -66,8 +66,8 @@ public final class ClanHall extends AbstractResidence private final Location _ownerLocation; private final Location _banishLocation; // Dynamic parameters - private L2Clan _owner = null; - private long _paidUntil = 0; + L2Clan _owner = null; + long _paidUntil = 0; protected ScheduledFuture _checkPaymentTask = null; // Other private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; @@ -137,7 +137,7 @@ public final class ClanHall extends AbstractResidence PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) { statement.setInt(1, getOwnerId()); - statement.setLong(2, getPaidUntil()); + statement.setLong(2, _paidUntil); statement.setInt(3, getResidenceId()); statement.execute(); } @@ -159,7 +159,7 @@ public final class ClanHall extends AbstractResidence public int getCostFailDay() { - final Duration failDay = Duration.between(Instant.ofEpochMilli(getPaidUntil()), Instant.now()); + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); return failDay.isNegative() ? 0 : (int) failDay.toDays(); } @@ -256,13 +256,13 @@ public final class ClanHall extends AbstractResidence _owner = clan; clan.setHideoutId(getResidenceId()); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (getPaidUntil() == 0) + if (_paidUntil == 0) { setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); } final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : getPaidUntil(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else @@ -351,29 +351,28 @@ public final class ClanHall extends AbstractResidence @Override public void run() { - final L2Clan clan = getOwner(); - if (clan != null) + if (_owner != null) { - if (clan.getWarehouse().getAdena() < getLease()) + if (_owner.getWarehouse().getAdena() < _lease) { if (getCostFailDay() > 8) { setOwner(null); - clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + _owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); } else { _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); - clan.broadcastToOnlineMembers(sm); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); } } else { - clan.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, getLease(), null, null); - setPaidUntil(Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), getPaidUntil() - System.currentTimeMillis()); + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java index 826a7beece..a4b57818fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -75,7 +75,7 @@ public class Duel private boolean _finished = false; private final Map _playerConditions = new ConcurrentHashMap<>(); - private Instance _duelInstance; + Instance _duelInstance; public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId) { @@ -213,9 +213,9 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPool.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - if (getDueldInstance() != null) + if (_duelInstance != null) { - getDueldInstance().destroy(); + _duelInstance.destroy(); } break; } @@ -674,7 +674,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -695,7 +695,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java index 3d030d3183..2433d41209 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -237,7 +237,7 @@ public final class Fort extends AbstractResidence super(fortId); load(); loadFlagPoles(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -506,7 +506,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -781,7 +781,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -873,7 +873,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1001,8 +1001,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1068,7 +1068,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 75de2719fc..c7a8bd6dfa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -70,7 +70,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -101,7 +101,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -115,7 +115,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -184,7 +184,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -205,7 +205,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -228,7 +228,7 @@ public class FortSiege implements Siegable // Fort setting protected Set _commanders = ConcurrentHashMap.newKeySet(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private final Collection _siegeGuards = new LinkedList<>(); ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -248,7 +248,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { _isInProgress = false; // Flag so that siege instance can be started removeFlags(); // Removes all flags. Note: Remove flag before teleporting players @@ -257,22 +257,22 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); int ownerId = -1; - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - ownerId = getFort().getOwnerClan().getId(); + ownerId = _fort.getOwnerClan().getId(); } - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -306,16 +306,16 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -326,24 +326,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -358,7 +358,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -369,7 +369,7 @@ public class FortSiege implements Siegable } } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -391,7 +391,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -411,7 +411,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -421,7 +421,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -441,7 +441,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -470,7 +470,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return (_isInProgress && (_fort.checkIfInZone(x, y, z))); // Fort zone during siege } /** @@ -490,7 +490,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - if ((clan != null) && (getFort().getOwnerClan() == clan)) + if ((clan != null) && (_fort.getOwnerClan() == clan)) { return true; } @@ -504,22 +504,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -540,7 +540,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -550,7 +550,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -583,10 +583,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -614,7 +614,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if ((getFort() != null) && (!_commanders.isEmpty())) + if ((_fort != null) && (!_commanders.isEmpty())) { final L2Spawn spawn = instance.getSpawn(); if (spawn != null) @@ -657,14 +657,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -674,22 +674,22 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } // schedule restoring doors/commanders respawn else if (_siegeRestore == null) { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); } } else { - LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } } @@ -705,7 +705,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -734,7 +734,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player don't have enough adena to register } @@ -754,7 +754,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -788,7 +788,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(query)) { - statement.setInt(1, getFort().getResidenceId()); + statement.setInt(1, _fort.getResidenceId()); if (clanId != 0) { statement.setInt(2, clanId); @@ -796,9 +796,9 @@ public class FortSiege implements Siegable statement.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -843,7 +843,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -896,9 +896,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -927,7 +927,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -948,7 +948,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -991,18 +991,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1038,7 +1038,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1060,8 +1060,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, _fort.getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1085,7 +1085,7 @@ public class FortSiege implements Siegable PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getFort().getResidenceId()); + statement.setInt(2, _fort.getResidenceId()); statement.execute(); addAttacker(clan.getId()); @@ -1151,7 +1151,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1235,7 +1235,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1265,7 +1265,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1288,7 +1288,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public Set getCommanders() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java index 54018274e5..00ecbc50fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -92,7 +92,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -160,14 +160,14 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } try { - if (!getIsTimeRegistrationOver()) + if (!_castle.getIsTimeRegistrationOver()) { final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) @@ -186,7 +186,7 @@ public class Siege implements Siegable else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; clearSiegeWaitingClan(); @@ -228,8 +228,8 @@ public class Siege implements Siegable // Castle setting private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); - private final Castle _castle; - private boolean _isInProgress = false; + final Castle _castle; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,18 +246,18 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); if (clan.getId() == _firstOwnerClanId) @@ -267,7 +267,7 @@ public class Siege implements Siegable } else { - getCastle().setTicketBuyCount(0); + _castle.setTicketBuyCount(0); for (L2ClanMember member : clan.getMembers()) { if (member != null) @@ -284,7 +284,7 @@ public class Siege implements Siegable else { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); } @@ -322,7 +322,7 @@ public class Siege implements Siegable clan.clearSiegeDeaths(); } - getCastle().updateClansReputation(); + _castle.updateClansReputation(); removeFlags(); // Removes all flags. Note: Remove flag before teleporting players teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town _isInProgress = false; // Flag so that siege instance can be started @@ -331,14 +331,14 @@ public class Siege implements Siegable clearSiegeClan(); // Clear siege clan from db removeTowers(); // Remove all towers from this castle SiegeGuardManager.getInstance().unspawnSiegeGuard(getCastle()); // Remove all spawned siege guard from this castle - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); } - getCastle().spawnDoor(); // Respawn door to castle - getCastle().getZone().setIsActive(false); - getCastle().getZone().updateZoneStatusForCharactersInside(); - getCastle().getZone().setSiegeInstance(null); + _castle.spawnDoor(); // Respawn door to castle + _castle.getZone().setIsActive(false); + _castle.getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(null); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeFinish(this), getCastle()); @@ -387,9 +387,9 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); // Remove all merc entry from db } @@ -398,13 +398,13 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); return; } - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) @@ -426,7 +426,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -444,7 +444,7 @@ public class Siege implements Siegable } } - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -462,8 +462,8 @@ public class Siege implements Siegable teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town removeDefenderFlags(); // Removes defenders' flags - getCastle().removeUpgrade(); // Remove all castle upgrade - getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) + _castle.removeUpgrade(); // Remove all castle upgrade + _castle.spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) removeTowers(); // Remove all towers from this castle _controlTowerCount = 0; // Each new siege midvictory CT are completely respawned. spawnControlTower(); @@ -483,9 +483,9 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { - _firstOwnerClanId = getCastle().getOwnerId(); + _firstOwnerClanId = _castle.getOwnerId(); if (getAttackerClans().isEmpty()) { @@ -500,7 +500,7 @@ public class Siege implements Siegable final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId); ownerClan.increaseBloodAllianceCount(); } - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); saveCastleSiege(); return; @@ -515,20 +515,20 @@ public class Siege implements Siegable _controlTowerCount = 0; spawnControlTower(); // Spawn control tower spawnFlameTower(); // Spawn control tower - getCastle().spawnDoor(); // Spawn door + _castle.spawnDoor(); // Spawn door spawnSiegeGuard(); // Spawn siege guard SiegeGuardManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground - getCastle().getZone().setSiegeInstance(this); - getCastle().getZone().setIsActive(true); - getCastle().getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(this); + _castle.getZone().setIsActive(true); + _castle.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEndDate = Calendar.getInstance(); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); - ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task + ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); // Notify to scripts. @@ -589,7 +589,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -649,7 +649,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -723,7 +723,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return (_isInProgress && (_castle.checkIfInZone(x, y, z))); // Castle zone during siege } /** @@ -763,21 +763,21 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) { - delete.setInt(1, getCastle().getOwnerId()); + delete.setInt(1, _castle.getOwnerId()); delete.execute(); } } getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -791,10 +791,10 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -821,7 +821,7 @@ public class Siege implements Siegable */ public List getPlayersInZone() { - return getCastle().getZone().getPlayersInside(); + return _castle.getZone().getPlayersInside(); } /** @@ -845,7 +845,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - return getCastle().getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); + return _castle.getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); } /** @@ -872,7 +872,7 @@ public class Siege implements Siegable */ public void listRegisterClan(L2PcInstance player) { - player.sendPacket(new SiegeInfo(getCastle(), player)); + player.sendPacket(new SiegeInfo(_castle, player)); } /** @@ -892,7 +892,7 @@ public class Siege implements Siegable return; } int allyId = 0; - if (getCastle().getOwnerId() != 0) + if (_castle.getOwnerId() != 0) { allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); } @@ -935,9 +935,9 @@ public class Siege implements Siegable public void registerDefender(L2PcInstance player, boolean force) { - if (getCastle().getOwnerId() <= 0) + if (_castle.getOwnerId() <= 0) { - player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC."); + player.sendMessage("You cannot register as a defender because " + _castle.getName() + " is owned by NPC."); return; } @@ -975,7 +975,7 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.setInt(2, clanId); statement.execute(); @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _castle.getName() + ": " + _castle.getSiegeDate().getTime()); loadSiegeClan(); @@ -1028,7 +1028,7 @@ public class Siege implements Siegable { _scheduledStartSiegeTask.cancel(false); } - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } /** @@ -1048,12 +1048,12 @@ public class Siege implements Siegable } case NotOwner: { - players = getPlayersInZone(); + players = _castle.getZone().getPlayersInside(); final Iterator it = players.iterator(); while (it.hasNext()) { final L2PcInstance player = it.next(); - if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId()))) + if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == _castle.getOwnerId()))) { it.remove(); } @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1149,7 +1149,7 @@ public class Siege implements Siegable { player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_3_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE); } - else if (player.getClan().getId() == getCastle().getOwnerId()) + else if (player.getClan().getId() == _castle.getOwnerId()) { player.sendPacket(SystemMessageId.CASTLE_OWNING_CLANS_ARE_AUTOMATICALLY_REGISTERED_ON_THE_DEFENDING_SIDE); } @@ -1243,15 +1243,15 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { - addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER); + addDefender(_castle.getOwnerId(), SiegeClanType.OWNER); } - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); try (ResultSet rs = statement.executeQuery()) { int typeId; @@ -1333,8 +1333,8 @@ public class Siege implements Siegable setNextSiegeDate(); // Set the next set date for 2 weeks from now // Schedule Time registration end getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); - getCastle().setIsTimeRegistrationOver(false); + _castle.getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); + _castle.setIsTimeRegistrationOver(false); saveSiegeDate(); // Save the new date startAutoTask(); // Prepare auto start siege and end registration @@ -1346,16 +1346,16 @@ public class Siege implements Siegable if (_scheduledStartSiegeTask != null) { _scheduledStartSiegeTask.cancel(true); - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ? WHERE id = ?")) { - statement.setLong(1, getSiegeDate().getTimeInMillis()); - statement.setLong(2, getTimeRegistrationOverDate().getTimeInMillis()); - statement.setString(3, String.valueOf(getIsTimeRegistrationOver())); - statement.setInt(4, getCastle().getResidenceId()); + statement.setLong(1, _castle.getSiegeDate().getTimeInMillis()); + statement.setLong(2, _castle.getTimeRegistrationOverDate().getTimeInMillis()); + statement.setString(3, String.valueOf(_castle.getIsTimeRegistrationOver())); + statement.setInt(4, _castle.getResidenceId()); statement.execute(); } catch (Exception e) @@ -1397,7 +1397,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, typeId); statement.execute(); } @@ -1407,7 +1407,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) { statement.setInt(1, typeId); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, clan.getId()); statement.execute(); } @@ -1435,7 +1435,7 @@ public class Siege implements Siegable /** Set the date for the next siege. */ private void setNextSiegeDate() { - final Calendar cal = getCastle().getSiegeDate(); + final Calendar cal = _castle.getSiegeDate(); if (cal.getTimeInMillis() < System.currentTimeMillis()) { cal.setTimeInMillis(System.currentTimeMillis()); @@ -1460,7 +1460,7 @@ public class Siege implements Siegable } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = false; // Allow registration for next siege @@ -1645,7 +1645,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1672,23 +1672,23 @@ public class Siege implements Siegable public final boolean getIsTimeRegistrationOver() { - return getCastle().getIsTimeRegistrationOver(); + return _castle.getIsTimeRegistrationOver(); } @Override public final Calendar getSiegeDate() { - return getCastle().getSiegeDate(); + return _castle.getSiegeDate(); } public final Calendar getTimeRegistrationOverDate() { - return getCastle().getTimeRegistrationOverDate(); + return _castle.getTimeRegistrationOverDate(); } public void endTimeRegistration(boolean automatic) { - getCastle().setIsTimeRegistrationOver(true); + _castle.setIsTimeRegistrationOver(true); if (!automatic) { saveSiegeDate(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java index f09be6765f..ac490ba86d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -129,7 +129,7 @@ public class EventScheduler run(); updateLastRun(); - if (isRepeating()) + if (_repeat) { ThreadPool.schedule(this::startScheduler, 1000); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index eae25b08f7..1d42731b7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() @@ -46,16 +46,16 @@ public final class MovieHolder public void playerEscapeVote(L2PcInstance player) { - if (getVotedPlayers().contains(player) || !getPlayers().contains(player) || !getMovie().isEscapable()) + if (_votedPlayers.contains(player) || !_players.contains(player) || !_movie.isEscapable()) { return; } - getVotedPlayers().add(player); + _votedPlayers.add(player); - if (((getVotedPlayers().size() * 100) / getPlayers().size()) >= 50) + if (((_votedPlayers.size() * 100) / _players.size()) >= 50) { - getPlayers().forEach(L2PcInstance::stopMovie); + _players.forEach(L2PcInstance::stopMovie); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index a4fde8355e..4bc6353cfa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -487,7 +487,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return Collections.emptyList(); } @@ -502,7 +502,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } return npcs; } @@ -516,7 +516,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return; } @@ -526,7 +526,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } } @@ -810,7 +810,7 @@ public final class Instance implements IIdentifiable, INamable public void setReenterTime(long time) { // Cannot store reenter data for instance without template id. - if ((getTemplateId() == -1) && (time > 0)) + if ((_template.getId() == -1) && (time > 0)) { return; } @@ -824,7 +824,7 @@ public final class Instance implements IIdentifiable, INamable if (player != null) { ps.setInt(1, player.getObjectId()); - ps.setInt(2, getTemplateId()); + ps.setInt(2, _template.getId()); ps.setLong(3, time); ps.addBatch(); } @@ -835,11 +835,11 @@ public final class Instance implements IIdentifiable, INamable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null) { - msg.addInstanceName(getTemplateId()); + msg.addInstanceName(_template.getId()); } else { - msg.addString(getName()); + msg.addString(_template.getName()); } _allowed.forEach(player -> { @@ -995,7 +995,7 @@ public final class Instance implements IIdentifiable, INamable removePlayer(player); if (Config.RESTORE_PLAYER_INSTANCE) { - player.getVariables().set("INSTANCE_RESTORE", getId()); + player.getVariables().set("INSTANCE_RESTORE", _id); } else { @@ -1161,6 +1161,6 @@ public final class Instance implements IIdentifiable, INamable @Override public String toString() { - return getName() + "(" + getId() + ")"; + return _template.getName() + "(" + _id + ")"; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 409678ea5a..ba6f5482ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -788,6 +788,6 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl @Override public String toString() { - return "ID: " + getId() + " Name: " + getName(); + return "ID: " + _templateId + " Name: " + _name; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 4ebae030de..24c473792a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -181,12 +181,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -250,7 +250,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -340,7 +340,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5bb5770412..9e94b591e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -115,9 +115,9 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - statement.setInt(1, getOwnerId()); + statement.setInt(1, _ownerId); statement.setString(2, getBaseLocation().name()); - statement.setInt(3, getMessageId()); + statement.setInt(3, _messageId); try (ResultSet inv = statement.executeQuery()) { while (inv.next()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index c7a3128aa9..9228d151c2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -150,7 +150,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -211,7 +211,7 @@ public class PcInventory extends Inventory { return getItems(i -> { - if (!i.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) + if (!i.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) { return false; } @@ -232,7 +232,7 @@ public class PcInventory extends Inventory { //@formatter:off return _items.values().stream() - .filter(i -> i.isAvailable(getOwner(), false, false)) + .filter(i -> i.isAvailable(_owner, false, false)) .map(tradeList::adjustAvailableItem) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -689,12 +689,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (getOwner().isProcessingItem(item.getObjectId())) + if (_owner.isProcessingItem(item.getObjectId())) { - getOwner().removeRequestsThatProcessesItem(item.getObjectId()); + _owner.removeRequestsThatProcessesItem(item.getObjectId()); } if (item.getId() == ADENA_ID) @@ -720,7 +720,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(true); + _owner.refreshOverloaded(true); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 87c35d5d82..fa6332fb1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -120,7 +120,7 @@ public class PetInventory extends Inventory { if (item.isEquipped()) { - if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (!item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 4c8db6b288..dbba43acd0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -73,6 +73,6 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index a04975542f..8d988d61be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -89,7 +89,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java index 2f590854f8..26e11555ac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -415,11 +415,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -434,11 +434,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -532,7 +532,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -589,7 +589,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -780,7 +780,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) { if (isEquipable()) { @@ -793,7 +793,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return false; } - if (isCocRestrictedItem() && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_is_coc_restricted && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 1db19c172a..a0ee0a7895 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -119,7 +119,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 0f9a69fec3..d9baca8329 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -274,7 +274,7 @@ public class AppearanceStone return false; } - switch (getType()) + switch (_type) { case RESTORE: { @@ -383,15 +383,15 @@ public class AppearanceStone return false; } - if (getWeaponType() != WeaponType.NONE) + if (_weaponType != WeaponType.NONE) { - if (!targetItem.isWeapon() || (targetItem.getItemType() != getWeaponType())) + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); return false; } - switch (getHandType()) + switch (_handType) { case ONE_HANDED: { @@ -413,7 +413,7 @@ public class AppearanceStone } } - switch (getMagicType()) + switch (_magicType) { case MAGICAL: { @@ -435,9 +435,9 @@ public class AppearanceStone } } - if (getArmorType() != ArmorType.NONE) + if (_armorType != ArmorType.NONE) { - switch (getArmorType()) + switch (_armorType) { case SHIELD: { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 851ee0b06b..9cd7f326c0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -328,14 +328,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -344,7 +344,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -366,7 +366,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -482,7 +482,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -504,12 +504,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -519,7 +519,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -542,7 +542,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -559,9 +559,9 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isEnchantable(); + return _item.isEnchantable(); } return 0; } @@ -656,7 +656,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -730,7 +730,7 @@ public final class L2ItemInstance extends L2Object /** * @return the reference price of the item. */ - public int getReferencePrice() + public long getReferencePrice() { return _item.getReferencePrice(); } @@ -880,7 +880,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public final class L2ItemInstance extends L2Object final L2Summon pet = player.getPet(); return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -963,7 +963,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1139,9 +1139,9 @@ public final class L2ItemInstance extends L2Object { if (isWeapon()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - return getItem().getAttributes().stream().findFirst().orElse(null); + return _item.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1167,9 +1167,9 @@ public final class L2ItemInstance extends L2Object { if (isArmor()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - final AttributeHolder attribute = getItem().getAttribute(element); + final AttributeHolder attribute = _item.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1411,7 +1411,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1433,7 +1433,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1615,11 +1615,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1651,12 +1651,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1838,7 +1838,7 @@ public final class L2ItemInstance extends L2Object player.sendInventoryUpdate(iu); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1852,7 +1852,7 @@ public final class L2ItemInstance extends L2Object { player.getWarehouse().destroyItem("L2ItemInstance", this, player, null); } - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(getId())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId)); } } @@ -1949,32 +1949,32 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isElementable(); + return _item.isElementable(); } return false; } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -1991,7 +1991,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && (getItem().getSkills(ItemSkillType.NORMAL) != null); + return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2004,7 +2004,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2025,7 +2025,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2429,7 +2429,15 @@ public final class L2ItemInstance extends L2Object iu.addModifiedItem(this); player.broadcastUserInfo(UserInfoType.APPAREANCE); player.sendInventoryUpdate(iu); - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + + if (isEnchanted()) + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this)); + } + else + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + } } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 4858feb6a9..9a7dbcac0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/options/Options.java index 813ec8f6db..630038eb77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/options/Options.java @@ -189,14 +189,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { addSkill(player, holder.getSkill()); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { addSkill(player, holder.getSkill()); } @@ -227,14 +227,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { player.removeSkill(holder.getSkill(), false, false); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { player.removeSkill(holder.getSkill(), false, true); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java index 94d887ee5a..0cc8caca17 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2698,7 +2698,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2711,9 +2710,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); @@ -2901,7 +2900,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if (activeChar.getQuestState(getName()) != null) { - final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList packet = new ExQuestNpcLogList(_questId); getNpcLogList(activeChar).forEach(packet::add); activeChar.sendPacket(packet); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 40aa1878fd..5e0a66a375 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + _questName + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -755,7 +755,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 4013de0733..1cf9e26073 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,13 +53,13 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; - private final ScheduledFuture _schedular; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; + private final ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) { @@ -68,7 +68,7 @@ public class QuestTimer _player = player; _npc = npc; _isRepeating = repeating; - _schedular = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); + _scheduler = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); } public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) @@ -87,9 +87,9 @@ public class QuestTimer public void cancel() { _isActive = false; - if (_schedular != null) + if (_scheduler != null) { - _schedular.cancel(false); + _scheduler.cancel(false); } } @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java index 73f5ed97a8..81ec17cf73 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -132,7 +132,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -152,7 +152,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + _residenceId, e); } } @@ -173,7 +173,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN ps.setInt(1, func.getId()); ps.setInt(2, func.getLevel()); ps.setLong(3, func.getExpiration()); - ps.setInt(4, getResidenceId()); + ps.setInt(4, _residenceId); ps.setInt(5, func.getLevel()); ps.setLong(6, func.getExpiration()); @@ -181,7 +181,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + _residenceId, e); } finally { @@ -202,13 +202,13 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ? and id = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.setInt(2, func.getId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + _residenceId, e); } finally { @@ -225,12 +225,12 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + _residenceId, e); } finally { @@ -313,6 +313,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + " (" + getResidenceId() + ")"; + return _name + " (" + _residenceId + ")"; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index ab2394ed74..cac8ecf953 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -333,7 +333,7 @@ public final class BuffInfo } // Call on start. - effect.onStart(getEffector(), getEffected(), getSkill()); + effect.onStart(_effector, _effected, _skill); // If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it. if (effect.getTicks() > 0) @@ -360,7 +360,7 @@ public final class BuffInfo if (_isInUse) { // Callback for on action time event. - continueForever = effect.onActionTime(getEffector(), getEffected(), getSkill()); + continueForever = effect.onActionTime(_effector, _effected, _skill); } if (!continueForever && _skill.isToggle()) @@ -369,7 +369,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -391,7 +391,7 @@ public final class BuffInfo // Instant effects shouldn't call onExit(..). if (!effect.isInstant()) { - effect.onExit(getEffector(), getEffected(), getSkill()); + effect.onExit(_effector, _effected, _skill); } } @@ -403,7 +403,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java index 19a1a61b20..1cea15b228 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -240,15 +240,15 @@ public final class Skill implements IIdentifiable _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -441,7 +441,7 @@ public final class Skill implements IIdentifiable } _magicCriticalRate = set.getDouble("magicCriticalRate", 0); - _buffType = isTriggeredSkill() ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : isDebuff() ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; + _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); } @@ -1054,7 +1054,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getMaxSoulConsumeCount() @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable public boolean isStayAfterDeath() { - return _stayAfterDeath || isIrreplacableBuff() || isNecessaryToggle(); + return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle; } public boolean isBad() @@ -1333,7 +1333,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isIgnoringSkillEffects(getId(), getLevel())) + if (effected.isIgnoringSkillEffects(_id, _level)) { return; } @@ -1357,7 +1357,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1368,19 +1368,19 @@ public final class Skill implements IIdentifiable } // Check for mesmerizing debuffs and increase resist level. - if (isDebuff() && (getBasicProperty() != BasicProperty.NONE) && effected.hasBasicPropertyResist()) + if (_isDebuff && (_basicProperty != BasicProperty.NONE) && effected.hasBasicPropertyResist()) { - final BasicPropertyResist resist = effected.getBasicPropertyResist(getBasicProperty()); + final BasicPropertyResist resist = effected.getBasicPropertyResist(_basicProperty); resist.increaseResistLevel(); } } // Support for buff sharing feature including healing herbs. - if (isSharedWithSummon() && effected.isPlayer() && effected.hasServitors() && !isTransformation()) + if (_isSharedWithSummon && effected.isPlayer() && effected.hasServitors() && !isTransformation()) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - effected.getServitors().values().forEach(s -> applyEffects(effector, s, isRecoveryHerb(), 0)); + effected.getServitors().values().forEach(s -> applyEffects(effector, s, _isRecoveryHerb, 0)); } } } @@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1413,7 +1413,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && isSharedWithSummon() && info.getEffected().isPlayer() && isContinuous() && !isDebuff() && info.getEffected().hasServitors()) + if (addContinuousEffects && _isSharedWithSummon && info.getEffected().isPlayer() && isContinuous() && !_isDebuff && info.getEffected().hasServitors()) { info.getEffected().getServitors().values().forEach(s -> applyEffects(effector, s, false, 0)); } @@ -1498,9 +1498,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0, item); } @@ -1517,7 +1517,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1571,7 +1571,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isIrreplacableBuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispelled(); + return !isPassive() && !isToggle() && !_isDebuff && !_irreplacableBuff && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispelled; } public boolean isClanSkill() @@ -1733,20 +1733,20 @@ public final class Skill implements IIdentifiable public Skill getAttachedSkill(L2Character activeChar) { // If character is double casting, return double cast skill. - if ((getDoubleCastSkill() > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) + if ((_doubleCastSkill > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) { return SkillData.getInstance().getSkill(getDoubleCastSkill(), getLevel(), getSubLevel()); } // Default toggle group ID, assume nothing attached. - if ((getAttachToggleGroupId() <= 0) || (getAttachSkills() == null)) + if ((_attachToggleGroupId <= 0) || (_attachSkills == null)) { return null; } //@formatter:off final int toggleSkillId = activeChar.getEffectList().getEffects().stream() - .filter(info -> info.getSkill().getToggleGroupId() == getAttachToggleGroupId()) + .filter(info -> info.getSkill().getToggleGroupId() == _attachToggleGroupId) .mapToInt(info -> info.getSkill().getId()) .findAny().orElse(0); //@formatter:on @@ -1757,7 +1757,7 @@ public final class Skill implements IIdentifiable return null; } - final AttachSkillHolder attachedSkill = getAttachSkills().stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); + final AttachSkillHolder attachedSkill = _attachSkills.stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); // No attached skills for this toggle found. if (attachedSkill == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 8e607be078..f5da8aed03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -99,7 +99,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -160,7 +160,7 @@ public class SkillChannelizer implements Runnable if (o.isCharacter()) { targetList.add((L2Character) o); - ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), _channelizer); } }); } @@ -198,13 +198,13 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer()) + if (character.isPlayable() && _channelizer.isPlayer()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } // Be warned, this method has the possibility to call doDie->abortCast->stopChanneling method. Variable cache above try"+ +" is used in this case to avoid NPEs. - channeledSkill.applyEffects(getChannelizer(), character); + channeledSkill.applyEffects(_channelizer, character); // Reduce shots. if (skill.useSpiritShot()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index f8dfd518a6..30203b6450 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -145,7 +145,7 @@ public final class TeleportHolder // Build html final StringBuilder sb = new StringBuilder(); final StringBuilder sb_f = new StringBuilder(); - for (TeleportLocation loc : getLocations()) + for (TeleportLocation loc : _teleportData) { String finalName = loc.getName(); String confirmDesc = loc.getName(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 66f0ce1b9f..69519245dc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -205,7 +205,7 @@ public abstract class L2ZoneType extends ListenersContainer final Instance world = character.getInstanceWorld(); if (world != null) { - if (world.getTemplateId() != getInstanceTemplateId()) + if (world.getTemplateId() != _instanceTemplateId) { return false; } @@ -214,7 +214,7 @@ public abstract class L2ZoneType extends ListenersContainer return false; } } - else if (getInstanceTemplateId() > 0) + else if (_instanceTemplateId > 0) { return false; } @@ -402,12 +402,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -572,7 +572,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) @@ -605,10 +605,10 @@ public abstract class L2ZoneType extends ListenersContainer { if (_enabledInInstance != null) { - return _enabledInInstance.getOrDefault(instanceId, isEnabled()); + return _enabledInInstance.getOrDefault(instanceId, _enabled); } - return isEnabled(); + return _enabled; } public void oustAllPlayers() @@ -633,7 +633,7 @@ public abstract class L2ZoneType extends ListenersContainer return; } - for (L2Character character : getCharactersInside()) + for (L2Character character : _characterList.values()) { if ((character != null) && character.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 33d3bb8723..6a7479f3af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public final class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -257,7 +257,7 @@ public final class L2EffectZone extends L2ZoneType { getCharactersInside().forEach(character -> { - if ((character != null) && !character.isDead() && (Rnd.get(100) < getChance())) + if ((character != null) && !character.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index a1a99b7051..95223b63a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9b786f0b7d..f1e975876e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -252,7 +252,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -533,7 +533,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -603,11 +603,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 8aa642c02a..1c02d43810 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -56,7 +56,7 @@ public final class RequestRecipeItemMakeSelf implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index ba40366a3e..fda43da41c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -79,7 +79,7 @@ public final class RequestRecipeShopMakeItem implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index b3f8a823c8..ad3f971eda 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -59,7 +59,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 4fe4ef7d8c..75c44c649d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -54,7 +54,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 97d035b0f3..1d6ef78348 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -62,7 +62,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExShapeShiftingResult.CLOSE); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index a06dff5ebc..9dc3eba861 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -430,7 +430,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java index 1a16f0bd49..934a748fa3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 17f3f7f21b..bda9f2f3e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -68,7 +68,7 @@ public final class OfflineTradeUtil } default: { - canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isInCraftMode(); + canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isCrafting(); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 4911f2826c..e5388f4596 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -240,7 +240,7 @@ public class TaskExecutor */ public void pause() throws UnsupportedOperationException { - if (!canBePaused()) + if (!task.canBePaused()) { throw new UnsupportedOperationException("Pause not supported"); } @@ -276,7 +276,7 @@ public class TaskExecutor */ public void stop() throws UnsupportedOperationException { - if (!canBeStopped()) + if (!task.canBeStopped()) { throw new UnsupportedOperationException("Stop not supported"); } @@ -346,7 +346,7 @@ public class TaskExecutor */ public String getStatusMessage() throws UnsupportedOperationException { - if (!supportsStatusTracking()) + if (!task.supportsStatusTracking()) { throw new UnsupportedOperationException("Status tracking not supported"); } @@ -360,7 +360,7 @@ public class TaskExecutor */ public double getCompleteness() throws UnsupportedOperationException { - if (!supportsCompletenessTracking()) + if (!task.supportsCompletenessTracking()) { throw new UnsupportedOperationException("Completeness tracking not supported"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java index 85dbd2a34a..7d9ec1824b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java index da20164f21..068a5f1773 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 859128de7b..c90c8127a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -286,7 +286,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -314,10 +314,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -376,59 +376,59 @@ public abstract class BaseGameServerRegister if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.printf(getBundle().getString("checkingIdInUse") + Config.EOL, _id); + System.out.printf(_bundle.getString("checkingIdInUse") + Config.EOL, _id); if (GameServerTable.getInstance().hasRegisteredGameServerOnId(_id)) { - System.out.println(getBundle().getString("yes")); + System.out.println(_bundle.getString("yes")); if (_force) { - System.out.printf(getBundle().getString("forcingRegistration") + Config.EOL, _id); + System.out.printf(_bundle.getString("forcingRegistration") + Config.EOL, _id); unregisterGameServer(_id); registerGameServer(_id, _outDir); - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, _id); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, _id); } else if (_fallback) { - System.out.println(getBundle().getString("fallingBack")); + System.out.println(_bundle.getString("fallingBack")); final int registeredId = registerFirstAvailable(_outDir); if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.println(getBundle().getString("noAction")); + System.out.println(_bundle.getString("noAction")); } } else { - System.out.println(getBundle().getString("no")); + System.out.println(_bundle.getString("no")); registerGameServer(_id, _outDir); } } } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } catch (IOException e) { - showError(getBundle().getString("ioErrorRegister"), e); + showError(_bundle.getString("ioErrorRegister"), e); } } } @@ -453,14 +453,14 @@ public abstract class BaseGameServerRegister @Override public void run() { - System.out.printf(getBundle().getString("removingGsId") + Config.EOL, _id); + System.out.printf(_bundle.getString("removingGsId") + Config.EOL, _id); try { unregisterGameServer(_id); } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } } } @@ -479,7 +479,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 59ca8fcc83..6251faab77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -40,7 +40,7 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING); return false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/SocialAction.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/SocialAction.java index f7db8c36f7..fde530a2b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/SocialAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/SocialAction.java @@ -149,7 +149,7 @@ public final class SocialAction implements IPlayerActionHandler } SystemMessage sm; - if (player.isInStoreMode() || player.isInCraftMode()) + if (player.isInStoreMode() || player.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(player); @@ -228,7 +228,7 @@ public final class SocialAction implements IPlayerActionHandler // Checks for partner. final L2PcInstance partner = target.getActingPlayer(); - if (partner.isInStoreMode() || partner.isInCraftMode()) + if (partner.isInStoreMode() || partner.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(partner); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/network/PacketReader.java index ea90113f43..bdf5c76ac8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/RecipeController.java index dba4334dd6..8fda49f426 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/RecipeController.java @@ -199,7 +199,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -291,7 +291,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -438,7 +438,7 @@ public class RecipeController // update load and mana bar of craft window updateCurMp(); _activeMakers.remove(_player.getObjectId()); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendItemList(false); } @@ -654,7 +654,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player.getObjectId()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java index cad4fb54da..717f999c27 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -608,7 +608,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -648,7 +648,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -680,7 +680,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player)) + if (_actor.isVisibleFor(player)) { if (_clientMoving) { @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (getTarget() instanceof L2Character) && (getIntention() == AI_INTENTION_FOLLOW); + return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); } /** @@ -737,7 +737,7 @@ public abstract class AbstractAI implements Ctrl return; } - final L2Object followTarget = getTarget(); // copy to prevent NPE + final L2Object followTarget = _target; // copy to prevent NPE if (followTarget == null) { if (_actor.isSummon()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8826f4e507..3880807630 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -166,7 +166,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, max_range); } @@ -216,7 +216,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -256,7 +256,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 4f3a018802..0052f4791d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -224,7 +224,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtAttacked(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } @@ -239,7 +239,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtEvaded(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/cache/HtmCache.java index 3127c4156e..265a5a6758 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -66,7 +66,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index 316e1ed757..dd22855ae4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 5aac2716cf..d0cd743b0f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -134,7 +134,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -349,7 +349,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index ff236652e3..c60afbd78a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -48,9 +48,9 @@ public class AttendanceRewardData implements IGameXmlReader { if (Config.ENABLE_ATTENDANCE_REWARDS) { - getRewards().clear(); + _rewards.clear(); parseDatapackFile("data/AttendanceRewards.xml"); - _rewardsCount = getRewards().size(); + _rewardsCount = _rewards.size(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _rewardsCount + " rewards."); } else @@ -73,7 +73,7 @@ public class AttendanceRewardData implements IGameXmlReader } else { - getRewards().add(new ItemHolder(itemId, itemCount)); + _rewards.add(new ItemHolder(itemId, itemCount)); } })); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java index 712d1febdd..6618dcdf1d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java @@ -108,7 +108,7 @@ public final class CastleData implements IGameXmlReader guards.add(new SiegeGuardHolder(castleId, itemId, type, stationary, npcId, npcMaxAmount)); } } - getSiegeGuards().put(castleId, guards); + _siegeGuards.put(castleId, guards); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b0b755ac92..db7fdf9fa6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -258,7 +258,7 @@ public class RecipeData implements IGameXmlReader if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage("No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java index ac3c07c3c9..d5266c07ef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/enums/AttributeType.java @@ -63,7 +63,7 @@ public enum AttributeType */ public AttributeType getOpposite() { - return ATTRIBUTE_TYPES[((getClientId() % 2) == 0) ? (getClientId() + 1) : (getClientId() - 1)]; + return ATTRIBUTE_TYPES[((_clientId % 2) == 0) ? (_clientId + 1) : (_clientId - 1)]; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2615be0ddf..f0275d4660 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 792edf3cba..afc836f427 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -68,7 +68,7 @@ public final class CastleManager implements InstanceListManager if (nearestCastle == null) { double distance; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { distance = castle.getDistance(obj); if (maxDistance > distance) @@ -88,7 +88,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastleByOwner(L2Clan clan) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getOwnerId() == clan.getId()) { @@ -100,7 +100,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(String name) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getName().equalsIgnoreCase(name.trim())) { @@ -112,7 +112,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(int x, int y, int z) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.checkIfInZone(x, y, z)) { @@ -135,7 +135,7 @@ public final class CastleManager implements InstanceListManager public boolean hasOwnedCastle() { boolean hasOwnedCastle = false; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { if (castle.getOwnerId() > 0) { @@ -224,7 +224,7 @@ public final class CastleManager implements InstanceListManager final int castleId = rs.getInt("id"); _castles.put(castleId, new Castle(castleId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCastles().size() + " castles."); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.values().size() + " castles."); } catch (Exception e) { @@ -240,7 +240,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { castle.activateInstance(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index dc63278e16..37f7cd0a21 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -47,7 +47,7 @@ public final class FortManager implements InstanceListManager Fort nearestFort = getFort(obj); if (nearestFort == null) { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { final double distance = fort.getDistance(obj); if (maxDistance > distance) @@ -62,7 +62,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getResidenceId() == fortId) { @@ -74,7 +74,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getOwnerClan() == clan) { @@ -86,7 +86,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -98,7 +98,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.checkIfInZone(x, y, z)) { @@ -131,8 +131,8 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); - for (Fort fort : getForts()) + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.values().size() + " fortress"); + for (Fort fort : _forts.values()) { fort.getSiege().loadSiegeGuard(); } @@ -151,7 +151,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { fort.activateInstance(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 58b75f592d..0b4c7601cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -102,7 +102,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -115,7 +115,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -128,7 +128,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -141,7 +141,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -159,7 +159,7 @@ public final class MailManager public int getMailsInProgress(int objectId) { int count = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getMailType() == MailType.REGULAR)) { @@ -179,7 +179,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 41216a0555..30581681f4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -244,7 +244,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return (currPetition.getState() == PetitionState.IN_PROCESS); } @@ -252,7 +252,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -283,7 +283,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -302,7 +302,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -312,7 +312,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -330,7 +330,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -363,12 +363,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("

There are no currently pending petitions.
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -379,7 +379,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -419,7 +419,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -440,7 +440,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 964757069c..20b6c07319 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -171,7 +171,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java index 1b0e62c021..83b903b671 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -277,7 +277,7 @@ public final class CharEffectList */ public int getBuffCount() { - return _actives != null ? (_buffCount.intValue() - _hiddenBuffs.get()) : 0; + return _actives != null ? (_buffCount.get() - _hiddenBuffs.get()) : 0; } /** @@ -287,7 +287,7 @@ public final class CharEffectList */ public int getDanceCount() { - return _danceCount.intValue(); + return _danceCount.get(); } /** @@ -297,7 +297,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return _triggerBuffCount.intValue(); + return _triggerBuffCount.get(); } /** @@ -307,7 +307,7 @@ public final class CharEffectList */ public int getToggleCount() { - return _toggleCount.intValue(); + return _toggleCount.get(); } /** @@ -317,7 +317,7 @@ public final class CharEffectList */ public int getDebuffCount() { - return _debuffCount.intValue(); + return _debuffCount.get(); } /** @@ -352,7 +352,7 @@ public final class CharEffectList */ public void stopAllToggles() { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { // Ignore necessary toggles. stopEffects(b -> b.getSkill().isToggle() && !b.getSkill().isNecessaryToggle() && !b.getSkill().isIrreplacableBuff(), true, true); @@ -361,7 +361,7 @@ public final class CharEffectList public void stopAllTogglesOfGroup(int toggleGroup) { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { stopEffects(b -> b.getSkill().isToggle() && (b.getSkill().getToggleGroupId() == toggleGroup), true, true); } @@ -508,7 +508,7 @@ public final class CharEffectList */ public void stopEffectsOnAction() { - if (_hasBuffsRemovedOnAnyAction.intValue() > 0) + if (_hasBuffsRemovedOnAnyAction.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnAnyActionExceptMove(), true, true); } @@ -516,7 +516,7 @@ public final class CharEffectList public void stopEffectsOnDamage() { - if (_hasBuffsRemovedOnDamage.intValue() > 0) + if (_hasBuffsRemovedOnDamage.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnDamage(), true, true); } @@ -535,16 +535,16 @@ public final class CharEffectList { case TRIGGER: { - return (getTriggeredBuffCount() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); + return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); } case DANCE: { - return (getDanceCount() > Config.DANCES_MAX_AMOUNT); + return (_danceCount.get() > Config.DANCES_MAX_AMOUNT); } // case TOGGLE: Do toggles have limit? case DEBUFF: { - return (getDebuffCount() > 24); + return (_debuffCount.get() > 24); } case BUFF: { @@ -1106,7 +1106,7 @@ public final class CharEffectList final Skill skill = info.getSkill(); // Handle hidden buffs. Check if there was such abnormal before so we can continue. - if ((getHiddenBuffsCount() > 0) && _stackedEffects.contains(skill.getAbnormalType())) + if ((_hiddenBuffs.get() > 0) && _stackedEffects.contains(skill.getAbnormalType())) { // If incoming buff isnt hidden, remove any hidden buffs with its abnormal type. if (info.isInUse()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 8de8a2fb0e..2265d6876c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -71,7 +71,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java index 2e13b5d8d6..772f812e21 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java @@ -110,7 +110,7 @@ public class Fishing public synchronized void startFishing() { - if (isFishing()) + if (_isFishing) { return; } @@ -132,7 +132,7 @@ public class Fishing if (!canFish()) { - if (isFishing()) + if (_isFishing) { _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); } @@ -182,7 +182,7 @@ public class Fishing return; } - if (_player.isInCraftMode() || _player.isInStoreMode()) + if (_player.isCrafting() || _player.isInStoreMode()) { _player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -201,7 +201,7 @@ public class Fishing _baitLocation = calculateBaitLocation(); if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null)) { - if (isFishing()) + if (_isFishing) { // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -262,7 +262,7 @@ public class Fishing private void reelIn(FishingEndReason reason, boolean consumeBait) { - if (!isFishing()) + if (!_isFishing) { return; } @@ -326,7 +326,7 @@ public class Fishing public synchronized void stopFishing(FishingEndType endType) { - if (isFishing()) + if (_isFishing) { reelIn(FishingEndReason.STOP, false); _isFishing = false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index ec834bcb34..c05e0915be 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -177,7 +177,7 @@ public final class L2ArmorSet public int getLowestSetEnchant(L2PcInstance player) { // Player don't have full set - if (getPiecesCount(player, L2ItemInstance::getId) < getMinimumPieces()) + if (getPiecesCount(player, L2ItemInstance::getId) < _minimumPieces) { return 0; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java index a682fc1ce7..85cd93e136 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -170,7 +170,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); final ClanRewardBonus availableOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(this); if ((_lastMembersOnlineBonus == null) && (availableOnlineBonus != null)) @@ -242,7 +242,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -278,7 +278,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - LOGGER.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + _name + " without clan leader!"); return ""; } return _leader.getName(); @@ -570,7 +570,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -608,7 +608,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -628,7 +628,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -882,8 +882,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -926,8 +926,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -942,8 +942,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -978,15 +978,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1015,19 +1015,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1071,7 +1071,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1084,12 +1084,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1109,7 +1109,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1146,7 +1146,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1177,7 +1177,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1237,7 +1237,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1364,7 +1364,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1372,7 +1372,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1612,7 +1612,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1765,7 +1765,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1855,7 +1855,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); return null; @@ -1864,7 +1864,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1879,11 +1879,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1949,7 +1949,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1965,7 +1965,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2014,7 +2014,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2026,7 +2026,7 @@ public class L2Clan implements IIdentifiable, INamable LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } - for (L2ClanMember cm : getMembers()) + for (L2ClanMember cm : _members.values()) { if (cm.isOnline()) { @@ -2050,7 +2050,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2090,12 +2090,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2169,7 +2169,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2206,7 +2206,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2238,7 +2238,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2390,22 +2390,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2426,7 +2426,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2439,12 +2439,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2483,7 +2483,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2492,12 +2492,12 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; // Such as https://l2wiki.com/classic/Clans_–_Clan_Level - switch (getLevel()) + switch (_level) { case 0: { // Upgrade to 1 - if ((player.getSp() >= 1000) && (player.getAdena() >= 150000) && (getMembersCount() >= 1)) + if ((player.getSp() >= 1000) && (player.getAdena() >= 150000) && (_members.size() >= 1)) { if (player.reduceAdena("ClanLvl", 150000, player.getTarget(), true)) { @@ -2513,7 +2513,7 @@ public class L2Clan implements IIdentifiable, INamable case 1: { // Upgrade to 2 - if ((player.getSp() >= 15000) && (player.getAdena() >= 300000) && (getMembersCount() >= 1)) + if ((player.getSp() >= 15000) && (player.getAdena() >= 300000) && (_members.size() >= 1)) { if (player.reduceAdena("ClanLvl", 300000, player.getTarget(), true)) { @@ -2529,7 +2529,7 @@ public class L2Clan implements IIdentifiable, INamable case 2: { // Upgrade to 3 - if ((player.getSp() >= 100000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 100000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 100, player.getTarget(), true)) @@ -2549,7 +2549,7 @@ public class L2Clan implements IIdentifiable, INamable case 3: { // Upgrade to 4 - if ((player.getSp() >= 1000000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 1000000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 5000, player.getTarget(), true)) @@ -2569,7 +2569,7 @@ public class L2Clan implements IIdentifiable, INamable case 4: { // Upgrade to 5 - if ((player.getSp() >= 5000000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 5000000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 10000, player.getTarget(), true)) @@ -2605,7 +2605,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendItemList(false); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2618,7 +2618,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2628,9 +2628,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2653,7 +2653,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2664,12 +2664,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2686,15 +2686,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2736,7 +2736,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2747,12 +2747,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -3022,7 +3022,7 @@ public class L2Clan implements IIdentifiable, INamable getVariables().set("PREVIOUS_HUNTING_POINTS", getHuntingPoints()); // Reset - getMembers().forEach(L2ClanMember::resetBonus); + _members.values().forEach(L2ClanMember::resetBonus); getVariables().remove("HUNTING_POINTS"); // force store @@ -3040,7 +3040,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_vars == null) { - _vars = new ClanVariables(getId()); + _vars = new ClanVariables(_clanId); if (Config.CLAN_VARIABLES_STORE_INTERVAL > 0) { ThreadPool.scheduleAtFixedRate(this::storeVariables, Config.CLAN_VARIABLES_STORE_INTERVAL, Config.CLAN_VARIABLES_STORE_INTERVAL); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ClanMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ClanMember.java index 7f0fa86028..8827f75a89 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ClanMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2ClanMember.java @@ -855,7 +855,6 @@ public class L2ClanMember private PlayerVariables getVariables() { - final L2PcInstance player = getPlayerInstance(); - return player != null ? player.getVariables() : new PlayerVariables(_objectId); + return _player != null ? _player.getVariables() : new PlayerVariables(_objectId); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index d91e7e0554..df5da1b8ba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Crest.java index dc3c3497a3..24eedf1679 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,42 +94,41 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - final byte[] data = getData(); - if (data != null) + if (_data != null) { for (int i = 0; i <= 4; i++) { if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); - activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); + System.arraycopy(_data, (14336 * i), fullChunk, 0, 14336); + activeChar.sendPacket(new ExPledgeEmblem(_id, fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); - activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); + System.arraycopy(_data, (14336 * i), lastChunk, 0, 8320); + activeChar.sendPacket(new ExPledgeEmblem(_id, lastChunk, 0, i)); } } } - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java index a1eb3d2480..5c086b9d83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -52,7 +52,7 @@ public class L2Mentee try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT char_name, level, base_class FROM characters WHERE charId = ?")) { - statement.setInt(1, getObjectId()); + statement.setInt(1, _objectId); try (ResultSet rset = statement.executeQuery()) { if (rset.next()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java index 171ad1e543..70a2a9e6e2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Object.java @@ -148,15 +148,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -180,7 +175,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -242,7 +237,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -632,7 +627,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get()); } /** @@ -680,13 +675,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -781,7 +775,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -806,7 +800,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -880,19 +874,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -904,6 +897,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java index 9636853228..d01a52009e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java @@ -168,7 +168,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -195,7 +195,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -260,7 +260,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -279,7 +279,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -294,7 +294,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -305,14 +305,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if (pMember != null) { @@ -333,7 +333,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -357,7 +357,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -439,7 +439,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(target, tacticalSignId)); m.sendPacket(sm); @@ -450,7 +450,7 @@ public class L2Party extends AbstractPlayerGroup // Sign already assigned // If the sign is applied on the same target, remove it _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); + _members.forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); } else { @@ -462,7 +462,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); @@ -502,19 +502,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isInDuel()) @@ -573,25 +573,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(ExCloseMPCC.STATIC_PACKET); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -653,7 +653,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -663,9 +663,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -800,7 +800,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -930,11 +930,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2SiegeClan.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2SiegeClan.java index 2ba2a8a219..57266247c3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2SiegeClan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2SiegeClan.java @@ -53,12 +53,12 @@ public class L2SiegeClan flag.deleteMe(); - return getFlag().remove(flag); + return _flags.remove(flag); } public void removeFlags() { - for (L2Npc flag : getFlag()) + for (L2Npc flag : _flags) { removeFlag(flag); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java index 1b7cb26b50..f36fed74eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -511,7 +511,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocz = loc.getZ(); setLocation(loc); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -519,9 +519,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -539,16 +539,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } // Set custom Npc server side name and title @@ -670,7 +670,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } public final boolean getRandomWalking() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 97608b326d..4a88a92311 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java index 4b5e290517..3794527a37 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Location.java @@ -190,6 +190,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java index 4eb38cf27b..ef36048457 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -136,16 +136,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -200,12 +200,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + int choice = Rnd.nextInt(getMobs().size()); for (L2ControllableMobInstance mob : getMobs()) { if (--choice == 0) @@ -220,7 +220,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroupTable.java index da1b620a40..121e34e9c4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Petition.java index cbed80441a..ff4816d7ef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TempItem.java index fa918cfc55..db4b2f817f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TempItem.java @@ -28,7 +28,7 @@ public final class TempItem { private final int _itemId; private int _quantity; - private final int _referencePrice; + private final long _referencePrice; private final String _itemName; /** @@ -60,7 +60,7 @@ public final class TempItem _quantity = quantity; } - public int getReferencePrice() + public long getReferencePrice() { return _referencePrice; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java index 5799628a4b..e9a73532b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/TradeList.java @@ -150,11 +150,7 @@ public class TradeList { if (exclItem.getItem().getId() == item.getId()) { - if (item.getCount() <= exclItem.getCount()) - { - return null; - } - return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice()); + return item.getCount() <= exclItem.getCount() ? null : new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice()); } } } @@ -201,7 +197,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -215,13 +211,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -271,7 +267,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -318,7 +314,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -441,11 +437,7 @@ public class TradeList { partnerList.lock(); lock(); - if (!partnerList.validate()) - { - return false; - } - if (!validate()) + if (!partnerList.validate() || !validate()) { return false; } @@ -617,15 +609,15 @@ public class TradeList boolean success = false; // check weight and slots - if ((!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) + if ((!_owner.getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if ((!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) + else if ((!_owner.getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -634,7 +626,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -659,7 +651,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -715,7 +707,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; @@ -880,11 +872,7 @@ public class TradeList // Send inventory update packet _owner.sendInventoryUpdate(ownerIU); player.sendInventoryUpdate(playerIU); - if (ok) - { - return 0; - } - return 2; + return ok ? 0 : 2; } /** @@ -895,12 +883,7 @@ public class TradeList */ public synchronized boolean privateStoreSell(L2PcInstance player, ItemRequest[] requestedItems) { - if (_locked) - { - return false; - } - - if (!_owner.isOnline() || !player.isOnline()) + if (_locked || !_owner.isOnline() || !player.isOnline()) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 0acc52a711..00b850b661 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -208,7 +208,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -239,7 +239,7 @@ public class L2Attackable extends L2Npc addDamage(attacker, (int) value, skill); // Check Raidboss attack. Character will be petrified if attacking a raid that's more than 8 levels lower. In retail you deal damage to raid before curse. - if (isRaid() && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) + if (_isRaid && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) { if (attacker.getLevel() > (getLevel() + 8)) { @@ -386,7 +386,7 @@ public class L2Attackable extends L2Npc } // Calculate raidboss points - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final L2PcInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer(); broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); @@ -480,7 +480,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -489,8 +489,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -515,7 +515,7 @@ public class L2Attackable extends L2Npc } clan.addHuntingPoints(attacker, this, finalExp); } - attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, isRaid()), true, false); + attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp); } } @@ -592,7 +592,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -603,8 +603,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -984,7 +984,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1036,7 +1036,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); sm.addString(getName()); @@ -1048,7 +1048,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) + if (Config.CHAMPION_ENABLE && _champion && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY); final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty); @@ -1230,7 +1230,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() != _spoilerObjectId) && !sweeper.isInLooterParty(_spoilerObjectId)) { if (sendMessage) { @@ -1384,7 +1384,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1458,7 +1458,7 @@ public class L2Attackable extends L2Npc if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (isMonster() && !getTemplate().isUndying() && !_isRaid && !_isRaidMinion && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -1683,7 +1683,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b8662c6e57..a5d7f51aa7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -499,13 +499,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public double getCollisionRadius() { - final double defaultCollisionRadius = getTemplate().getCollisionRadius(); + final double defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } public double getCollisionHeight() { - final double defaultCollisionHeight = getTemplate().getCollisionHeight(); + final double defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -530,7 +530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -550,9 +550,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Stop on creature see task and clear the data @@ -584,7 +584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -649,8 +649,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -703,8 +703,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // HP - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); - su.addUpdate(StatusUpdateType.CUR_HP, (int) getCurrentHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); + su.addUpdate(StatusUpdateType.CUR_HP, (int) _status.getCurrentHp()); // MP computeStatusUpdate(su, StatusUpdateType.MAX_MP); @@ -1053,7 +1053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe mpConsume = weaponItem.getReducedMpConsume(); } mpConsume = isAffected(EffectFlag.CHEAPSHOT) ? 0 : mpConsume; - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1065,7 +1065,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } } } @@ -1073,7 +1073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final WeaponType attackType = getAttackType(); final boolean isTwoHanded = (weaponItem != null) && (weaponItem.getBodyPart() == L2Item.SLOT_LR_HAND); - final int timeAtk = Formulas.calculateTimeBetweenAttacks(getPAtkSpd()); + final int timeAtk = Formulas.calculateTimeBetweenAttacks(_stat.getPAtkSpd()); final int timeToHit = Formulas.calculateTimeToHit(timeAtk, weaponType, isTwoHanded, false); _attackEndTime = System.nanoTime() + (TimeUnit.MILLISECONDS.toNanos(timeAtk)); @@ -1196,12 +1196,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackCountMax = (int) getStat().getValue(Stats.ATTACK_COUNT_MAX, 1); - if ((attackCountMax > 1) && !(getStat().getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) + int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1); + if ((attackCountMax > 1) && !(_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) { final double headingAngle = Util.convertHeadingToDegree(getHeading()); - final int maxRadius = getStat().getPhysicalAttackRadius(); - final int physicalAttackAngle = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRadius(); + final int physicalAttackAngle = _stat.getPhysicalAttackAngle(); for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius)) { // Skip main target. @@ -1251,7 +1251,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss) { shld = Formulas.calcShldUse(this, target); - crit = Formulas.calcCrit(getStat().getCriticalHit(), this, target, null); + crit = Formulas.calcCrit(_stat.getCriticalHit(), this, target, null); damage = (int) Formulas.calcAutoAttackDamage(this, target, shld, crit, shotConsumed); if (halfDamage) { @@ -1294,7 +1294,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Try casting the skill - final SkillCaster skillCaster = SkillCaster.castSkill(this, getTarget(), skill, item, castingType, ctrlPressed, shiftPressed); + final SkillCaster skillCaster = SkillCaster.castSkill(this, _target, skill, item, castingType, ctrlPressed, shiftPressed); if ((skillCaster == null) && isPlayer()) { // Skill casting failed, notify player. @@ -1612,7 +1612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); if (isMonster()) { @@ -1676,9 +1676,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Remove all effects, do not broadcast changes. @@ -1696,26 +1696,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -1855,7 +1855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; } public final boolean isConfused() @@ -1915,7 +1915,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return hasBlockActions() || isRooted() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting(); + return hasBlockActions() || isRooted() || _isOverloaded || _isImmobilized || isAlikeDead() || _isTeleporting; } public final boolean isOverloaded() @@ -1934,7 +1934,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2023,7 +2023,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2048,7 +2048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2379,7 +2379,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.STUN); + _effectList.stopEffects(AbnormalType.STUN); } if (!isPlayer()) @@ -2402,11 +2402,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.TRANSFORM); - getEffectList().stopEffects(AbnormalType.CHANGEBODY); + _effectList.stopEffects(AbnormalType.TRANSFORM); + _effectList.stopEffects(AbnormalType.CHANGEBODY); } - if (isTransformed()) + if (_transform.isPresent()) { untransform(); } @@ -2517,7 +2517,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet. - if (isMoving() && (getMoveSpeed() <= 0)) + if (isMoving() && (_stat.getMoveSpeed() <= 0)) { stopMove(null); } @@ -2585,7 +2585,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxCp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp()); } break; } @@ -2597,7 +2597,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); } break; } @@ -2609,7 +2609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxMp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp()); } break; } @@ -2682,7 +2682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2924,7 +2924,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided @@ -2940,7 +2940,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -3147,7 +3147,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -3174,7 +3174,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -3252,7 +3252,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -3381,7 +3381,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -3428,7 +3428,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -3623,7 +3623,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void onHitTimeNotDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3652,7 +3652,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onFirstHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime, int delayForSecondAttack) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3682,7 +3682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onSecondHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime1, int hitTime2, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3970,10 +3970,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Stop all effects of that skill if (oldSkill.isPassive()) { - getEffectList().stopSkillEffects(true, oldSkill); + _effectList.stopSkillEffects(true, oldSkill); } - getStat().recalculateStats(true); + _stat.recalculateStats(true); } if (newSkill.isPassive()) @@ -4008,7 +4008,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) { stopSkillEffects(true, oldSkill.getId()); - getStat().recalculateStats(true); + _stat.recalculateStats(true); } } @@ -4105,7 +4105,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - final int random = (int) getStat().getValue(Stats.RANDOM_DAMAGE); + final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE); return (1 + ((double) Rnd.get(-random, random) / 100)); } @@ -4127,193 +4127,193 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public int getMagicAccuracy() { - return getStat().getMagicAccuracy(); + return _stat.getMagicAccuracy(); } public int getMagicEvasionRate() { - return getStat().getMagicEvasionRate(); + return _stat.getMagicEvasionRate(); } public final double getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(int init) { - return getStat().getCriticalDmg(init); + return _stat.getCriticalDmg(init); } public int getCriticalHit() { - return getStat().getCriticalHit(); + return _stat.getCriticalHit(); } public int getEvasionRate() { - return getStat().getEvasionRate(); + return _stat.getEvasionRate(); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public int getMAtk() { - return getStat().getMAtk(); + return _stat.getMAtk(); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit() { - return getStat().getMCriticalHit(); + return _stat.getMCriticalHit(); } public int getMDef() { - return getStat().getMDef(); + return _stat.getMDef(); } public int getPAtk() { - return getStat().getPAtk(); + return _stat.getPAtk(); } public int getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public int getPDef() { - return getStat().getPDef(); + return _stat.getPDef(); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } public int getLUC() { - return getStat().getLUC(); + return _stat.getLUC(); } public int getCHA() { - return getStat().getCHA(); + return _stat.getCHA(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) @@ -4338,7 +4338,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // RearDamage effect bonus. if (isBehind(target)) { - damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1); } // Counterattacks happen before damage received. @@ -4383,27 +4383,27 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Absorb HP from the damage inflicted double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1); - if ((absorbPercent > 0) && (Rnd.nextDouble() < getStat().getValue(Stats.ABSORB_DAMAGE_CHANCE))) + if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE))) { - int absorbDamage = (int) Math.min(absorbPercent * damage, getMaxRecoverableHp() - getCurrentHp()); + int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp()); if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted. Unconfirmed for skill attacks. if (skill == null) { - absorbPercent = getStat().getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); + absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); if (absorbPercent > 0) { - int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, getMaxRecoverableMp() - getCurrentMp()); + int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp()); if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } } @@ -4448,7 +4448,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - final double damageCap = getStat().getValue(Stats.DAMAGE_LIMIT); + final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT); if (damageCap > 0) { value = Math.min(value, damageCap); @@ -4459,17 +4459,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + getStat().getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; } else { - value *= (100 + getStat().getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; } } if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } else if (isPlayer()) { @@ -4477,7 +4477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } if (attacker != null) @@ -4488,83 +4488,83 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final int getCurrentCpPercent() { - return (int) ((getCurrentCp() * 100) / getMaxCp()); + return (int) ((_status.getCurrentCp() * 100) / _stat.getMaxCp()); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final void setCurrentCp(double newCp, boolean broadcast) { - getStatus().setCurrentCp(newCp, broadcast); + _status.setCurrentCp(newCp, broadcast); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final int getCurrentHpPercent() { - return (int) ((getCurrentHp() * 100) / getMaxHp()); + return (int) ((_status.getCurrentHp() * 100) / _stat.getMaxHp()); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHp(double newHp, boolean broadcast) { - getStatus().setCurrentHp(newHp, broadcast); + _status.setCurrentHp(newHp, broadcast); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final int getCurrentMpPercent() { - return (int) ((getCurrentMp() * 100) / getMaxMp()); + return (int) ((_status.getCurrentMp() * 100) / _stat.getMaxMp()); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } public final void setCurrentMp(double newMp, boolean broadcast) { - getStatus().setCurrentMp(newMp, false); + _status.setCurrentMp(newMp, false); } /** @@ -4577,7 +4577,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); - return (int) getStat().getValue(Stats.WEIGHT_LIMIT, baseLoad); + return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad); } return 0; } @@ -4586,7 +4586,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (isPlayer() || isPet()) { - return (int) getStat().getValue(Stats.WEIGHT_PENALTY, 1); + return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1); } return 0; } @@ -4623,17 +4623,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public AttributeType getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(AttributeType attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(AttributeType defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -4852,8 +4852,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return weapon.getItemType(); } - final WeaponType defaultWeaponType = getTemplate().getBaseAttackType(); - return getTransformation().map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); + final WeaponType defaultWeaponType = _template.getBaseAttackType(); + return _transform.map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); } public final boolean isInCategory(CategoryType type) @@ -5001,7 +5001,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).collect(Collectors.toList()); + return _skillCasters.values().stream().filter(filter).collect(Collectors.toList()); } @SafeVarargs @@ -5012,7 +5012,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).findAny().orElse(null); + return _skillCasters.values().stream().filter(filter).findAny().orElse(null); } /** @@ -5098,7 +5098,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -5128,7 +5128,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override @@ -5200,7 +5200,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean hasAbnormalType(AbnormalType abnormalType) { - return getEffectList().hasAbnormalType(abnormalType); + return _effectList.hasAbnormalType(abnormalType); } public void addBlockActionsAllowedSkill(int skillId) @@ -5267,11 +5267,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public MoveType getMoveType() { - if (isMoving() && isRunning()) + if (isMoving() && _isRunning) { return MoveType.RUNNING; } - else if (isMoving() && !isRunning()) + else if (isMoving() && !_isRunning) { return MoveType.WALKING; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 87e507807a..c6d0dec751 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -372,7 +372,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -514,7 +514,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -745,7 +745,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -925,7 +925,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getReputation() >= 0)) @@ -999,10 +999,9 @@ public class L2Npc extends L2Character DecayTaskManager.getInstance().add(this); - final L2Spawn spawn = getSpawn(); - if (spawn != null) + if (_spawn != null) { - final NpcSpawnTemplate npcTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcTemplate = _spawn.getNpcSpawnTemplate(); if (npcTemplate != null) { npcTemplate.notifyNpcDeath(this, killer); @@ -1140,7 +1139,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1228,7 +1227,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1299,7 +1298,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1318,7 +1317,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1394,7 +1393,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic, boolean fish) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1474,7 +1473,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** @@ -1784,10 +1783,9 @@ public class L2Npc extends L2Character return _params; } - final L2Spawn spawn = getSpawn(); - if (spawn != null) // Minions doesn't have L2Spawn object bound + if (_spawn != null) // Minions doesn't have L2Spawn object bound { - final NpcSpawnTemplate npcSpawnTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { final StatsSet params = getTemplate().getParameters(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 67b1130e8f..4c28ea1dcb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -118,15 +118,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -196,7 +196,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if (player == getOwner()) + if (player == _owner) { player.sendPacket(new PetInfo(this, 1)); return; @@ -242,19 +242,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getReputation() { - return getOwner() != null ? getOwner().getReputation() : 0; + return _owner != null ? _owner.getReputation() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -313,8 +313,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -326,7 +325,7 @@ public abstract class L2Summon extends L2Playable final AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -392,7 +391,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); } @@ -434,12 +433,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } @@ -477,7 +476,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -546,7 +545,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, L2ItemInstance item, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -654,7 +653,7 @@ public abstract class L2Summon extends L2Playable if (skill.isBad()) { // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; @@ -673,7 +672,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -695,13 +694,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (crit) { @@ -715,14 +714,14 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } final SystemMessage sm; - if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF))) + if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF))) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } @@ -744,7 +743,7 @@ public abstract class L2Summon extends L2Playable { super.reduceCurrentHp(damage, attacker, skill); - if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) + if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -757,14 +756,13 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); - if ((skill.getTarget(this, false, false, false) == null) && !actingPlayer.getAccessLevel().allowPeaceAttack()) + if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance - actingPlayer.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + _owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // Send a Server->Client packet ActionFailed to the L2PcInstance - actingPlayer.sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -774,18 +772,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -796,10 +794,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } } @@ -807,7 +805,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -842,7 +840,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, isDead() ? 0 : 1)); if (isPet()) @@ -870,7 +868,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -904,7 +902,7 @@ public abstract class L2Summon extends L2Playable */ public void doAttack(L2Object target) { - if (getOwner() != null) + if (_owner != null) { if (target != null) { @@ -912,7 +910,7 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -926,12 +924,12 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(L2Object target, boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - if ((target == null) || (this == target) || (getOwner() == target)) + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -940,7 +938,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -960,28 +958,28 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -994,7 +992,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1014,18 +1012,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1041,14 +1039,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1059,7 +1057,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1071,14 +1069,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1086,13 +1084,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() @@ -1144,7 +1142,7 @@ public abstract class L2Summon extends L2Playable public void sendInventoryUpdate(InventoryUpdate iu) { - final L2PcInstance owner = getOwner(); + final L2PcInstance owner = _owner; if (owner != null) { owner.sendInventoryUpdate(iu); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index fe1f4c81cf..a03a262e08 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -74,7 +74,7 @@ public class PcAppearance { if (_visibleName == null) { - return getOwner().getName(); + return _owner.getName(); } return _visibleName; } @@ -94,7 +94,7 @@ public class PcAppearance { if (_visibleTitle == null) { - return getOwner().getTitle(); + return _owner.getTitle(); } return _visibleTitle; } @@ -220,27 +220,27 @@ public class PcAppearance public int getVisibleClanId() { - return _visibleClanId != -1 ? _visibleClanId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanId(); + return _visibleClanId != -1 ? _visibleClanId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanId(); } public int getVisibleClanCrestId() { - return _visibleClanCrestId != -1 ? _visibleClanCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestId(); + return _visibleClanCrestId != -1 ? _visibleClanCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestId(); } public int getVisibleClanLargeCrestId() { - return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestLargeId(); + return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestLargeId(); } public int getVisibleAllyId() { - return _visibleAllyId != -1 ? _visibleAllyId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyId(); + return _visibleAllyId != -1 ? _visibleAllyId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyId(); } public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 91548e2a10..7aae137ada 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -53,7 +53,7 @@ public class L2DecoyInstance extends L2Character _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; final int skilllevel = getTemplate().getDisplayId() - 13070; - _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); + _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -269,18 +269,18 @@ public class L2DecoyInstance extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index baab09b858..d82f30b44d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class L2DoorInstance extends L2Character { - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isInverted = false; private int _meshindex = 1; @@ -293,7 +293,7 @@ public final class L2DoorInstance extends L2Character { return false; } - else if (getIsAttackableDoor()) + else if (_isAttackableDoor) { return true; } @@ -369,13 +369,13 @@ public final class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - oe = new OnEventTrigger(getEmitter(), !isOpen()); + oe = new OnEventTrigger(getEmitter(), !_open); } else { - oe = new OnEventTrigger(getEmitter(), isOpen()); + oe = new OnEventTrigger(getEmitter(), _open); } } @@ -592,13 +592,13 @@ public final class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), !isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), !_open)); } else { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), _open)); } } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -649,7 +649,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -661,8 +661,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -671,7 +670,7 @@ public final class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 35cb265650..53df3b876a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -75,7 +75,7 @@ public class L2MonsterInstance extends L2Attackable } // Check if the L2MonsterInstance target is aggressive - if (Config.GUARD_ATTACK_AGGRO_MOB && isAggressive() && (attacker instanceof L2GuardInstance)) + if (Config.GUARD_ATTACK_AGGRO_MOB && getTemplate().isAggressive() && (attacker instanceof L2GuardInstance)) { return true; } @@ -108,11 +108,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -173,9 +173,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -229,7 +229,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -238,7 +238,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 7db9d6d749..2c9f2381ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -503,7 +503,7 @@ public final class L2PcInstance extends L2Playable private AdminTeleportType _teleportType = AdminTeleportType.NORMAL; private boolean _inCrystallize; - private boolean _inCraftMode; + private boolean _isCrafting; private long _offlineShopStart = 0; @@ -908,7 +908,7 @@ public final class L2PcInstance extends L2Playable public String getAccountName() { - return _client == null ? getAccountNamePlayer() : _client.getAccountName(); + return _client == null ? _accountName : _client.getAccountName(); } public String getAccountNamePlayer() @@ -925,7 +925,7 @@ public final class L2PcInstance extends L2Playable { int result = 0; - if (getClan() != null) + if (_clan != null) { result |= RelationChanged.RELATION_CLAN_MEMBER; if (getClan() == target.getClan()) @@ -944,9 +944,9 @@ public final class L2PcInstance extends L2Playable if ((getParty() != null) && (getParty() == target.getParty())) { result |= RelationChanged.RELATION_HAS_PARTY; - for (int i = 0; i < getParty().getMembers().size(); i++) + for (int i = 0; i < _party.getMembers().size(); i++) { - if (getParty().getMembers().get(i) != this) + if (_party.getMembers().get(i) != this) { continue; } @@ -1000,7 +1000,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getSiegeState() != 0) + if (_siegeState != 0) { result |= RelationChanged.RELATION_INSIEGE; if (getSiegeState() != target.getSiegeState()) @@ -1011,7 +1011,7 @@ public final class L2PcInstance extends L2Playable { result |= RelationChanged.RELATION_ALLY; } - if (getSiegeState() == 1) + if (_siegeState == 1) { result |= RelationChanged.RELATION_ATTACKER; } @@ -1027,7 +1027,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getBlockCheckerArena() != -1) + if (_handysBlockCheckerEventArena != -1) { result |= RelationChanged.RELATION_INSIEGE; final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); @@ -1207,17 +1207,17 @@ public final class L2PcInstance extends L2Playable public boolean isInStoreMode() { - return getPrivateStoreType() != PrivateStoreType.NONE; + return _privateStoreType != PrivateStoreType.NONE; } - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** @@ -1294,7 +1294,7 @@ public final class L2PcInstance extends L2Playable LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) { @@ -1427,13 +1427,13 @@ public final class L2PcInstance extends L2Playable return; } - final L2Npc target = getLastFolkNPC(); + final L2Npc target = _lastFolkNpc; if ((target != null) && isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false)) { quest.notifyEvent(event, target, this); } - else if (getLastQuestNpcObject() > 0) + else if (_questNpcObject > 0) { final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); @@ -1634,7 +1634,7 @@ public final class L2PcInstance extends L2Playable @Override public void updatePvPFlag(int value) { - if (getPvpFlag() == value) + if (_pvpFlag == value) { return; } @@ -1652,7 +1652,7 @@ public final class L2PcInstance extends L2Playable if (hasSummon()) { final RelationChanged rc = new RelationChanged(); - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, getRelation(this), false); @@ -1679,7 +1679,7 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, relation, isAutoAttackable(player)); @@ -2086,7 +2086,7 @@ public final class L2PcInstance extends L2Playable weaponPenalty = weaponPenalty - expertiseLevel - bonus; weaponPenalty = Math.min(Math.max(weaponPenalty, 0), 4); - if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) + if ((_expertiseWeaponPenalty != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) { _expertiseWeaponPenalty = weaponPenalty; if (_expertiseWeaponPenalty > 0) @@ -2104,7 +2104,7 @@ public final class L2PcInstance extends L2Playable armorPenalty = armorPenalty - expertiseLevel - bonus; armorPenalty = Math.min(Math.max(armorPenalty, 0), 4); - if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) + if ((_expertiseArmorPenalty != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) { _expertiseArmorPenalty = armorPenalty; if (_expertiseArmorPenalty > 0) @@ -2147,20 +2147,20 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - final int slot = getInventory().getSlotFromItem(item); + final int slot = _inventory.getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { - items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + items = _inventory.unEquipItemInSlotAndRecord(item.getLocationSlot()); } else { - items = getInventory().unEquipItemInBodySlotAndRecord(slot); + items = _inventory.unEquipItemInBodySlotAndRecord(slot); } } else { - items = getInventory().equipItemAndRecord(item); + items = _inventory.equipItemAndRecord(item); if (item.isEquipped()) { @@ -2272,7 +2272,7 @@ public final class L2PcInstance extends L2Playable */ public void increaseRaidbossPoints(int increasePoints) { - setRaidbossPoints(getRaidbossPoints() + increasePoints); + setRaidbossPoints(_raidbossPoints + increasePoints); } /** @@ -2298,17 +2298,17 @@ public final class L2PcInstance extends L2Playable { if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.THIRD)) { - if (getLvlJoinedAcademy() <= 16) + if (_lvlJoinedAcademy <= 16) { _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); } - else if (getLvlJoinedAcademy() >= 39) + else if (_lvlJoinedAcademy >= 39) { _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -2320,7 +2320,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES); // receive graduation gift - getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet + _inventory.addItem("Gift", 8181, 1, this, null); // give academy circlet } if (isSubClassActive()) { @@ -2341,12 +2341,12 @@ public final class L2PcInstance extends L2Playable // Update class icon in party and clan if (isInParty()) { - getParty().broadcastPacket(new PartySmallWindowUpdate(this, true)); + _party.broadcastPacket(new PartySmallWindowUpdate(this, true)); } - if (getClan() != null) + if (_clan != null) { - getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); + _clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); } sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED)); @@ -2495,33 +2495,32 @@ public final class L2PcInstance extends L2Playable } // Add Hero skills if hero - if (isHero()) + if (_hero) { setHero(true); } // Add clan skills - if (getClan() != null) + if (_clan != null) { - final L2Clan clan = getClan(); - clan.addSkillEffects(this); + _clan.addSkillEffects(this); - if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) + if ((_clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) { SiegeManager.getInstance().addSiegeSkills(this); } - if (getClan().getCastleId() > 0) + if (_clan.getCastleId() > 0) { CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this); } - if (getClan().getFortId() > 0) + if (_clan.getFortId() > 0) { FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this); } } // Reload passive skills from armors / jewels / weapons - getInventory().reloadEquippedItems(); + _inventory.reloadEquippedItems(); } /** @@ -2668,13 +2667,12 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info - if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) + if ((_clan != null) && (_clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -2812,7 +2810,7 @@ public final class L2PcInstance extends L2Playable */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().isSitForced()) + if (L2Event.isParticipant(this) && eventStatus.isSitForced()) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -2966,7 +2964,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAdena()) + if (count > _inventory.getAdena()) { if (sendMessage) { @@ -3016,7 +3014,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceBeautyTickets(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getBeautyTickets()) + if (count > _inventory.getBeautyTickets()) { if (sendMessage) { @@ -3110,7 +3108,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAncientAdena()) + if (count > _inventory.getAncientAdena()) { if (sendMessage) { @@ -3516,7 +3514,7 @@ public final class L2PcInstance extends L2Playable { return null; } - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3600,7 +3598,7 @@ public final class L2PcInstance extends L2Playable */ public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) { - final PcInventory inv = getInventory(); + final PcInventory inv = _inventory; if (!inv.validateCapacityByItemId(rewardId, count)) { if (sendMessage) @@ -3802,7 +3800,7 @@ public final class L2PcInstance extends L2Playable return null; } - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -3823,8 +3821,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return null; } @@ -4028,10 +4025,8 @@ public final class L2PcInstance extends L2Playable final boolean needHpUpdate = needHpUpdate(); final boolean needMpUpdate = needMpUpdate(); - final L2Party party = getParty(); - // Check if a party is in progress and party window update is usefull - if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) + if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) { final PartySmallWindowUpdate partyWindow = new PartySmallWindowUpdate(this, false); if (needCpUpdate) @@ -4049,10 +4044,10 @@ public final class L2PcInstance extends L2Playable partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP); partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP); } - party.broadcastToPartyMembers(this, partyWindow); + _party.broadcastToPartyMembers(this, partyWindow); } - if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) + if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) { final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); if ((game != null) && game.isBattleStarted()) @@ -4062,7 +4057,7 @@ public final class L2PcInstance extends L2Playable } // In duel MP updated only with CP or HP - if (isInDuel() && (needCpUpdate || needHpUpdate)) + if (_isInDuel && (needCpUpdate || needHpUpdate)) { DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this)); } @@ -4149,10 +4144,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4190,10 +4184,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4222,15 +4215,15 @@ public final class L2PcInstance extends L2Playable public int getAllyCrestId() { - if (getClanId() == 0) + if (_clanId == 0) { return 0; } - if (getClan().getAllyId() == 0) + if (_clan.getAllyId() == 0) { return 0; } - return getClan().getAllyCrestId(); + return _clan.getAllyCrestId(); } /** @@ -4269,22 +4262,21 @@ public final class L2PcInstance extends L2Playable { if (target instanceof L2PcInstance) { - final L2PcInstance temp = (L2PcInstance) target; + final L2PcInstance targetPlayer = (L2PcInstance) target; sendPacket(ActionFailed.STATIC_PACKET); - if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) + if ((targetPlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (targetPlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) { - sendPacket(new PrivateStoreListSell(this, temp)); + sendPacket(new PrivateStoreListSell(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.BUY) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.BUY) { - sendPacket(new PrivateStoreListBuy(this, temp)); + sendPacket(new PrivateStoreListBuy(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) { - sendPacket(new RecipeShopSellList(this, temp)); + sendPacket(new RecipeShopSellList(this, targetPlayer)); } - } else if (target != null) // _interactTarget=null should never happen but one never knows ^^; { @@ -4309,7 +4301,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) { - getParty().distributeItem(this, itemId, itemCount, false, target); + _party.distributeItem(this, itemId, itemCount, false, target); } else if (itemId == Inventory.ADENA_ID) { @@ -4389,7 +4381,7 @@ public final class L2PcInstance extends L2Playable return; } - if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) + if (((isInParty() && (_party.getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -4498,9 +4490,9 @@ public final class L2PcInstance extends L2Playable // Check if a Party is in progress if (isInParty()) { - getParty().distributeItem(this, target); + _party.distributeItem(this, target); } - else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) + else if ((target.getId() == Inventory.ADENA_ID) && (_inventory.getAdenaInstance() != null)) { addAdena("Pickup", target.getCount(), null, true); ItemTable.getInstance().destroyItem("Pickup", target, this, null); @@ -4509,7 +4501,7 @@ public final class L2PcInstance extends L2Playable { addItem("Pickup", target, null, true); // Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts. - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { final L2EtcItem etcItem = target.getEtcItem(); @@ -4558,13 +4550,13 @@ public final class L2PcInstance extends L2Playable } } - return !isSellingBuffs() && !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); + return !_isSellingBuffs && !isAlikeDead() && !_inOlympiadMode && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); } @Override public int getMinShopDistance() { - return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return _waitTypeSitting ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4572,13 +4564,13 @@ public final class L2PcInstance extends L2Playable // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death) if (canOpenPrivateStore()) { - if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) + if ((_privateStoreType == PrivateStoreType.BUY) || (_privateStoreType == PrivateStoreType.BUY_MANAGE)) { setPrivateStoreType(PrivateStoreType.NONE); } - if (getPrivateStoreType() == PrivateStoreType.NONE) + if (_privateStoreType == PrivateStoreType.NONE) { - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -4620,7 +4612,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -4705,7 +4697,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getActiveWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); } /** @@ -4717,7 +4709,7 @@ public final class L2PcInstance extends L2Playable final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { - return getFistsWeaponItem(); + return _fistsWeaponItem; } return (L2Weapon) weapon.getItem(); @@ -4725,12 +4717,12 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance getChestArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); } public L2ItemInstance getLegsArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LEGS); } public L2Armor getActiveChestArmorItem() @@ -4771,7 +4763,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) { return true; } @@ -4793,7 +4785,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) { return true; } @@ -4815,7 +4807,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) { return true; } @@ -4829,7 +4821,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getSecondaryWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); } /** @@ -4839,7 +4831,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -4879,12 +4871,12 @@ public final class L2PcInstance extends L2Playable !(Config.DISABLE_REWARDS_IN_PVP_ZONES && isInsideZone(ZoneId.PVP))) { // pvp - if (Config.REWARD_PVP_ITEM && (getPvpFlag() != 0)) + if (Config.REWARD_PVP_ITEM && (_pvpFlag != 0)) { pk.addItem("PvP Item Reward", Config.REWARD_PVP_ITEM_ID, Config.REWARD_PVP_ITEM_AMOUNT, this, Config.REWARD_PVP_ITEM_MESSAGE); } // pk - if (Config.REWARD_PK_ITEM && (getPvpFlag() == 0)) + if (Config.REWARD_PK_ITEM && (_pvpFlag == 0)) { pk.addItem("PK Item Reward", Config.REWARD_PK_ITEM_ID, Config.REWARD_PK_ITEM_AMOUNT, this, Config.REWARD_PK_ITEM_MESSAGE); } @@ -4895,7 +4887,7 @@ public final class L2PcInstance extends L2Playable if (Config.ANNOUNCE_PK_PVP && (((pk != null) && !pk.isGM()) || fpcKill)) { String msg = ""; - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4909,7 +4901,7 @@ public final class L2PcInstance extends L2Playable Broadcast.toAllOnlinePlayers(msg, false); } } - else if (getPvpFlag() != 0) + else if (_pvpFlag != 0) { msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4925,7 +4917,7 @@ public final class L2PcInstance extends L2Playable } } - if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (getPvpFlag() == 0) && (getReputation() >= 0)) + if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (_pvpFlag == 0) && (getReputation() >= 0)) { killer.setReputation(killer.getReputation() - 150); } @@ -4946,7 +4938,7 @@ public final class L2PcInstance extends L2Playable { CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer); } - else if (isCombatFlagEquipped()) + else if (_combatFlagEquippedId) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -4955,9 +4947,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } else @@ -4970,7 +4962,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && (pk != null)) { final L2Clan pkClan = pk.getClan(); - if ((pkClan != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pkClan != null) && (_clan != null) && !isAcademyMember() && !(pk.isAcademyMember())) { final ClanWar clanWar = _clan.getWarWith(pkClan.getId()); if ((clanWar != null) && AntiFeedManager.getInstance().check(killer, this)) @@ -5012,7 +5004,7 @@ public final class L2PcInstance extends L2Playable getSkillChannelized().abortChannelization(); } - if (getAgathionId() != 0) + if (_agathionId != 0) { setAgathionId(0); } @@ -5040,8 +5032,8 @@ public final class L2PcInstance extends L2Playable } final L2PcInstance pk = killer.getActingPlayer(); - if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) - // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) + if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) + // || _clan.isAtWarWith(((L2PcInstance)killer).getClanId()) )) { return; @@ -5057,7 +5049,7 @@ public final class L2PcInstance extends L2Playable int dropPercent = 0; // Classic calculation. - if (killer.isPlayable() && (getReputation() < 0) && (getPkKills() >= Config.KARMA_PK_LIMIT)) + if (killer.isPlayable() && (getReputation() < 0) && (_pkKills >= Config.KARMA_PK_LIMIT)) { isKarmaDrop = true; dropPercent = Config.KARMA_RATE_DROP; @@ -5079,16 +5071,15 @@ public final class L2PcInstance extends L2Playable { int dropCount = 0; int itemDropPercent = 0; - final L2Summon pet = getPet(); - for (L2ItemInstance itemDrop : getInventory().getItems()) + for (L2ItemInstance itemDrop : _inventory.getItems()) { // Don't drop if (itemDrop.isShadowItem() || // Dont drop Shadow Items itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items !itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena (itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items - ((pet != null) && (pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet + ((_pet != null) && (_pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list )) @@ -5100,7 +5091,7 @@ public final class L2PcInstance extends L2Playable { // Set proper chance according to Item type of equipped Item itemDropPercent = itemDrop.getItem().getType2() == L2Item.TYPE2_WEAPON ? dropEquipWeapon : dropEquip; - getInventory().unEquipItemInSlot(itemDrop.getLocationSlot()); + _inventory.unEquipItemInSlot(itemDrop.getLocationSlot()); } else { @@ -5133,80 +5124,78 @@ public final class L2PcInstance extends L2Playable public void onPlayerKill(L2Playable killedPlayable) { - final L2PcInstance player = getActingPlayer(); final L2PcInstance killedPlayer = killedPlayable.getActingPlayer(); // Avoid nulls && check if player != killedPlayer - if ((player == null) || (killedPlayer == null) || (player == killedPlayer)) + if ((killedPlayer == null) || (this == killedPlayer)) { return; } // Cursed weapons progress - if (player.isCursedWeaponEquipped() && killedPlayer.isPlayer()) + if (isCursedWeaponEquipped() && killedPlayer.isPlayer()) { CursedWeaponsManager.getInstance().increaseKills(getCursedWeaponEquippedId()); return; } // Duel support - if (player.isInDuel() && killedPlayer.getActingPlayer().isInDuel()) + if (isInDuel() && killedPlayer.isInDuel()) { return; } // Do nothing if both players are in PVP zone - if (player.isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) + if (isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) { return; } // If both players are in SIEGE zone just increase siege kills/deaths - if (player.isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) + if (isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) { - if ((player.getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (player.getSiegeState() != killedPlayer.getSiegeState())) + if ((getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (getSiegeState() != killedPlayer.getSiegeState())) { - final L2Clan killerClan = player.getClan(); final L2Clan targetClan = killedPlayer.getClan(); - if ((killerClan != null) && (targetClan != null)) + if ((_clan != null) && (targetClan != null)) { - killerClan.addSiegeKill(); + _clan.addSiegeKill(); targetClan.addSiegeDeath(); } } return; } - if (player.checkIfPvP(killedPlayer)) + if (checkIfPvP(killedPlayer)) { // Check if player should get + rep if (killedPlayer.getReputation() < 0) { - final int levelDiff = killedPlayer.getLevel() - player.getLevel(); - if ((player.getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours + final int levelDiff = killedPlayer.getLevel() - getLevel(); + if ((getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours { - player.setReputation(player.getReputation() + Config.REPUTATION_INCREASE); + setReputation(getReputation() + Config.REPUTATION_INCREASE); } } - player.setPvpKills(player.getPvpKills() + 1); + setPvpKills(_pvpKills + 1); } - else if ((getReputation() > 0) && (getPkKills() == 0)) + else if ((getReputation() > 0) && (_pkKills == 0)) { - player.setReputation(0); - player.setPkKills(player.getPkKills() + 1); + setReputation(0); + setPkKills(getPkKills() + 1); } else { // Calculate new karma and increase pk count - player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killedPlayable.isSummon())); - player.setPkKills(player.getPkKills() + 1); + setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); + setPkKills(getPkKills() + 1); } final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); - player.sendPacket(ui); - player.checkItemRestriction(); + sendPacket(ui); + checkItemRestriction(); } public void updatePvPStatus() @@ -5217,7 +5206,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5241,7 +5230,7 @@ public final class L2PcInstance extends L2Playable return; } - if (isInDuel() && (player_target.getDuelId() == getDuelId())) + if (_isInDuel && (player_target.getDuelId() == getDuelId())) { return; } @@ -5255,7 +5244,7 @@ public final class L2PcInstance extends L2Playable { setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5276,10 +5265,10 @@ public final class L2PcInstance extends L2Playable */ public void restoreExp(double restorePercent) { - if (getExpBeforeDeath() > 0) + if (_expBeforeDeath > 0) { // Restore the specified % of lost experience. - getStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100)); + getStat().addExp(Math.round(((_expBeforeDeath - getExp()) * restorePercent) / 100)); setExpBeforeDeath(0); } } @@ -5397,10 +5386,9 @@ public final class L2PcInstance extends L2Playable final List summons = new ArrayList<>(); summons.addAll(getServitors().values()); - final L2PetInstance pet = getPet(); - if (pet != null) + if (_pet != null) { - summons.add(pet); + summons.add(_pet); } return summons; @@ -5797,11 +5785,11 @@ public final class L2PcInstance extends L2Playable */ public boolean isClanLeader() { - if (getClan() == null) + if (_clan == null) { return false; } - return getObjectId() == getClan().getLeaderId(); + return getObjectId() == _clan.getLeaderId(); } /** @@ -5811,22 +5799,22 @@ public final class L2PcInstance extends L2Playable @Override protected boolean checkAndEquipAmmunition(EtcItemType type) { - L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + L2ItemInstance arrows = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (arrows == null) { final L2Weapon weapon = getActiveWeaponItem(); if (type == EtcItemType.ARROW) { - arrows = getInventory().findArrowForBow(weapon); + arrows = _inventory.findArrowForBow(weapon); } else if (type == EtcItemType.BOLT) { - arrows = getInventory().findBoltForCrossBow(weapon); + arrows = _inventory.findBoltForCrossBow(weapon); } if (arrows != null) { // Equip arrows needed in left hand - getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); + _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); sendItemList(false); return true; } @@ -5845,7 +5833,7 @@ public final class L2PcInstance extends L2Playable public boolean disarmWeapons() { // If there is no weapon to disarm then return true. - final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance wpn = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (wpn == null) { return true; @@ -5858,7 +5846,7 @@ public final class L2PcInstance extends L2Playable } // Don't allow disarming a Combat Flag or Territory Ward. - if (isCombatFlagEquipped()) + if (_combatFlagEquippedId) { return false; } @@ -5869,7 +5857,7 @@ public final class L2PcInstance extends L2Playable return false; } - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -5906,10 +5894,10 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -6017,7 +6005,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE); return false; } - else if (isSitting()) + else if (_waitTypeSitting) { // A strider can be ridden only when standing sendPacket(ActionFailed.STATIC_PACKET); @@ -6037,7 +6025,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); return false; } - else if (getInventory().getItemByItemId(9819) != null) + else if (_inventory.getItemByItemId(9819) != null) { sendPacket(ActionFailed.STATIC_PACKET); // FIXME: Wrong Message @@ -6067,7 +6055,7 @@ public final class L2PcInstance extends L2Playable } else if (isMounted()) { - if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) + if ((_mountType == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION); @@ -6216,12 +6204,12 @@ public final class L2PcInstance extends L2Playable public boolean isInCommandChannel() { - return isInParty() && getParty().isInCommandChannel(); + return isInParty() && _party.isInCommandChannel(); } public L2CommandChannel getCommandChannel() { - return (isInCommandChannel()) ? getParty().getCommandChannel() : null; + return (isInCommandChannel()) ? _party.getCommandChannel() : null; } /** @@ -6230,7 +6218,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isGM() { - return getAccessLevel().isGm(); + return _accessLevel.isGm(); } /** @@ -6261,8 +6249,8 @@ public final class L2PcInstance extends L2Playable _accessLevel = accessLevel; - getAppearance().setNameColor(_accessLevel.getNameColor()); - getAppearance().setTitleColor(_accessLevel.getTitleColor()); + _appearance.setNameColor(_accessLevel.getNameColor()); + _appearance.setTitleColor(_accessLevel.getTitleColor()); if (broadcast) { broadcastUserInfo(); @@ -6350,10 +6338,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -6423,32 +6410,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(8, getCurrentCp()); statement.setInt(9, getMaxMp()); statement.setDouble(10, getCurrentMp()); - statement.setInt(11, getAppearance().getFace()); - statement.setInt(12, getAppearance().getHairStyle()); - statement.setInt(13, getAppearance().getHairColor()); - statement.setInt(14, getAppearance().getSex() ? 1 : 0); + statement.setInt(11, _appearance.getFace()); + statement.setInt(12, _appearance.getHairStyle()); + statement.setInt(13, _appearance.getHairColor()); + statement.setInt(14, _appearance.getSex() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); - statement.setInt(18, getFame()); - statement.setInt(19, getRaidbossPoints()); - statement.setInt(20, getPvpKills()); - statement.setInt(21, getPkKills()); - statement.setInt(22, getClanId()); + statement.setInt(18, _fame); + statement.setInt(19, _raidbossPoints); + statement.setInt(20, _pvpKills); + statement.setInt(21, _pkKills); + statement.setInt(22, _clanId); statement.setInt(23, getRace().ordinal()); statement.setInt(24, getClassId().getId()); - statement.setLong(25, getDeleteTimer()); + statement.setLong(25, _deleteTimer); statement.setInt(26, hasDwarvenCraft() ? 1 : 0); statement.setString(27, getTitle()); - statement.setInt(28, getAppearance().getTitleColor()); + statement.setInt(28, _appearance.getTitleColor()); statement.setInt(29, isOnlineInt()); - statement.setInt(30, getClanPrivileges().getBitmask()); - statement.setInt(31, getWantsPeace()); - statement.setInt(32, getBaseClass()); + statement.setInt(30, _clanPrivileges.getBitmask()); + statement.setInt(31, _wantsPeace); + statement.setInt(32, _baseClass); statement.setInt(33, isNoble() ? 1 : 0); statement.setLong(34, 0); statement.setInt(35, PcStat.MIN_VITALITY_POINTS); - statement.setDate(36, new Date(getCreateDate().getTimeInMillis())); + statement.setDate(36, new Date(_createDate.getTimeInMillis())); statement.executeUpdate(); } catch (Exception e) @@ -7082,32 +7069,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(5, getCurrentCp()); statement.setInt(6, getMaxMp()); statement.setDouble(7, getCurrentMp()); - statement.setInt(8, getAppearance().getFace()); - statement.setInt(9, getAppearance().getHairStyle()); - statement.setInt(10, getAppearance().getHairColor()); - statement.setInt(11, getAppearance().getSex() ? 1 : 0); + statement.setInt(8, _appearance.getFace()); + statement.setInt(9, _appearance.getHairStyle()); + statement.setInt(10, _appearance.getHairColor()); + statement.setInt(11, _appearance.getSex() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); statement.setInt(15, _lastLoc != null ? _lastLoc.getZ() : getZ()); statement.setLong(16, exp); - statement.setLong(17, getExpBeforeDeath()); + statement.setLong(17, _expBeforeDeath); statement.setLong(18, sp); statement.setInt(19, getReputation()); - statement.setInt(20, getFame()); - statement.setInt(21, getRaidbossPoints()); - statement.setInt(22, getPvpKills()); - statement.setInt(23, getPkKills()); - statement.setInt(24, getClanId()); + statement.setInt(20, _fame); + statement.setInt(21, _raidbossPoints); + statement.setInt(22, _pvpKills); + statement.setInt(23, _pkKills); + statement.setInt(24, _clanId); statement.setInt(25, getRace().ordinal()); statement.setInt(26, getClassId().getId()); - statement.setLong(27, getDeleteTimer()); + statement.setLong(27, _deleteTimer); statement.setString(28, getTitle()); - statement.setInt(29, getAppearance().getTitleColor()); + statement.setInt(29, _appearance.getTitleColor()); statement.setInt(30, isOnlineInt()); - statement.setInt(31, getClanPrivileges().getBitmask()); - statement.setInt(32, getWantsPeace()); - statement.setInt(33, getBaseClass()); + statement.setInt(31, _clanPrivileges.getBitmask()); + statement.setInt(32, _wantsPeace); + statement.setInt(33, _baseClass); long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) @@ -7117,29 +7104,29 @@ public final class L2PcInstance extends L2Playable statement.setLong(34, totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); - statement.setInt(36, getPowerGrade()); - statement.setInt(37, getPledgeType()); - statement.setInt(38, getLvlJoinedAcademy()); - statement.setLong(39, getApprentice()); - statement.setLong(40, getSponsor()); - statement.setLong(41, getClanJoinExpiryTime()); - statement.setLong(42, getClanCreateExpiryTime()); + statement.setInt(36, _powerGrade); + statement.setInt(37, _pledgeType); + statement.setInt(38, _lvlJoinedAcademy); + statement.setLong(39, _apprentice); + statement.setLong(40, _sponsor); + statement.setLong(41, _clanJoinExpiryTime); + statement.setLong(42, _clanCreateExpiryTime); statement.setString(43, getName()); - statement.setInt(44, getBookMarkSlot()); + statement.setInt(44, _bookmarkslot); statement.setInt(45, getStat().getBaseVitalityPoints()); - statement.setString(46, getLang()); + statement.setString(46, _lang); int factionId = 0; - if (isGood()) + if (_isGood) { factionId = 1; } - if (isEvil()) + if (_isEvil) { factionId = 2; } statement.setInt(47, factionId); - statement.setInt(48, getPcCafePoints()); + statement.setInt(48, _pcCafePoints); statement.setInt(49, getObjectId()); statement.execute(); @@ -7194,7 +7181,7 @@ public final class L2PcInstance extends L2Playable { // Delete all current stored effects for char to avoid dupe delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.execute(); int buff_index = 0; @@ -7260,7 +7247,7 @@ public final class L2PcInstance extends L2Playable statement.setDouble(7, (t != null) && t.hasNotPassed() ? t.getStamp() : 0); statement.setInt(8, 0); // Store type 0, active buffs/debuffs. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7292,7 +7279,7 @@ public final class L2PcInstance extends L2Playable statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); statement.setInt(8, 1); // Restore type 1, skill reuse. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7431,7 +7418,7 @@ public final class L2PcInstance extends L2Playable // Remove or update a L2PcInstance skill from the character_skills table of the database statement.setInt(1, oldSkill.getId()); statement.setInt(2, getObjectId()); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7447,7 +7434,7 @@ public final class L2PcInstance extends L2Playable if (skill != null) { - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) { @@ -7550,7 +7537,7 @@ public final class L2PcInstance extends L2Playable { // Retrieve all skills of this L2PcInstance from the database statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7601,7 +7588,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_SKILL_SAVE)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7639,7 +7626,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement delete = con.prepareStatement(DELETE_SKILL_SAVE)) { delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.executeUpdate(); } } @@ -7677,7 +7664,7 @@ public final class L2PcInstance extends L2Playable isInInventory = true; // Using item Id - L2ItemInstance item = getInventory().getItemByItemId(itemId); + L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { item = getWarehouse().getItemByItemId(itemId); @@ -7729,7 +7716,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_HENNAS)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { int slot; @@ -7837,7 +7824,7 @@ public final class L2PcInstance extends L2Playable { statement.setInt(1, getObjectId()); statement.setInt(2, slot); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7866,7 +7853,7 @@ public final class L2PcInstance extends L2Playable } if (henna.getCancelCount() > 0) { - getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); + _inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(henna.getDyeItemId()); sm.addLong(henna.getCancelCount()); @@ -7919,7 +7906,7 @@ public final class L2PcInstance extends L2Playable statement.setInt(1, getObjectId()); statement.setInt(2, henna.getDyeId()); statement.setInt(3, i); - statement.setInt(4, getClassIndex()); + statement.setInt(4, _classIndex); statement.execute(); } catch (Exception e) @@ -8063,7 +8050,7 @@ public final class L2PcInstance extends L2Playable if (Config.UPDATE_ITEMS_ON_CHAR_STORE) { - getInventory().updateDatabase(); + _inventory.updateDatabase(); getWarehouse().updateDatabase(); } } @@ -8114,7 +8101,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker isn't the L2PcInstance Pet - if ((attacker == this) || (attacker == getPet()) || attacker.hasServitor(attacker.getObjectId())) + if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { return false; } @@ -8132,13 +8119,13 @@ public final class L2PcInstance extends L2Playable } // is AutoAttackable if both players are in the same duel and the duel is still going on - if (attacker.isPlayable() && (getDuelState() == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) + if (attacker.isPlayable() && (_duelState == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { return true; } // Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. - if (isInParty() && getParty().getMembers().contains(attacker)) + if (isInParty() && _party.getMembers().contains(attacker)) { return false; } @@ -8146,14 +8133,14 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) + if (_inOlympiadMode && _OlympiadStart && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) { return true; } return false; } - if (isOnCustomEvent() && (getTeam() == attacker.getTeam())) + if (_isOnCustomEvent && (getTeam() == attacker.getTeam())) { return false; } @@ -8175,7 +8162,7 @@ public final class L2PcInstance extends L2Playable // Get L2PcInstance final L2PcInstance attackerPlayer = attacker.getActingPlayer(); - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) @@ -8208,7 +8195,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker is not in the same clan - if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) + if ((_clan != null) && _clan.isMember(attacker.getObjectId())) { return false; } @@ -8233,10 +8220,10 @@ public final class L2PcInstance extends L2Playable if (attacker instanceof L2DefenderInstance) { - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return ((siege != null) && siege.checkIsAttacker(_clan)); } } @@ -8246,7 +8233,7 @@ public final class L2PcInstance extends L2Playable } // Check if the L2PcInstance has Karma - if ((getReputation() < 0) || (getPvpFlag() > 0)) + if ((getReputation() < 0) || (_pvpFlag > 0)) { return true; } @@ -8333,7 +8320,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (inObserverMode()) + if (_observerMode) { sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(ActionFailed.STATIC_PACKET); @@ -8381,7 +8368,7 @@ public final class L2PcInstance extends L2Playable } // Check if the caster is sitting - if (isSitting()) + if (_waitTypeSitting) { sendPacket(SystemMessageId.YOU_CANNOT_USE_ACTIONS_AND_SKILLS_WHILE_THE_CHARACTER_IS_SITTING); sendPacket(ActionFailed.STATIC_PACKET); @@ -8417,7 +8404,7 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill final L2Object target = skill.getTarget(this, forceUse, dontMove, true); - final Location worldPosition = getCurrentSkillWorldPosition(); + final Location worldPosition = _currentSkillWorldPosition; if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { @@ -8473,7 +8460,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (getQueuedSkill() != null) + if (_queuedSkill != null) { setQueuedSkill(null, null, false, false); } @@ -8488,14 +8475,14 @@ public final class L2PcInstance extends L2Playable final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel - if (isInParty() && getParty().isInCommandChannel() && (looter != null)) + if (isInParty() && _party.isInCommandChannel() && (looter != null)) { - return getParty().getCommandChannel().getMembers().contains(looter); + return _party.getCommandChannel().getMembers().contains(looter); } if (isInParty() && (looter != null)) { - return getParty().getMembers().contains(looter); + return _party.getMembers().contains(looter); } return false; @@ -8738,7 +8725,7 @@ public final class L2PcInstance extends L2Playable { for (int itemId : _activeSoulShots) { - final L2ItemInstance item = getInventory().getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { removeAutoSoulShot(itemId); @@ -8832,23 +8819,23 @@ public final class L2PcInstance extends L2Playable public void updateActiveBroochJewel() { // Update active Ruby jewel. - if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV1); } @@ -8857,23 +8844,23 @@ public final class L2PcInstance extends L2Playable setActiveRubyJewel(null); } // Update active Sapphire jewel. - if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1); } @@ -9000,10 +8987,9 @@ public final class L2PcInstance extends L2Playable public void enterOlympiadObserverMode(Location loc, int id) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.unSummon(this); + _pet.unSummon(this); } if (hasServitors()) @@ -9021,13 +9007,13 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoCubic(this)); } - if (getParty() != null) + if (_party != null) { - getParty().removePartyMember(this, MessageType.EXPELLED); + _party.removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -9349,12 +9335,12 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; return false; } - if (isInDuel()) + if (_isInDuel) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL; return false; } - if (isInOlympiadMode() || isOnEvent(CeremonyOfChaosEvent.class)) + if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class)) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS; return false; @@ -9369,7 +9355,7 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE; return false; } - if (getPrivateStoreType() != PrivateStoreType.NONE) + if (_privateStoreType != PrivateStoreType.NONE) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE; return false; @@ -9432,10 +9418,9 @@ public final class L2PcInstance extends L2Playable { super.setTeam(team); broadcastUserInfo(); - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.broadcastStatusUpdate(); + _pet.broadcastStatusUpdate(); } if (hasServitors()) { @@ -9472,9 +9457,9 @@ public final class L2PcInstance extends L2Playable for (Skill s : getSkillList()) { - if (getClan() != null) + if (_clan != null) { - isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0); + isDisabled = s.isClanSkill() && (_clan.getReputationScore() < 0); } sl.addSkill(s.getDisplayId(), s.getReuseDelayGroup(), s.getDisplayLevel(), s.getSubLevel(), s.isPassive(), isDisabled, s.isEnchantable()); @@ -9785,7 +9770,7 @@ public final class L2PcInstance extends L2Playable // Remove active item skills before saving char to database // because next time when choosing this class, weared items can // be different - for (L2ItemInstance item : getInventory().getPaperdollItems(L2ItemInstance::isAugmented)) + for (L2ItemInstance item : _inventory.getPaperdollItems(L2ItemInstance::isAugmented)) { if ((item != null) && item.isEquipped()) { @@ -9823,7 +9808,7 @@ public final class L2PcInstance extends L2Playable if (classIndex == 0) { - setClassTemplate(getBaseClass()); + setClassTemplate(_baseClass); } else { @@ -9841,7 +9826,7 @@ public final class L2PcInstance extends L2Playable if (isInParty()) { - getParty().recalculatePartyLevel(); + _party.recalculatePartyLevel(); } // Update the character's change in class status. @@ -9876,7 +9861,7 @@ public final class L2PcInstance extends L2Playable sendPacket(new EtcStatusUpdate(this)); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 4; i++) { _henna[i] = null; } @@ -9947,7 +9932,7 @@ public final class L2PcInstance extends L2Playable if (_taskRentPet != null) { // if the rent of a wyvern expires while over a flying zone, tp to down before unmounting - if (checkLandingState() && (getMountType() == MountType.WYVERN)) + if (checkLandingState() && (_mountType == MountType.WYVERN)) { teleToLocation(TeleportWhereType.TOWN); } @@ -10036,7 +10021,7 @@ public final class L2PcInstance extends L2Playable { sendMessage("Entering world in Invisible mode."); } - if (isSilenceMode()) + if (_silenceMode) { sendMessage("Entering world in Silence mode."); } @@ -10142,7 +10127,7 @@ public final class L2PcInstance extends L2Playable restoreExp(revivePower); } - public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int power) + public void reviveRequest(L2PcInstance reviver, Skill skill, boolean isPet, int power) { if (isResurrectionBlocked()) { @@ -10151,11 +10136,11 @@ public final class L2PcInstance extends L2Playable if (_reviveRequested == 1) { - if (_revivePet == Pet) + if (_revivePet == isPet) { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } - else if (Pet) + else if (isPet) { reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. } @@ -10165,12 +10150,11 @@ public final class L2PcInstance extends L2Playable } return; } - final L2Summon pet = getPet(); - if ((Pet && (pet != null) && pet.isDead()) || (!Pet && isDead())) + if ((isPet && (_pet != null) && _pet.isDead()) || (!isPet && isDead())) { _reviveRequested = 1; _revivePower = Formulas.calculateSkillResurrectRestorePercent(power, reviver); - _revivePet = Pet; + _revivePet = isPet; if (hasCharmOfCourage()) { @@ -10180,7 +10164,7 @@ public final class L2PcInstance extends L2Playable return; } - final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); + final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100); final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); @@ -10191,8 +10175,7 @@ public final class L2PcInstance extends L2Playable public void reviveAnswer(int answer) { - final L2Summon pet = getPet(); - if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (pet != null) && !pet.isDead())) + if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (_pet != null) && !_pet.isDead())) { return; } @@ -10210,15 +10193,15 @@ public final class L2PcInstance extends L2Playable doRevive(); } } - else if (pet != null) + else if (_pet != null) { if (_revivePower != 0) { - pet.doRevive(_revivePower); + _pet.doRevive(_revivePower); } else { - pet.doRevive(); + _pet.doRevive(); } } } @@ -10287,7 +10270,7 @@ public final class L2PcInstance extends L2Playable @Override public void teleToLocation(ILocational loc, boolean allowRandomOffset) { - if ((getVehicle() != null) && !getVehicle().isTeleporting()) + if ((_vehicle != null) && !_vehicle.isTeleporting()) { setVehicle(null); } @@ -10318,31 +10301,30 @@ public final class L2PcInstance extends L2Playable checkItemRestriction(); - if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !isInOlympiadMode()) + if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !_inOlympiadMode) { setTeleportProtection(true); } // Trained beast is lost after teleport - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.deleteMe(); } - getTrainedBeasts().clear(); + _tamedBeast.clear(); } // Modify the position of the pet if necessary - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.setFollowStatus(false); - pet.teleToLocation(getLocation(), false); - ((L2SummonAI) pet.getAI()).setStartFollowController(true); - pet.setFollowStatus(true); - pet.setInstance(getInstanceWorld()); - pet.updateAndBroadcastStatus(0); + _pet.setFollowStatus(false); + _pet.teleToLocation(getLocation(), false); + ((L2SummonAI) _pet.getAI()).setStartFollowController(true); + _pet.setFollowStatus(true); + _pet.setInstance(getInstanceWorld()); + _pet.updateAndBroadcastStatus(0); } getServitors().values().forEach(s -> @@ -10432,9 +10414,9 @@ public final class L2PcInstance extends L2Playable super.reduceCurrentHp(value, attacker, skill, isDOT, directlyToHp, critical, reflect); // notify the tamed beast of attacks - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.onOwnerGotAttacked(attacker); } @@ -10567,7 +10549,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -10576,8 +10558,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return false; } @@ -10719,7 +10700,7 @@ public final class L2PcInstance extends L2Playable // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) try { - if (!isOnline()) + if (!_isOnline) { LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } @@ -10732,7 +10713,7 @@ public final class L2PcInstance extends L2Playable try { - if (Config.ENABLE_BLOCK_CHECKER_EVENT && (getBlockCheckerArena() != -1)) + if (Config.ENABLE_BLOCK_CHECKER_EVENT && (_handysBlockCheckerEventArena != -1)) { HandysBlockCheckerManager.getInstance().onDisconnect(this); } @@ -10757,7 +10738,7 @@ public final class L2PcInstance extends L2Playable // remove combat flag try { - if (getInventory().getItemByItemId(9819) != null) + if (_inventory.getItemByItemId(9819) != null) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -10766,9 +10747,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } } @@ -10894,13 +10875,13 @@ public final class L2PcInstance extends L2Playable { try { - L2Summon pet = getPet(); + L2Summon pet = _pet; if (pet != null) { pet.setRestoreSummon(true); pet.unSummon(this); // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) - pet = getPet(); + pet = _pet; if (pet != null) { pet.broadcastNpcInfo(0); @@ -10919,12 +10900,12 @@ public final class L2PcInstance extends L2Playable } // returns pet to control item } - if (getClan() != null) + if (_clan != null) { // set the status for pledge member list to OFFLINE try { - final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = _clan.getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -10961,14 +10942,14 @@ public final class L2PcInstance extends L2Playable { // Check if the L2PcInstance is in observer mode to set its position to its position // before entering in observer mode - if (inObserverMode()) + if (_observerMode) { setLocationInvisible(_lastLoc); } - if (getVehicle() != null) + if (_vehicle != null) { - getVehicle().oustPlayer(this); + _vehicle.oustPlayer(this); } } catch (Exception e) @@ -11002,7 +10983,7 @@ public final class L2PcInstance extends L2Playable // Update database with items in its inventory and remove them from the world try { - getInventory().deleteMe(); + _inventory.deleteMe(); } catch (Exception e) { @@ -11025,7 +11006,7 @@ public final class L2PcInstance extends L2Playable try { - getFreight().deleteMe(); + _freight.deleteMe(); } catch (Exception e) { @@ -11053,10 +11034,10 @@ public final class L2PcInstance extends L2Playable } } - if (getClanId() > 0) + if (_clanId > 0) { - getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); - getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan())); + _clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); + _clan.broadcastToOnlineMembers(new ExPledgeCount(_clan)); // ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); } @@ -11090,7 +11071,7 @@ public final class L2PcInstance extends L2Playable try { notifyFriends(L2FriendStatus.MODE_OFFLINE); - getBlockList().playerLogout(); + _blockList.playerLogout(); } catch (Exception e) { @@ -11346,12 +11327,12 @@ public final class L2PcInstance extends L2Playable { _souls -= count; - if (getChargedSouls() < 0) + if (_souls < 0) { _souls = 0; } - if (getChargedSouls() == 0) + if (_souls == 0) { stopSoulTask(); } @@ -11514,10 +11495,10 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = _inventory.getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { - getInventory().unEquipItemInSlot(i); + _inventory.unEquipItemInSlot(i); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); @@ -11667,10 +11648,9 @@ public final class L2PcInstance extends L2Playable } if (hasPet()) { - final L2Summon pet = getPet(); - setCurrentFeed(((L2PetInstance) pet).getCurrentFed()); - _controlItemId = pet.getControlObjectId(); - sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); + setCurrentFeed(_pet.getCurrentFed()); + _controlItemId = _pet.getControlObjectId(); + sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); if (!isDead()) { _mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000); @@ -11679,7 +11659,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -11739,7 +11719,7 @@ public final class L2PcInstance extends L2Playable { final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -11755,7 +11735,7 @@ public final class L2PcInstance extends L2Playable public boolean isHungry() { - return hasPet() && _canFeed && (getCurrentFeed() < ((getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())); + return hasPet() && _canFeed && (_curFeed < ((getPetData(_mountNpcId).getHungryLimit() / 100f) * getPetLevelData(_mountNpcId).getPetMaxFeed())); } public void enteredNoLanding(int delay) @@ -11781,7 +11761,7 @@ public final class L2PcInstance extends L2Playable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(req)) { - statement.setInt(1, getCurrentFeed()); + statement.setInt(1, _curFeed); statement.setInt(2, _controlItemId); statement.executeUpdate(); _controlItemId = 0; @@ -11950,7 +11930,7 @@ public final class L2PcInstance extends L2Playable { return; } - if (getInventory().getInventoryItemCount(13016, 0) == 0) + if (_inventory.getInventoryItemCount(13016, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; @@ -11962,7 +11942,7 @@ public final class L2PcInstance extends L2Playable final TeleportBookmark bookmark = _tpbookmarks.get(id); if (bookmark != null) { - destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(13016).getObjectId(), 1, null, false); teleToLocation(bookmark, false); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -11975,12 +11955,12 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE); return false; } - else if (isInSiege() || (getSiegeState() != 0)) + else if (_isInSiege || (_siegeState != 0)) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_A_LARGE_SCALE_BATTLE_SUCH_AS_A_CASTLE_SIEGE_FORTRESS_SIEGE_OR_CLAN_HALL_SIEGE); return false; } - else if (isInDuel()) + else if (_isInDuel) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL); return false; @@ -11990,7 +11970,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING); return false; } - else if (isInOlympiadMode()) + else if (_inOlympiadMode) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH); return false; @@ -12049,7 +12029,7 @@ public final class L2PcInstance extends L2Playable return; } - if (getInventory().getInventoryItemCount(20033, 0) == 0) + if (_inventory.getInventoryItemCount(20033, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG); return; @@ -12065,7 +12045,7 @@ public final class L2PcInstance extends L2Playable } _tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name)); - destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); @@ -12119,7 +12099,7 @@ public final class L2PcInstance extends L2Playable setXYZ(getBoat().getLocation()); activeChar.sendPacket(new CharInfo(this, isInvisible() && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS))); - activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition())); + activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); } else if (isInAirShip()) { @@ -12137,10 +12117,9 @@ public final class L2PcInstance extends L2Playable rc1.addRelation(this, relation1, isAutoAttackable(activeChar)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc1.addRelation(pet, relation1, isAutoAttackable(activeChar)); + rc1.addRelation(_pet, relation1, isAutoAttackable(activeChar)); } if (hasServitors()) { @@ -12154,10 +12133,9 @@ public final class L2PcInstance extends L2Playable rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this)); if (activeChar.hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this)); + rc2.addRelation(_pet, relation2, activeChar.isAutoAttackable(this)); } if (hasServitors()) { @@ -12166,7 +12144,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(rc2); - switch (getPrivateStoreType()) + switch (_privateStoreType) { case SELL: { @@ -12193,7 +12171,7 @@ public final class L2PcInstance extends L2Playable public void playMovie(MovieHolder holder) { - if (getMovieHolder() != null) + if (_movieHolder != null) { return; } @@ -12209,7 +12187,7 @@ public final class L2PcInstance extends L2Playable public void stopMovie() { - sendPacket(new ExStopScenePlayer(getMovieHolder().getMovie())); + sendPacket(new ExStopScenePlayer(_movieHolder.getMovie())); setMovieHolder(null); } @@ -12287,7 +12265,7 @@ public final class L2PcInstance extends L2Playable public int getBirthdays() { - long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12456,24 +12434,24 @@ public final class L2PcInstance extends L2Playable @Override public double getCollisionRadius() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override public double getCollisionHeight() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -12615,7 +12593,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || (getMovieHolder() != null) || _fishing.isFishing(); + return super.isMovementDisabled() || (_movieHolder != null) || _fishing.isFishing(); } public String getHtmlPrefix() @@ -12725,7 +12703,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return ((_privateStoreType == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); } public void setMultiSocialAction(int id, int targetId) @@ -12825,7 +12803,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); } /** @@ -12835,7 +12813,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder80(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); } public boolean havePetInvItems() @@ -12921,8 +12899,8 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("REPLACE INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?)")) { ps.setInt(1, getObjectId()); - ps.setInt(2, getRecomHave()); - ps.setInt(3, getRecomLeft()); + ps.setInt(2, _recomHave); + ps.setInt(3, _recomLeft); ps.setLong(4, 0); ps.execute(); } @@ -13349,7 +13327,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHair() { - return getVariables().getInt("visualHairId", getAppearance().getHairStyle()); + return getVariables().getInt("visualHairId", _appearance.getHairStyle()); } /** @@ -13357,7 +13335,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHairColor() { - return getVariables().getInt("visualHairColorId", getAppearance().getHairColor()); + return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); } /** @@ -13365,7 +13343,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualFace() { - return getVariables().getInt("visualFaceId", getAppearance().getFace()); + return getVariables().getInt("visualFaceId", _appearance.getFace()); } /** @@ -13464,7 +13442,7 @@ public final class L2PcInstance extends L2Playable */ public CastleSide getPlayerSide() { - if ((getClan() == null) || (getClan().getCastleId() == 0)) + if ((_clan == null) || (_clan.getCastleId() == 0)) { return CastleSide.NEUTRAL; } @@ -13809,7 +13787,7 @@ public final class L2PcInstance extends L2Playable @Override public MoveType getMoveType() { - if (isSitting()) + if (_waitTypeSitting) { return MoveType.SITTING; } @@ -13828,10 +13806,9 @@ public final class L2PcInstance extends L2Playable private void updateOnlineTime() { - final L2Clan clan = getClan(); - if (clan != null) + if (_clan != null) { - clan.addMemberOnlineTime(this); + _clan.addMemberOnlineTime(this); } } @@ -13846,7 +13823,7 @@ public final class L2PcInstance extends L2Playable public GroupType getGroupType() { - return isInParty() ? (getParty().isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; + return isInParty() ? (_party.isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; } public boolean isTrueHero() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 10429b5b5b..f1112eee76 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -83,8 +83,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,skill_sub_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -140,9 +140,9 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - else if (getCurrentFed() > getFeedConsume()) + else if (_curFed > getFeedConsume()) { - setCurrentFed(getCurrentFed() - getFeedConsume()); + setCurrentFed(_curFed - getFeedConsume()); } else { @@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -333,9 +333,9 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - if (getInventory() != null) + if (_inventory != null) { - return getInventory().getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); + return _inventory.getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); } return null; } @@ -622,8 +622,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -639,7 +639,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -702,9 +702,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -756,11 +756,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - statement.setInt(1, getControlObjectId()); + statement.setInt(1, _controlObjectId); statement.execute(); } catch (Exception e) @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -817,7 +817,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -921,7 +921,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -933,7 +933,7 @@ public class L2PetInstance extends L2Summon } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -951,10 +951,10 @@ public class L2PetInstance extends L2Summon statement.setDouble(4, getStatus().getCurrentMp()); statement.setLong(5, getStat().getExp()); statement.setLong(6, getStat().getSp()); - statement.setInt(7, getCurrentFed()); + statement.setInt(7, _curFed); statement.setInt(8, getOwner().getObjectId()); statement.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - statement.setInt(10, getControlObjectId()); + statement.setInt(10, _controlObjectId); statement.executeUpdate(); _respawned = true; @@ -997,7 +997,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1045,7 +1045,7 @@ public class L2PetInstance extends L2Summon continue; } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, skill.getSubLevel()); @@ -1073,7 +1073,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rset = ps1.executeQuery()) { while (rset.next()) @@ -1094,7 +1094,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1147,9 +1147,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1340,13 +1340,13 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1357,7 +1357,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1367,7 +1367,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 42bd49e7f9..8ed3a9f1d3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -240,7 +240,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable final Map> servitorEffects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()); if (servitorEffects != null) { - final List effects = servitorEffects.get(getReferenceSkill()); + final List effects = servitorEffects.get(_referenceSkill); if ((effects != null) && !effects.isEmpty()) { for (SummonEffect effect : effects) @@ -294,7 +294,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.execute(); int buff_index = 0; @@ -348,7 +348,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -397,7 +397,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -437,7 +437,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -554,12 +554,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -573,7 +573,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); // Using same task to check if owner is in visible range if (calculateDistance(getOwner(), true, false) > 2000) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java index 285b9af507..aa681dd5f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java @@ -51,7 +51,7 @@ public class L2ShuttleInstance extends L2Vehicle public void closeDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { @@ -63,7 +63,7 @@ public class L2ShuttleInstance extends L2Vehicle public void openDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index e5e5d055c4..32f94719bb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index a7276d30f8..f1d5b120e9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -72,7 +72,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -136,7 +136,7 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - final L2Character activeChar = getActiveChar(); + final L2Character activeChar = _activeChar; if (activeChar.isDead()) { return; @@ -169,14 +169,14 @@ public class CharStatus } if (Formulas.calcRealTargetBreak()) { - getActiveChar().getEffectList().stopEffects(AbnormalType.REAL_TARGET); + _activeChar.getEffectList().stopEffects(AbnormalType.REAL_TARGET); } } if (value > 0) { - final double oldHp = getCurrentHp(); - final double newHp = Math.max(getCurrentHp() - value, activeChar.isUndying() ? 1 : 0); + final double oldHp = _currentHp; + final double newHp = Math.max(_currentHp - value, activeChar.isUndying() ? 1 : 0); setCurrentHp(newHp); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureHpChange(activeChar, oldHp, newHp), activeChar); } @@ -189,7 +189,7 @@ public class CharStatus public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -202,10 +202,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -269,12 +269,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getStat().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getStat().getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -324,7 +324,7 @@ public class CharStatus if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -337,7 +337,7 @@ public class CharStatus hpOrMpWasChanged |= setCurrentMp(newMp, false); if (hpOrMpWasChanged) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -360,12 +360,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getStat().getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -398,7 +398,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -407,10 +407,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE); - final double newMp = getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE); + final double newHp = _currentHp + _activeChar.getStat().getValue(Stats.REGENERATE_HP_RATE); + final double newMp = _currentMp + _activeChar.getStat().getValue(Stats.REGENERATE_MP_RATE); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 4d221ab370..813634b659 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -48,9 +48,9 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -78,7 +78,7 @@ public class PcStatus extends PlayableStatus } // If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken. - if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) + if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isCrafting() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) { return; } @@ -100,7 +100,7 @@ public class PcStatus extends PlayableStatus getActiveChar().stopEffectsOnDamage(); } // Attacked players in craft/shops stand up. - if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) + if (getActiveChar().isCrafting() || getActiveChar().isInStoreMode()) { getActiveChar().setPrivateStoreType(PrivateStoreType.NONE); getActiveChar().standUp(); @@ -238,14 +238,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -337,7 +337,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -388,9 +388,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); + setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 8287b081c4..f9e325c275 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -279,7 +279,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 1ce3ab05ca..6ee4d7e704 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -262,13 +262,13 @@ public final class Transform implements IIdentifiable if (creature.isPlayer()) { - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } if (addSkills) @@ -374,11 +374,11 @@ public final class Transform implements IIdentifiable final L2PcInstance player = creature.getActingPlayer(); final boolean hasTransformSkills = player.hasTransformSkills(); - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index ebee3cd82c..1adc7b039f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setInt(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setInt(6, _repeat); st.execute(); try (ResultSet rset = st.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setLong(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setLong(6, _repeat); st.setLong(7, getId()); st.execute(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/base/SubClass.java index 0e65764560..e318f331ee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -140,7 +140,7 @@ public final class SubClass public void incLevel() { - if (!_dualClass && (getLevel() == _maxLevel)) + if (!_dualClass && (_level == _maxLevel)) { return; } @@ -151,7 +151,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java index 03b1a51b6b..8360f7712c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -69,7 +69,7 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() @@ -124,7 +124,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(this::restock, getRestockDelay()); + _restockTask = ThreadPool.schedule(this::restock, _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -133,7 +133,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -151,7 +151,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -161,7 +161,7 @@ public final class Product PreparedStatement statement = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { statement.setInt(1, _buyListId); - statement.setInt(2, getItemId()); + statement.setInt(2, _item.getId()); statement.setLong(3, getCount()); statement.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index ce7a68dcc7..4e95946a36 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -538,9 +538,9 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - getHolder().broadCastPacketToTeam(changePoints); + _holder.broadCastPacketToTeam(changePoints); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java index 4fa38d85d4..9b249a9069 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -72,7 +72,7 @@ public final class Castle extends AbstractResidence private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -96,12 +96,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -158,7 +158,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -185,29 +185,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -223,11 +223,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -244,7 +244,7 @@ public final class Castle extends AbstractResidence initResidenceZone(); initFunctions(); spawnSideNpcs(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -287,7 +287,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -338,7 +338,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -380,7 +380,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -460,7 +460,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -481,7 +481,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, String doorName, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -516,7 +516,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -877,7 +877,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -897,12 +897,12 @@ public final class Castle extends AbstractResidence public final L2DoorInstance getDoor(int doorId) { - return getDoors().stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); } public final L2DoorInstance getDoor(String doorName) { - return getDoors().stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); } public final List getDoors() @@ -957,7 +957,7 @@ public final class Castle extends AbstractResidence public final int getTaxPercent(TaxType type) { final int taxPercent; - switch (getSide()) + switch (_castleSide) { case LIGHT: { @@ -1036,7 +1036,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -1156,7 +1156,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); + final Skill skill = _castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); player.addSkill(skill); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index d41afdb68a..6fc9b45046 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -58,7 +58,7 @@ public final class ClanHall extends AbstractResidence private final ClanHallGrade _grade; private final ClanHallType _type; private final int _minBid; - private final int _lease; + final int _lease; private final int _deposit; private final List _npcs; private final List _doors; @@ -66,8 +66,8 @@ public final class ClanHall extends AbstractResidence private final Location _ownerLocation; private final Location _banishLocation; // Dynamic parameters - private L2Clan _owner = null; - private long _paidUntil = 0; + L2Clan _owner = null; + long _paidUntil = 0; protected ScheduledFuture _checkPaymentTask = null; // Other private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; @@ -137,7 +137,7 @@ public final class ClanHall extends AbstractResidence PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) { statement.setInt(1, getOwnerId()); - statement.setLong(2, getPaidUntil()); + statement.setLong(2, _paidUntil); statement.setInt(3, getResidenceId()); statement.execute(); } @@ -159,7 +159,7 @@ public final class ClanHall extends AbstractResidence public int getCostFailDay() { - final Duration failDay = Duration.between(Instant.ofEpochMilli(getPaidUntil()), Instant.now()); + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); return failDay.isNegative() ? 0 : (int) failDay.toDays(); } @@ -256,13 +256,13 @@ public final class ClanHall extends AbstractResidence _owner = clan; clan.setHideoutId(getResidenceId()); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (getPaidUntil() == 0) + if (_paidUntil == 0) { setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); } final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : getPaidUntil(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else @@ -351,29 +351,28 @@ public final class ClanHall extends AbstractResidence @Override public void run() { - final L2Clan clan = getOwner(); - if (clan != null) + if (_owner != null) { - if (clan.getWarehouse().getAdena() < getLease()) + if (_owner.getWarehouse().getAdena() < _lease) { if (getCostFailDay() > 8) { setOwner(null); - clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + _owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); } else { _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); - clan.broadcastToOnlineMembers(sm); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); } } else { - clan.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, getLease(), null, null); - setPaidUntil(Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), getPaidUntil() - System.currentTimeMillis()); + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java index 826a7beece..a4b57818fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -75,7 +75,7 @@ public class Duel private boolean _finished = false; private final Map _playerConditions = new ConcurrentHashMap<>(); - private Instance _duelInstance; + Instance _duelInstance; public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId) { @@ -213,9 +213,9 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPool.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - if (getDueldInstance() != null) + if (_duelInstance != null) { - getDueldInstance().destroy(); + _duelInstance.destroy(); } break; } @@ -674,7 +674,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -695,7 +695,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java index 3d030d3183..2433d41209 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -237,7 +237,7 @@ public final class Fort extends AbstractResidence super(fortId); load(); loadFlagPoles(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -506,7 +506,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -781,7 +781,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -873,7 +873,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1001,8 +1001,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1068,7 +1068,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 75de2719fc..c7a8bd6dfa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -70,7 +70,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -101,7 +101,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -115,7 +115,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -184,7 +184,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -205,7 +205,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -228,7 +228,7 @@ public class FortSiege implements Siegable // Fort setting protected Set _commanders = ConcurrentHashMap.newKeySet(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private final Collection _siegeGuards = new LinkedList<>(); ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -248,7 +248,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { _isInProgress = false; // Flag so that siege instance can be started removeFlags(); // Removes all flags. Note: Remove flag before teleporting players @@ -257,22 +257,22 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); int ownerId = -1; - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - ownerId = getFort().getOwnerClan().getId(); + ownerId = _fort.getOwnerClan().getId(); } - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -306,16 +306,16 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -326,24 +326,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -358,7 +358,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -369,7 +369,7 @@ public class FortSiege implements Siegable } } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -391,7 +391,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -411,7 +411,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -421,7 +421,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -441,7 +441,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -470,7 +470,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return (_isInProgress && (_fort.checkIfInZone(x, y, z))); // Fort zone during siege } /** @@ -490,7 +490,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - if ((clan != null) && (getFort().getOwnerClan() == clan)) + if ((clan != null) && (_fort.getOwnerClan() == clan)) { return true; } @@ -504,22 +504,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -540,7 +540,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -550,7 +550,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -583,10 +583,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -614,7 +614,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if ((getFort() != null) && (!_commanders.isEmpty())) + if ((_fort != null) && (!_commanders.isEmpty())) { final L2Spawn spawn = instance.getSpawn(); if (spawn != null) @@ -657,14 +657,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -674,22 +674,22 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } // schedule restoring doors/commanders respawn else if (_siegeRestore == null) { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); } } else { - LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } } @@ -705,7 +705,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -734,7 +734,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player don't have enough adena to register } @@ -754,7 +754,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -788,7 +788,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(query)) { - statement.setInt(1, getFort().getResidenceId()); + statement.setInt(1, _fort.getResidenceId()); if (clanId != 0) { statement.setInt(2, clanId); @@ -796,9 +796,9 @@ public class FortSiege implements Siegable statement.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -843,7 +843,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -896,9 +896,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -927,7 +927,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -948,7 +948,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -991,18 +991,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1038,7 +1038,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1060,8 +1060,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, _fort.getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1085,7 +1085,7 @@ public class FortSiege implements Siegable PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getFort().getResidenceId()); + statement.setInt(2, _fort.getResidenceId()); statement.execute(); addAttacker(clan.getId()); @@ -1151,7 +1151,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1235,7 +1235,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1265,7 +1265,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1288,7 +1288,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public Set getCommanders() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java index 54018274e5..00ecbc50fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -92,7 +92,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -160,14 +160,14 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } try { - if (!getIsTimeRegistrationOver()) + if (!_castle.getIsTimeRegistrationOver()) { final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) @@ -186,7 +186,7 @@ public class Siege implements Siegable else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; clearSiegeWaitingClan(); @@ -228,8 +228,8 @@ public class Siege implements Siegable // Castle setting private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); - private final Castle _castle; - private boolean _isInProgress = false; + final Castle _castle; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,18 +246,18 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); if (clan.getId() == _firstOwnerClanId) @@ -267,7 +267,7 @@ public class Siege implements Siegable } else { - getCastle().setTicketBuyCount(0); + _castle.setTicketBuyCount(0); for (L2ClanMember member : clan.getMembers()) { if (member != null) @@ -284,7 +284,7 @@ public class Siege implements Siegable else { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); } @@ -322,7 +322,7 @@ public class Siege implements Siegable clan.clearSiegeDeaths(); } - getCastle().updateClansReputation(); + _castle.updateClansReputation(); removeFlags(); // Removes all flags. Note: Remove flag before teleporting players teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town _isInProgress = false; // Flag so that siege instance can be started @@ -331,14 +331,14 @@ public class Siege implements Siegable clearSiegeClan(); // Clear siege clan from db removeTowers(); // Remove all towers from this castle SiegeGuardManager.getInstance().unspawnSiegeGuard(getCastle()); // Remove all spawned siege guard from this castle - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); } - getCastle().spawnDoor(); // Respawn door to castle - getCastle().getZone().setIsActive(false); - getCastle().getZone().updateZoneStatusForCharactersInside(); - getCastle().getZone().setSiegeInstance(null); + _castle.spawnDoor(); // Respawn door to castle + _castle.getZone().setIsActive(false); + _castle.getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(null); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeFinish(this), getCastle()); @@ -387,9 +387,9 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); // Remove all merc entry from db } @@ -398,13 +398,13 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); return; } - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) @@ -426,7 +426,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -444,7 +444,7 @@ public class Siege implements Siegable } } - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -462,8 +462,8 @@ public class Siege implements Siegable teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town removeDefenderFlags(); // Removes defenders' flags - getCastle().removeUpgrade(); // Remove all castle upgrade - getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) + _castle.removeUpgrade(); // Remove all castle upgrade + _castle.spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) removeTowers(); // Remove all towers from this castle _controlTowerCount = 0; // Each new siege midvictory CT are completely respawned. spawnControlTower(); @@ -483,9 +483,9 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { - _firstOwnerClanId = getCastle().getOwnerId(); + _firstOwnerClanId = _castle.getOwnerId(); if (getAttackerClans().isEmpty()) { @@ -500,7 +500,7 @@ public class Siege implements Siegable final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId); ownerClan.increaseBloodAllianceCount(); } - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); saveCastleSiege(); return; @@ -515,20 +515,20 @@ public class Siege implements Siegable _controlTowerCount = 0; spawnControlTower(); // Spawn control tower spawnFlameTower(); // Spawn control tower - getCastle().spawnDoor(); // Spawn door + _castle.spawnDoor(); // Spawn door spawnSiegeGuard(); // Spawn siege guard SiegeGuardManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground - getCastle().getZone().setSiegeInstance(this); - getCastle().getZone().setIsActive(true); - getCastle().getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(this); + _castle.getZone().setIsActive(true); + _castle.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEndDate = Calendar.getInstance(); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); - ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task + ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); // Notify to scripts. @@ -589,7 +589,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -649,7 +649,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -723,7 +723,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return (_isInProgress && (_castle.checkIfInZone(x, y, z))); // Castle zone during siege } /** @@ -763,21 +763,21 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) { - delete.setInt(1, getCastle().getOwnerId()); + delete.setInt(1, _castle.getOwnerId()); delete.execute(); } } getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -791,10 +791,10 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -821,7 +821,7 @@ public class Siege implements Siegable */ public List getPlayersInZone() { - return getCastle().getZone().getPlayersInside(); + return _castle.getZone().getPlayersInside(); } /** @@ -845,7 +845,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - return getCastle().getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); + return _castle.getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); } /** @@ -872,7 +872,7 @@ public class Siege implements Siegable */ public void listRegisterClan(L2PcInstance player) { - player.sendPacket(new SiegeInfo(getCastle(), player)); + player.sendPacket(new SiegeInfo(_castle, player)); } /** @@ -892,7 +892,7 @@ public class Siege implements Siegable return; } int allyId = 0; - if (getCastle().getOwnerId() != 0) + if (_castle.getOwnerId() != 0) { allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); } @@ -935,9 +935,9 @@ public class Siege implements Siegable public void registerDefender(L2PcInstance player, boolean force) { - if (getCastle().getOwnerId() <= 0) + if (_castle.getOwnerId() <= 0) { - player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC."); + player.sendMessage("You cannot register as a defender because " + _castle.getName() + " is owned by NPC."); return; } @@ -975,7 +975,7 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.setInt(2, clanId); statement.execute(); @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _castle.getName() + ": " + _castle.getSiegeDate().getTime()); loadSiegeClan(); @@ -1028,7 +1028,7 @@ public class Siege implements Siegable { _scheduledStartSiegeTask.cancel(false); } - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } /** @@ -1048,12 +1048,12 @@ public class Siege implements Siegable } case NotOwner: { - players = getPlayersInZone(); + players = _castle.getZone().getPlayersInside(); final Iterator it = players.iterator(); while (it.hasNext()) { final L2PcInstance player = it.next(); - if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId()))) + if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == _castle.getOwnerId()))) { it.remove(); } @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1149,7 +1149,7 @@ public class Siege implements Siegable { player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_3_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE); } - else if (player.getClan().getId() == getCastle().getOwnerId()) + else if (player.getClan().getId() == _castle.getOwnerId()) { player.sendPacket(SystemMessageId.CASTLE_OWNING_CLANS_ARE_AUTOMATICALLY_REGISTERED_ON_THE_DEFENDING_SIDE); } @@ -1243,15 +1243,15 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { - addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER); + addDefender(_castle.getOwnerId(), SiegeClanType.OWNER); } - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); try (ResultSet rs = statement.executeQuery()) { int typeId; @@ -1333,8 +1333,8 @@ public class Siege implements Siegable setNextSiegeDate(); // Set the next set date for 2 weeks from now // Schedule Time registration end getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); - getCastle().setIsTimeRegistrationOver(false); + _castle.getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); + _castle.setIsTimeRegistrationOver(false); saveSiegeDate(); // Save the new date startAutoTask(); // Prepare auto start siege and end registration @@ -1346,16 +1346,16 @@ public class Siege implements Siegable if (_scheduledStartSiegeTask != null) { _scheduledStartSiegeTask.cancel(true); - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ? WHERE id = ?")) { - statement.setLong(1, getSiegeDate().getTimeInMillis()); - statement.setLong(2, getTimeRegistrationOverDate().getTimeInMillis()); - statement.setString(3, String.valueOf(getIsTimeRegistrationOver())); - statement.setInt(4, getCastle().getResidenceId()); + statement.setLong(1, _castle.getSiegeDate().getTimeInMillis()); + statement.setLong(2, _castle.getTimeRegistrationOverDate().getTimeInMillis()); + statement.setString(3, String.valueOf(_castle.getIsTimeRegistrationOver())); + statement.setInt(4, _castle.getResidenceId()); statement.execute(); } catch (Exception e) @@ -1397,7 +1397,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, typeId); statement.execute(); } @@ -1407,7 +1407,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) { statement.setInt(1, typeId); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, clan.getId()); statement.execute(); } @@ -1435,7 +1435,7 @@ public class Siege implements Siegable /** Set the date for the next siege. */ private void setNextSiegeDate() { - final Calendar cal = getCastle().getSiegeDate(); + final Calendar cal = _castle.getSiegeDate(); if (cal.getTimeInMillis() < System.currentTimeMillis()) { cal.setTimeInMillis(System.currentTimeMillis()); @@ -1460,7 +1460,7 @@ public class Siege implements Siegable } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = false; // Allow registration for next siege @@ -1645,7 +1645,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1672,23 +1672,23 @@ public class Siege implements Siegable public final boolean getIsTimeRegistrationOver() { - return getCastle().getIsTimeRegistrationOver(); + return _castle.getIsTimeRegistrationOver(); } @Override public final Calendar getSiegeDate() { - return getCastle().getSiegeDate(); + return _castle.getSiegeDate(); } public final Calendar getTimeRegistrationOverDate() { - return getCastle().getTimeRegistrationOverDate(); + return _castle.getTimeRegistrationOverDate(); } public void endTimeRegistration(boolean automatic) { - getCastle().setIsTimeRegistrationOver(true); + _castle.setIsTimeRegistrationOver(true); if (!automatic) { saveSiegeDate(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java index f09be6765f..ac490ba86d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -129,7 +129,7 @@ public class EventScheduler run(); updateLastRun(); - if (isRepeating()) + if (_repeat) { ThreadPool.schedule(this::startScheduler, 1000); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index eae25b08f7..1d42731b7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() @@ -46,16 +46,16 @@ public final class MovieHolder public void playerEscapeVote(L2PcInstance player) { - if (getVotedPlayers().contains(player) || !getPlayers().contains(player) || !getMovie().isEscapable()) + if (_votedPlayers.contains(player) || !_players.contains(player) || !_movie.isEscapable()) { return; } - getVotedPlayers().add(player); + _votedPlayers.add(player); - if (((getVotedPlayers().size() * 100) / getPlayers().size()) >= 50) + if (((_votedPlayers.size() * 100) / _players.size()) >= 50) { - getPlayers().forEach(L2PcInstance::stopMovie); + _players.forEach(L2PcInstance::stopMovie); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index a4fde8355e..4bc6353cfa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -487,7 +487,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return Collections.emptyList(); } @@ -502,7 +502,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } return npcs; } @@ -516,7 +516,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return; } @@ -526,7 +526,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } } @@ -810,7 +810,7 @@ public final class Instance implements IIdentifiable, INamable public void setReenterTime(long time) { // Cannot store reenter data for instance without template id. - if ((getTemplateId() == -1) && (time > 0)) + if ((_template.getId() == -1) && (time > 0)) { return; } @@ -824,7 +824,7 @@ public final class Instance implements IIdentifiable, INamable if (player != null) { ps.setInt(1, player.getObjectId()); - ps.setInt(2, getTemplateId()); + ps.setInt(2, _template.getId()); ps.setLong(3, time); ps.addBatch(); } @@ -835,11 +835,11 @@ public final class Instance implements IIdentifiable, INamable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null) { - msg.addInstanceName(getTemplateId()); + msg.addInstanceName(_template.getId()); } else { - msg.addString(getName()); + msg.addString(_template.getName()); } _allowed.forEach(player -> { @@ -995,7 +995,7 @@ public final class Instance implements IIdentifiable, INamable removePlayer(player); if (Config.RESTORE_PLAYER_INSTANCE) { - player.getVariables().set("INSTANCE_RESTORE", getId()); + player.getVariables().set("INSTANCE_RESTORE", _id); } else { @@ -1161,6 +1161,6 @@ public final class Instance implements IIdentifiable, INamable @Override public String toString() { - return getName() + "(" + getId() + ")"; + return _template.getName() + "(" + _id + ")"; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 409678ea5a..ba6f5482ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -788,6 +788,6 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl @Override public String toString() { - return "ID: " + getId() + " Name: " + getName(); + return "ID: " + _templateId + " Name: " + _name; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 74090bd4ac..8a3ac20ed4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -181,12 +181,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -250,7 +250,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -340,7 +340,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5bb5770412..9e94b591e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -115,9 +115,9 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - statement.setInt(1, getOwnerId()); + statement.setInt(1, _ownerId); statement.setString(2, getBaseLocation().name()); - statement.setInt(3, getMessageId()); + statement.setInt(3, _messageId); try (ResultSet inv = statement.executeQuery()) { while (inv.next()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index c7a3128aa9..9228d151c2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -150,7 +150,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -211,7 +211,7 @@ public class PcInventory extends Inventory { return getItems(i -> { - if (!i.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) + if (!i.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) { return false; } @@ -232,7 +232,7 @@ public class PcInventory extends Inventory { //@formatter:off return _items.values().stream() - .filter(i -> i.isAvailable(getOwner(), false, false)) + .filter(i -> i.isAvailable(_owner, false, false)) .map(tradeList::adjustAvailableItem) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -689,12 +689,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (getOwner().isProcessingItem(item.getObjectId())) + if (_owner.isProcessingItem(item.getObjectId())) { - getOwner().removeRequestsThatProcessesItem(item.getObjectId()); + _owner.removeRequestsThatProcessesItem(item.getObjectId()); } if (item.getId() == ADENA_ID) @@ -720,7 +720,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(true); + _owner.refreshOverloaded(true); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 87c35d5d82..fa6332fb1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -120,7 +120,7 @@ public class PetInventory extends Inventory { if (item.isEquipped()) { - if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (!item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 4c8db6b288..dbba43acd0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -73,6 +73,6 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index a04975542f..8d988d61be 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -89,7 +89,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java index 2f590854f8..26e11555ac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -415,11 +415,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -434,11 +434,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -532,7 +532,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -589,7 +589,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -780,7 +780,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) { if (isEquipable()) { @@ -793,7 +793,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return false; } - if (isCocRestrictedItem() && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_is_coc_restricted && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 1db19c172a..a0ee0a7895 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -119,7 +119,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 0f9a69fec3..d9baca8329 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -274,7 +274,7 @@ public class AppearanceStone return false; } - switch (getType()) + switch (_type) { case RESTORE: { @@ -383,15 +383,15 @@ public class AppearanceStone return false; } - if (getWeaponType() != WeaponType.NONE) + if (_weaponType != WeaponType.NONE) { - if (!targetItem.isWeapon() || (targetItem.getItemType() != getWeaponType())) + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); return false; } - switch (getHandType()) + switch (_handType) { case ONE_HANDED: { @@ -413,7 +413,7 @@ public class AppearanceStone } } - switch (getMagicType()) + switch (_magicType) { case MAGICAL: { @@ -435,9 +435,9 @@ public class AppearanceStone } } - if (getArmorType() != ArmorType.NONE) + if (_armorType != ArmorType.NONE) { - switch (getArmorType()) + switch (_armorType) { case SHIELD: { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 851ee0b06b..9cd7f326c0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -328,14 +328,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -344,7 +344,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -366,7 +366,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -482,7 +482,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -504,12 +504,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -519,7 +519,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -542,7 +542,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -559,9 +559,9 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isEnchantable(); + return _item.isEnchantable(); } return 0; } @@ -656,7 +656,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -730,7 +730,7 @@ public final class L2ItemInstance extends L2Object /** * @return the reference price of the item. */ - public int getReferencePrice() + public long getReferencePrice() { return _item.getReferencePrice(); } @@ -880,7 +880,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public final class L2ItemInstance extends L2Object final L2Summon pet = player.getPet(); return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -963,7 +963,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1139,9 +1139,9 @@ public final class L2ItemInstance extends L2Object { if (isWeapon()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - return getItem().getAttributes().stream().findFirst().orElse(null); + return _item.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1167,9 +1167,9 @@ public final class L2ItemInstance extends L2Object { if (isArmor()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - final AttributeHolder attribute = getItem().getAttribute(element); + final AttributeHolder attribute = _item.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1411,7 +1411,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1433,7 +1433,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1615,11 +1615,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1651,12 +1651,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1838,7 +1838,7 @@ public final class L2ItemInstance extends L2Object player.sendInventoryUpdate(iu); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1852,7 +1852,7 @@ public final class L2ItemInstance extends L2Object { player.getWarehouse().destroyItem("L2ItemInstance", this, player, null); } - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(getId())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId)); } } @@ -1949,32 +1949,32 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isElementable(); + return _item.isElementable(); } return false; } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -1991,7 +1991,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && (getItem().getSkills(ItemSkillType.NORMAL) != null); + return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2004,7 +2004,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2025,7 +2025,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2429,7 +2429,15 @@ public final class L2ItemInstance extends L2Object iu.addModifiedItem(this); player.broadcastUserInfo(UserInfoType.APPAREANCE); player.sendInventoryUpdate(iu); - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + + if (isEnchanted()) + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this)); + } + else + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + } } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 4858feb6a9..9a7dbcac0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/options/Options.java index 813ec8f6db..630038eb77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/options/Options.java @@ -189,14 +189,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { addSkill(player, holder.getSkill()); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { addSkill(player, holder.getSkill()); } @@ -227,14 +227,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { player.removeSkill(holder.getSkill(), false, false); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { player.removeSkill(holder.getSkill(), false, true); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java index 94d887ee5a..0cc8caca17 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2698,7 +2698,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2711,9 +2710,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); @@ -2901,7 +2900,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if (activeChar.getQuestState(getName()) != null) { - final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList packet = new ExQuestNpcLogList(_questId); getNpcLogList(activeChar).forEach(packet::add); activeChar.sendPacket(packet); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 40aa1878fd..5e0a66a375 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + _questName + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -755,7 +755,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 4013de0733..1cf9e26073 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,13 +53,13 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; - private final ScheduledFuture _schedular; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; + private final ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) { @@ -68,7 +68,7 @@ public class QuestTimer _player = player; _npc = npc; _isRepeating = repeating; - _schedular = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); + _scheduler = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); } public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) @@ -87,9 +87,9 @@ public class QuestTimer public void cancel() { _isActive = false; - if (_schedular != null) + if (_scheduler != null) { - _schedular.cancel(false); + _scheduler.cancel(false); } } @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java index 73f5ed97a8..81ec17cf73 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -132,7 +132,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -152,7 +152,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + _residenceId, e); } } @@ -173,7 +173,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN ps.setInt(1, func.getId()); ps.setInt(2, func.getLevel()); ps.setLong(3, func.getExpiration()); - ps.setInt(4, getResidenceId()); + ps.setInt(4, _residenceId); ps.setInt(5, func.getLevel()); ps.setLong(6, func.getExpiration()); @@ -181,7 +181,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + _residenceId, e); } finally { @@ -202,13 +202,13 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ? and id = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.setInt(2, func.getId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + _residenceId, e); } finally { @@ -225,12 +225,12 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + _residenceId, e); } finally { @@ -313,6 +313,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + " (" + getResidenceId() + ")"; + return _name + " (" + _residenceId + ")"; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index ab2394ed74..cac8ecf953 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -333,7 +333,7 @@ public final class BuffInfo } // Call on start. - effect.onStart(getEffector(), getEffected(), getSkill()); + effect.onStart(_effector, _effected, _skill); // If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it. if (effect.getTicks() > 0) @@ -360,7 +360,7 @@ public final class BuffInfo if (_isInUse) { // Callback for on action time event. - continueForever = effect.onActionTime(getEffector(), getEffected(), getSkill()); + continueForever = effect.onActionTime(_effector, _effected, _skill); } if (!continueForever && _skill.isToggle()) @@ -369,7 +369,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -391,7 +391,7 @@ public final class BuffInfo // Instant effects shouldn't call onExit(..). if (!effect.isInstant()) { - effect.onExit(getEffector(), getEffected(), getSkill()); + effect.onExit(_effector, _effected, _skill); } } @@ -403,7 +403,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java index 19a1a61b20..1cea15b228 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -240,15 +240,15 @@ public final class Skill implements IIdentifiable _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -441,7 +441,7 @@ public final class Skill implements IIdentifiable } _magicCriticalRate = set.getDouble("magicCriticalRate", 0); - _buffType = isTriggeredSkill() ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : isDebuff() ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; + _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); } @@ -1054,7 +1054,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getMaxSoulConsumeCount() @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable public boolean isStayAfterDeath() { - return _stayAfterDeath || isIrreplacableBuff() || isNecessaryToggle(); + return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle; } public boolean isBad() @@ -1333,7 +1333,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isIgnoringSkillEffects(getId(), getLevel())) + if (effected.isIgnoringSkillEffects(_id, _level)) { return; } @@ -1357,7 +1357,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1368,19 +1368,19 @@ public final class Skill implements IIdentifiable } // Check for mesmerizing debuffs and increase resist level. - if (isDebuff() && (getBasicProperty() != BasicProperty.NONE) && effected.hasBasicPropertyResist()) + if (_isDebuff && (_basicProperty != BasicProperty.NONE) && effected.hasBasicPropertyResist()) { - final BasicPropertyResist resist = effected.getBasicPropertyResist(getBasicProperty()); + final BasicPropertyResist resist = effected.getBasicPropertyResist(_basicProperty); resist.increaseResistLevel(); } } // Support for buff sharing feature including healing herbs. - if (isSharedWithSummon() && effected.isPlayer() && effected.hasServitors() && !isTransformation()) + if (_isSharedWithSummon && effected.isPlayer() && effected.hasServitors() && !isTransformation()) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - effected.getServitors().values().forEach(s -> applyEffects(effector, s, isRecoveryHerb(), 0)); + effected.getServitors().values().forEach(s -> applyEffects(effector, s, _isRecoveryHerb, 0)); } } } @@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1413,7 +1413,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && isSharedWithSummon() && info.getEffected().isPlayer() && isContinuous() && !isDebuff() && info.getEffected().hasServitors()) + if (addContinuousEffects && _isSharedWithSummon && info.getEffected().isPlayer() && isContinuous() && !_isDebuff && info.getEffected().hasServitors()) { info.getEffected().getServitors().values().forEach(s -> applyEffects(effector, s, false, 0)); } @@ -1498,9 +1498,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0, item); } @@ -1517,7 +1517,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1571,7 +1571,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isIrreplacableBuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispelled(); + return !isPassive() && !isToggle() && !_isDebuff && !_irreplacableBuff && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispelled; } public boolean isClanSkill() @@ -1733,20 +1733,20 @@ public final class Skill implements IIdentifiable public Skill getAttachedSkill(L2Character activeChar) { // If character is double casting, return double cast skill. - if ((getDoubleCastSkill() > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) + if ((_doubleCastSkill > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) { return SkillData.getInstance().getSkill(getDoubleCastSkill(), getLevel(), getSubLevel()); } // Default toggle group ID, assume nothing attached. - if ((getAttachToggleGroupId() <= 0) || (getAttachSkills() == null)) + if ((_attachToggleGroupId <= 0) || (_attachSkills == null)) { return null; } //@formatter:off final int toggleSkillId = activeChar.getEffectList().getEffects().stream() - .filter(info -> info.getSkill().getToggleGroupId() == getAttachToggleGroupId()) + .filter(info -> info.getSkill().getToggleGroupId() == _attachToggleGroupId) .mapToInt(info -> info.getSkill().getId()) .findAny().orElse(0); //@formatter:on @@ -1757,7 +1757,7 @@ public final class Skill implements IIdentifiable return null; } - final AttachSkillHolder attachedSkill = getAttachSkills().stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); + final AttachSkillHolder attachedSkill = _attachSkills.stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); // No attached skills for this toggle found. if (attachedSkill == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 8e607be078..f5da8aed03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -99,7 +99,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -160,7 +160,7 @@ public class SkillChannelizer implements Runnable if (o.isCharacter()) { targetList.add((L2Character) o); - ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), _channelizer); } }); } @@ -198,13 +198,13 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer()) + if (character.isPlayable() && _channelizer.isPlayer()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } // Be warned, this method has the possibility to call doDie->abortCast->stopChanneling method. Variable cache above try"+ +" is used in this case to avoid NPEs. - channeledSkill.applyEffects(getChannelizer(), character); + channeledSkill.applyEffects(_channelizer, character); // Reduce shots. if (skill.useSpiritShot()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index f8dfd518a6..30203b6450 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -145,7 +145,7 @@ public final class TeleportHolder // Build html final StringBuilder sb = new StringBuilder(); final StringBuilder sb_f = new StringBuilder(); - for (TeleportLocation loc : getLocations()) + for (TeleportLocation loc : _teleportData) { String finalName = loc.getName(); String confirmDesc = loc.getName(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 66f0ce1b9f..69519245dc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -205,7 +205,7 @@ public abstract class L2ZoneType extends ListenersContainer final Instance world = character.getInstanceWorld(); if (world != null) { - if (world.getTemplateId() != getInstanceTemplateId()) + if (world.getTemplateId() != _instanceTemplateId) { return false; } @@ -214,7 +214,7 @@ public abstract class L2ZoneType extends ListenersContainer return false; } } - else if (getInstanceTemplateId() > 0) + else if (_instanceTemplateId > 0) { return false; } @@ -402,12 +402,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -572,7 +572,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) @@ -605,10 +605,10 @@ public abstract class L2ZoneType extends ListenersContainer { if (_enabledInInstance != null) { - return _enabledInInstance.getOrDefault(instanceId, isEnabled()); + return _enabledInInstance.getOrDefault(instanceId, _enabled); } - return isEnabled(); + return _enabled; } public void oustAllPlayers() @@ -633,7 +633,7 @@ public abstract class L2ZoneType extends ListenersContainer return; } - for (L2Character character : getCharactersInside()) + for (L2Character character : _characterList.values()) { if ((character != null) && character.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 33d3bb8723..6a7479f3af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public final class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -257,7 +257,7 @@ public final class L2EffectZone extends L2ZoneType { getCharactersInside().forEach(character -> { - if ((character != null) && !character.isDead() && (Rnd.get(100) < getChance())) + if ((character != null) && !character.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index a1a99b7051..95223b63a9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9b786f0b7d..f1e975876e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -252,7 +252,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -533,7 +533,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -603,11 +603,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 8aa642c02a..1c02d43810 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -56,7 +56,7 @@ public final class RequestRecipeItemMakeSelf implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index ba40366a3e..fda43da41c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -79,7 +79,7 @@ public final class RequestRecipeShopMakeItem implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index b3f8a823c8..ad3f971eda 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -59,7 +59,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 4fe4ef7d8c..75c44c649d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -54,7 +54,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 97d035b0f3..1d6ef78348 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -62,7 +62,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExShapeShiftingResult.CLOSE); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 10ce97b46c..2d55d432bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -438,7 +438,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java index 1a16f0bd49..934a748fa3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 17f3f7f21b..bda9f2f3e5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -68,7 +68,7 @@ public final class OfflineTradeUtil } default: { - canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isInCraftMode(); + canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isCrafting(); break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 4911f2826c..e5388f4596 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -240,7 +240,7 @@ public class TaskExecutor */ public void pause() throws UnsupportedOperationException { - if (!canBePaused()) + if (!task.canBePaused()) { throw new UnsupportedOperationException("Pause not supported"); } @@ -276,7 +276,7 @@ public class TaskExecutor */ public void stop() throws UnsupportedOperationException { - if (!canBeStopped()) + if (!task.canBeStopped()) { throw new UnsupportedOperationException("Stop not supported"); } @@ -346,7 +346,7 @@ public class TaskExecutor */ public String getStatusMessage() throws UnsupportedOperationException { - if (!supportsStatusTracking()) + if (!task.supportsStatusTracking()) { throw new UnsupportedOperationException("Status tracking not supported"); } @@ -360,7 +360,7 @@ public class TaskExecutor */ public double getCompleteness() throws UnsupportedOperationException { - if (!supportsCompletenessTracking()) + if (!task.supportsCompletenessTracking()) { throw new UnsupportedOperationException("Completeness tracking not supported"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java index 85dbd2a34a..7d9ec1824b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java index da20164f21..068a5f1773 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 859128de7b..c90c8127a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -286,7 +286,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -314,10 +314,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -376,59 +376,59 @@ public abstract class BaseGameServerRegister if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.printf(getBundle().getString("checkingIdInUse") + Config.EOL, _id); + System.out.printf(_bundle.getString("checkingIdInUse") + Config.EOL, _id); if (GameServerTable.getInstance().hasRegisteredGameServerOnId(_id)) { - System.out.println(getBundle().getString("yes")); + System.out.println(_bundle.getString("yes")); if (_force) { - System.out.printf(getBundle().getString("forcingRegistration") + Config.EOL, _id); + System.out.printf(_bundle.getString("forcingRegistration") + Config.EOL, _id); unregisterGameServer(_id); registerGameServer(_id, _outDir); - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, _id); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, _id); } else if (_fallback) { - System.out.println(getBundle().getString("fallingBack")); + System.out.println(_bundle.getString("fallingBack")); final int registeredId = registerFirstAvailable(_outDir); if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.println(getBundle().getString("noAction")); + System.out.println(_bundle.getString("noAction")); } } else { - System.out.println(getBundle().getString("no")); + System.out.println(_bundle.getString("no")); registerGameServer(_id, _outDir); } } } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } catch (IOException e) { - showError(getBundle().getString("ioErrorRegister"), e); + showError(_bundle.getString("ioErrorRegister"), e); } } } @@ -453,14 +453,14 @@ public abstract class BaseGameServerRegister @Override public void run() { - System.out.printf(getBundle().getString("removingGsId") + Config.EOL, _id); + System.out.printf(_bundle.getString("removingGsId") + Config.EOL, _id); try { unregisterGameServer(_id); } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } } } @@ -479,7 +479,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 59ca8fcc83..6251faab77 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -40,7 +40,7 @@ public class Recipes implements IItemHandler } final L2PcInstance activeChar = playable.getActingPlayer(); - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING); return false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/SocialAction.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/SocialAction.java index f7db8c36f7..fde530a2b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/SocialAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/SocialAction.java @@ -149,7 +149,7 @@ public final class SocialAction implements IPlayerActionHandler } SystemMessage sm; - if (player.isInStoreMode() || player.isInCraftMode()) + if (player.isInStoreMode() || player.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(player); @@ -228,7 +228,7 @@ public final class SocialAction implements IPlayerActionHandler // Checks for partner. final L2PcInstance partner = target.getActingPlayer(); - if (partner.isInStoreMode() || partner.isInCraftMode()) + if (partner.isInStoreMode() || partner.isCrafting()) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_STORE_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION); sm.addPcName(partner); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/network/PacketReader.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/network/PacketReader.java index ea90113f43..bdf5c76ac8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/network/PacketReader.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/network/PacketReader.java @@ -124,7 +124,7 @@ public final class PacketReader { final StringBuilder sb = new StringBuilder(); final int stringLength = _buf.readShortLE(); - if ((stringLength * 2) > getReadableBytes()) + if ((stringLength * 2) > _buf.readableBytes()) { throw new IndexOutOfBoundsException("readerIndex(" + _buf.readerIndex() + ") + length(" + (stringLength * 2) + ") exceeds writerIndex(" + _buf.writerIndex() + "): " + _buf); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java index dba4334dd6..8fda49f426 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java @@ -199,7 +199,7 @@ public class RecipeController _skillLevel = _player.getSkillLevel(_skillId); _skill = _player.getKnownSkill(_skillId); - _player.isInCraftMode(true); + _player.setIsCrafting(true); if (_player.isAlikeDead()) { @@ -291,7 +291,7 @@ public class RecipeController updateCurMp(); updateCurLoad(); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _isValid = true; } @@ -438,7 +438,7 @@ public class RecipeController // update load and mana bar of craft window updateCurMp(); _activeMakers.remove(_player.getObjectId()); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _target.sendItemList(false); } @@ -654,7 +654,7 @@ public class RecipeController private void abort() { updateMakeInfo(false); - _player.isInCraftMode(false); + _player.setIsCrafting(false); _activeMakers.remove(_player.getObjectId()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java index cad4fb54da..717f999c27 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -608,7 +608,7 @@ public abstract class AbstractAI implements Ctrl } return; } - if (!isAutoAttacking()) + if (!_clientAutoAttacking) { if (_actor.isPlayer() && _actor.hasSummon()) { @@ -648,7 +648,7 @@ public abstract class AbstractAI implements Ctrl AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); } } - else if (isAutoAttacking()) + else if (_clientAutoAttacking) { _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId())); setAutoAttacking(false); @@ -680,7 +680,7 @@ public abstract class AbstractAI implements Ctrl */ public void describeStateToPlayer(L2PcInstance player) { - if (getActor().isVisibleFor(player)) + if (_actor.isVisibleFor(player)) { if (_clientMoving) { @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (getTarget() instanceof L2Character) && (getIntention() == AI_INTENTION_FOLLOW); + return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); } /** @@ -737,7 +737,7 @@ public abstract class AbstractAI implements Ctrl return; } - final L2Object followTarget = getTarget(); // copy to prevent NPE + final L2Object followTarget = _target; // copy to prevent NPE if (followTarget == null) { if (_actor.isSummon()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index 8826f4e507..3880807630 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -75,7 +75,7 @@ public final class L2ControllableMobAI extends L2AttackableAI @Override protected void onEvtThink() { - if (isThinking()) + if (_isThinking) { return; } @@ -84,7 +84,7 @@ public final class L2ControllableMobAI extends L2AttackableAI try { - switch (getAlternateAI()) + switch (_alternateAI) { case AI_IDLE: { @@ -166,7 +166,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, sk.getCastRange()); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, max_range); } @@ -216,7 +216,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(target, range); } @@ -256,7 +256,7 @@ public final class L2ControllableMobAI extends L2AttackableAI max_range = Math.max(max_range, castRange); } - if (!isNotMoving()) + if (!_isNotMoving) { moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 4f3a018802..0052f4791d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -224,7 +224,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtAttacked(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } @@ -239,7 +239,7 @@ public class L2SummonAI extends L2PlayableAI implements Runnable { super.onEvtEvaded(attacker); - if (isDefending()) + if (_isDefending) { defendAttack(attacker); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/cache/HtmCache.java index 3127c4156e..265a5a6758 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -66,7 +66,7 @@ public class HtmCache { LOGGER.info("Html cache start..."); parseDir(f); - LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded"); + LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded"); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java index 316e1ed757..dd22855ae4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/communitybbs/BB/Topic.java @@ -128,11 +128,11 @@ public class Topic public void deleteme(Forum f) { TopicBBSManager.getInstance().delTopic(this); - f.rmTopicByID(getID()); + f.rmTopicByID(_id); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?")) { - ps.setInt(1, getID()); + ps.setInt(1, _id); ps.setInt(2, f.getID()); ps.execute(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 5aac2716cf..d0cd743b0f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -134,7 +134,7 @@ public class ClanTable public L2Clan getClanByName(String clanName) { - return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); + return _clans.values().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null); } /** @@ -349,7 +349,7 @@ public class ClanTable public boolean isAllyExists(String allyName) { - for (L2Clan clan : getClans()) + for (L2Clan clan : _clans.values()) { if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java index a519be8a56..f90657a886 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java @@ -157,7 +157,7 @@ public final class CrestTable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) { - final L2Crest crest = new L2Crest(getNextId(), data, crestType); + final L2Crest crest = new L2Crest(_nextId.getAndIncrement(), data, crestType); statement.setInt(1, crest.getId()); statement.setBytes(2, crest.getData()); statement.setInt(3, crest.getType().getId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index ff236652e3..c60afbd78a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -48,9 +48,9 @@ public class AttendanceRewardData implements IGameXmlReader { if (Config.ENABLE_ATTENDANCE_REWARDS) { - getRewards().clear(); + _rewards.clear(); parseDatapackFile("data/AttendanceRewards.xml"); - _rewardsCount = getRewards().size(); + _rewardsCount = _rewards.size(); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _rewardsCount + " rewards."); } else @@ -73,7 +73,7 @@ public class AttendanceRewardData implements IGameXmlReader } else { - getRewards().add(new ItemHolder(itemId, itemCount)); + _rewards.add(new ItemHolder(itemId, itemCount)); } })); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java index 712d1febdd..6618dcdf1d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java @@ -108,7 +108,7 @@ public final class CastleData implements IGameXmlReader guards.add(new SiegeGuardHolder(castleId, itemId, type, stationary, npcId, npcMaxAmount)); } } - getSiegeGuards().put(castleId, guards); + _siegeGuards.put(castleId, guards); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b0b755ac92..db7fdf9fa6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -258,7 +258,7 @@ public class RecipeData implements IGameXmlReader if ((recipeList == null) || (recipeList.getRecipes().length == 0)) { player.sendMessage("No recipe for: " + id); - player.isInCraftMode(false); + player.setIsCrafting(false); return null; } return recipeList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java index ac3c07c3c9..d5266c07ef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/enums/AttributeType.java @@ -63,7 +63,7 @@ public enum AttributeType */ public AttributeType getOpposite() { - return ATTRIBUTE_TYPES[((getClientId() % 2) == 0) ? (getClientId() + 1) : (getClientId() - 1)]; + return ATTRIBUTE_TYPES[((_clientId % 2) == 0) ? (_clientId + 1) : (_clientId - 1)]; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index 2615be0ddf..f0275d4660 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -137,7 +137,7 @@ public class BitSetIDFactory extends IdFactory */ protected synchronized int usedIdCount() { - return size() - FIRST_OID; + return _freeIdCount.get() - FIRST_OID; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java index 792edf3cba..afc836f427 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -68,7 +68,7 @@ public final class CastleManager implements InstanceListManager if (nearestCastle == null) { double distance; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { distance = castle.getDistance(obj); if (maxDistance > distance) @@ -88,7 +88,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastleByOwner(L2Clan clan) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getOwnerId() == clan.getId()) { @@ -100,7 +100,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(String name) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.getName().equalsIgnoreCase(name.trim())) { @@ -112,7 +112,7 @@ public final class CastleManager implements InstanceListManager public final Castle getCastle(int x, int y, int z) { - for (Castle temp : getCastles()) + for (Castle temp : _castles.values()) { if (temp.checkIfInZone(x, y, z)) { @@ -135,7 +135,7 @@ public final class CastleManager implements InstanceListManager public boolean hasOwnedCastle() { boolean hasOwnedCastle = false; - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { if (castle.getOwnerId() > 0) { @@ -224,7 +224,7 @@ public final class CastleManager implements InstanceListManager final int castleId = rs.getInt("id"); _castles.put(castleId, new Castle(castleId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getCastles().size() + " castles."); + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _castles.values().size() + " castles."); } catch (Exception e) { @@ -240,7 +240,7 @@ public final class CastleManager implements InstanceListManager @Override public void activateInstances() { - for (Castle castle : getCastles()) + for (Castle castle : _castles.values()) { castle.activateInstance(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index dc63278e16..37f7cd0a21 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -47,7 +47,7 @@ public final class FortManager implements InstanceListManager Fort nearestFort = getFort(obj); if (nearestFort == null) { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { final double distance = fort.getDistance(obj); if (maxDistance > distance) @@ -62,7 +62,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortById(int fortId) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getResidenceId() == fortId) { @@ -74,7 +74,7 @@ public final class FortManager implements InstanceListManager public final Fort getFortByOwner(L2Clan clan) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getOwnerClan() == clan) { @@ -86,7 +86,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(String name) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.getName().equalsIgnoreCase(name.trim())) { @@ -98,7 +98,7 @@ public final class FortManager implements InstanceListManager public final Fort getFort(int x, int y, int z) { - for (Fort f : getForts()) + for (Fort f : _forts.values()) { if (f.checkIfInZone(x, y, z)) { @@ -131,8 +131,8 @@ public final class FortManager implements InstanceListManager _forts.put(fortId, new Fort(fortId)); } - LOGGER.info(getClass().getSimpleName() + ": Loaded: " + getForts().size() + " fortress"); - for (Fort fort : getForts()) + LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _forts.values().size() + " fortress"); + for (Fort fort : _forts.values()) { fort.getSiege().loadSiegeGuard(); } @@ -151,7 +151,7 @@ public final class FortManager implements InstanceListManager @Override public void activateInstances() { - for (Fort fort : getForts()) + for (Fort fort : _forts.values()) { fort.activateInstance(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MailManager.java index 58b75f592d..0b4c7601cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MailManager.java @@ -102,7 +102,7 @@ public final class MailManager public final boolean hasUnreadPost(L2PcInstance player) { final int objectId = player.getObjectId(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) { @@ -115,7 +115,7 @@ public final class MailManager public final int getInboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -128,7 +128,7 @@ public final class MailManager public final int getOutboxSize(int objectId) { int size = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { @@ -141,7 +141,7 @@ public final class MailManager public final List getInbox(int objectId) { final List inbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) { @@ -159,7 +159,7 @@ public final class MailManager public int getMailsInProgress(int objectId) { int count = 0; - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getMailType() == MailType.REGULAR)) { @@ -179,7 +179,7 @@ public final class MailManager public final List getOutbox(int objectId) { final List outbox = new LinkedList<>(); - for (Message msg : getMessages()) + for (Message msg : _messages.values()) { if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 41216a0555..30581681f4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -52,17 +52,17 @@ public final class PetitionManager public void clearCompletedPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getCompletedPetitions().clear(); + _completedPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Completed petition data cleared. " + numPetitions + " petition(s) removed."); } public void clearPendingPetitions() { - final int numPetitions = getPendingPetitionCount(); + final int numPetitions = _pendingPetitions.size(); - getPendingPetitions().clear(); + _pendingPetitions.clear(); LOGGER.info(getClass().getSimpleName() + ": Pending petition queue cleared. " + numPetitions + " petition(s) removed."); } @@ -73,7 +73,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -103,7 +103,7 @@ public final class PetitionManager public boolean cancelActivePetition(L2PcInstance player) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { @@ -123,7 +123,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -150,7 +150,7 @@ public final class PetitionManager return false; } - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -178,7 +178,7 @@ public final class PetitionManager public int getPendingPetitionCount() { - return getPendingPetitions().size(); + return _pendingPetitions.size(); } public int getPlayerTotalPetitionCount(L2PcInstance player) @@ -190,7 +190,7 @@ public final class PetitionManager int petitionCount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -203,7 +203,7 @@ public final class PetitionManager } } - for (Petition currPetition : getCompletedPetitions().values()) + for (Petition currPetition : _completedPetitions.values()) { if (currPetition == null) { @@ -221,7 +221,7 @@ public final class PetitionManager public boolean isPetitionInProcess() { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -244,7 +244,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); return (currPetition.getState() == PetitionState.IN_PROCESS); } @@ -252,7 +252,7 @@ public final class PetitionManager { if (player != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -283,7 +283,7 @@ public final class PetitionManager { if (petitioner != null) { - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -302,7 +302,7 @@ public final class PetitionManager private boolean isValidPetition(int petitionId) { - return getPendingPetitions().containsKey(petitionId); + return _pendingPetitions.containsKey(petitionId); } public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) @@ -312,7 +312,7 @@ public final class PetitionManager return false; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); if (currPetition.getResponder() != null) { @@ -330,7 +330,7 @@ public final class PetitionManager CreatureSay cs; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -363,12 +363,12 @@ public final class PetitionManager public void sendPendingPetitionList(L2PcInstance activeChar) { - final StringBuilder htmlContent = new StringBuilder(600 + (getPendingPetitionCount() * 300)); + final StringBuilder htmlContent = new StringBuilder(600 + (_pendingPetitions.size() * 300)); htmlContent.append("

There are no currently pending petitions.
Petition Menu

"); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - if (getPendingPetitionCount() == 0) + if (_pendingPetitions.size() == 0) { htmlContent.append(""); } @@ -379,7 +379,7 @@ public final class PetitionManager boolean color = true; int petcount = 0; - for (Petition currPetition : getPendingPetitions().values()) + for (Petition currPetition : _pendingPetitions.values()) { if (currPetition == null) { @@ -419,7 +419,7 @@ public final class PetitionManager // Create a new petition instance and add it to the list of pending petitions. final Petition newPetition = new Petition(petitioner, petitionText, petitionType); final int newPetitionId = newPetition.getId(); - getPendingPetitions().put(newPetitionId, newPetition); + _pendingPetitions.put(newPetitionId, newPetition); // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; @@ -440,7 +440,7 @@ public final class PetitionManager return; } - final Petition currPetition = getPendingPetitions().get(petitionId); + final Petition currPetition = _pendingPetitions.get(petitionId); final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); final NpcHtmlMessage html = new NpcHtmlMessage(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 964757069c..20b6c07319 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return getLeaderObjectId() == player.getObjectId(); + return getLeader().getObjectId() == player.getObjectId(); } /** @@ -171,7 +171,7 @@ public abstract class AbstractPlayerGroup */ public L2PcInstance getRandomPlayer() { - return getMembers().get(Rnd.get(getMemberCount())); + return getMembers().get(Rnd.get(getMembers().size())); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java index 1b0e62c021..83b903b671 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -277,7 +277,7 @@ public final class CharEffectList */ public int getBuffCount() { - return _actives != null ? (_buffCount.intValue() - _hiddenBuffs.get()) : 0; + return _actives != null ? (_buffCount.get() - _hiddenBuffs.get()) : 0; } /** @@ -287,7 +287,7 @@ public final class CharEffectList */ public int getDanceCount() { - return _danceCount.intValue(); + return _danceCount.get(); } /** @@ -297,7 +297,7 @@ public final class CharEffectList */ public int getTriggeredBuffCount() { - return _triggerBuffCount.intValue(); + return _triggerBuffCount.get(); } /** @@ -307,7 +307,7 @@ public final class CharEffectList */ public int getToggleCount() { - return _toggleCount.intValue(); + return _toggleCount.get(); } /** @@ -317,7 +317,7 @@ public final class CharEffectList */ public int getDebuffCount() { - return _debuffCount.intValue(); + return _debuffCount.get(); } /** @@ -352,7 +352,7 @@ public final class CharEffectList */ public void stopAllToggles() { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { // Ignore necessary toggles. stopEffects(b -> b.getSkill().isToggle() && !b.getSkill().isNecessaryToggle() && !b.getSkill().isIrreplacableBuff(), true, true); @@ -361,7 +361,7 @@ public final class CharEffectList public void stopAllTogglesOfGroup(int toggleGroup) { - if (getToggleCount() > 0) + if (_toggleCount.get() > 0) { stopEffects(b -> b.getSkill().isToggle() && (b.getSkill().getToggleGroupId() == toggleGroup), true, true); } @@ -508,7 +508,7 @@ public final class CharEffectList */ public void stopEffectsOnAction() { - if (_hasBuffsRemovedOnAnyAction.intValue() > 0) + if (_hasBuffsRemovedOnAnyAction.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnAnyActionExceptMove(), true, true); } @@ -516,7 +516,7 @@ public final class CharEffectList public void stopEffectsOnDamage() { - if (_hasBuffsRemovedOnDamage.intValue() > 0) + if (_hasBuffsRemovedOnDamage.get() > 0) { stopEffects(info -> info.getSkill().isRemovedOnDamage(), true, true); } @@ -535,16 +535,16 @@ public final class CharEffectList { case TRIGGER: { - return (getTriggeredBuffCount() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); + return (_triggerBuffCount.get() > Config.TRIGGERED_BUFFS_MAX_AMOUNT); } case DANCE: { - return (getDanceCount() > Config.DANCES_MAX_AMOUNT); + return (_danceCount.get() > Config.DANCES_MAX_AMOUNT); } // case TOGGLE: Do toggles have limit? case DEBUFF: { - return (getDebuffCount() > 24); + return (_debuffCount.get() > 24); } case BUFF: { @@ -1106,7 +1106,7 @@ public final class CharEffectList final Skill skill = info.getSkill(); // Handle hidden buffs. Check if there was such abnormal before so we can continue. - if ((getHiddenBuffsCount() > 0) && _stackedEffects.contains(skill.getAbnormalType())) + if ((_hiddenBuffs.get() > 0) && _stackedEffects.contains(skill.getAbnormalType())) { // If incoming buff isnt hidden, remove any hidden buffs with its abnormal type. if (info.isInUse()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 8de8a2fb0e..2265d6876c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -71,7 +71,7 @@ public class CursedWeapon implements INamable private ScheduledFuture _removeTask; private int _nbKills = 0; - private long _endTime = 0; + long _endTime = 0; private int _playerId = 0; protected L2PcInstance _player = null; @@ -238,7 +238,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (System.currentTimeMillis() >= getEndTime()) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java index 2e13b5d8d6..772f812e21 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java @@ -110,7 +110,7 @@ public class Fishing public synchronized void startFishing() { - if (isFishing()) + if (_isFishing) { return; } @@ -132,7 +132,7 @@ public class Fishing if (!canFish()) { - if (isFishing()) + if (_isFishing) { _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); } @@ -182,7 +182,7 @@ public class Fishing return; } - if (_player.isInCraftMode() || _player.isInStoreMode()) + if (_player.isCrafting() || _player.isInStoreMode()) { _player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -201,7 +201,7 @@ public class Fishing _baitLocation = calculateBaitLocation(); if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null)) { - if (isFishing()) + if (_isFishing) { // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); _player.sendPacket(ActionFailed.STATIC_PACKET); @@ -262,7 +262,7 @@ public class Fishing private void reelIn(FishingEndReason reason, boolean consumeBait) { - if (!isFishing()) + if (!_isFishing) { return; } @@ -326,7 +326,7 @@ public class Fishing public synchronized void stopFishing(FishingEndType endType) { - if (isFishing()) + if (_isFishing) { reelIn(FishingEndReason.STOP, false); _isFishing = false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index ec834bcb34..c05e0915be 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -177,7 +177,7 @@ public final class L2ArmorSet public int getLowestSetEnchant(L2PcInstance player) { // Player don't have full set - if (getPiecesCount(player, L2ItemInstance::getId) < getMinimumPieces()) + if (getPiecesCount(player, L2ItemInstance::getId) < _minimumPieces) { return 0; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java index a682fc1ce7..85cd93e136 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -170,7 +170,7 @@ public class L2Clan implements IIdentifiable, INamable _clanId = clanId; initializePrivs(); restore(); - getWarehouse().restore(); + _warehouse.restore(); final ClanRewardBonus availableOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(this); if ((_lastMembersOnlineBonus == null) && (availableOnlineBonus != null)) @@ -242,7 +242,7 @@ public class L2Clan implements IIdentifiable, INamable public void setNewLeader(L2ClanMember member) { final L2PcInstance newLeader = member.getPlayerInstance(); - final L2ClanMember exMember = getLeader(); + final L2ClanMember exMember = _leader; final L2PcInstance exLeader = exMember.getPlayerInstance(); // Notify to scripts @@ -278,7 +278,7 @@ public class L2Clan implements IIdentifiable, INamable } setLeader(member); - if (getNewLeaderId() != 0) + if (_newLeaderId != 0) { setNewLeaderId(0, true); } @@ -330,7 +330,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_leader == null) { - LOGGER.warning("Clan " + getName() + " without clan leader!"); + LOGGER.warning("Clan " + _name + " without clan leader!"); return ""; } return _leader.getName(); @@ -570,7 +570,7 @@ public class L2Clan implements IIdentifiable, INamable { case 0: { - switch (getLevel()) + switch (_level) { case 3: { @@ -608,7 +608,7 @@ public class L2Clan implements IIdentifiable, INamable case 100: case 200: { - switch (getLevel()) + switch (_level) { case 11: { @@ -628,7 +628,7 @@ public class L2Clan implements IIdentifiable, INamable case 2001: case 2002: { - switch (getLevel()) + switch (_level) { case 9: case 10: @@ -882,8 +882,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodAllianceCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodAllianceCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -926,8 +926,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) { - ps.setInt(1, getBloodOathCount()); - ps.setInt(2, getId()); + ps.setInt(1, _bloodOathCount); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -942,8 +942,8 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) { - ps.setInt(1, getReputationScore()); - ps.setInt(2, getId()); + ps.setInt(1, _reputationScore); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -978,15 +978,15 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) { ps.setInt(1, getLeaderId()); - ps.setInt(2, getAllyId()); - ps.setString(3, getAllyName()); - ps.setInt(4, getReputationScore()); - ps.setLong(5, getAllyPenaltyExpiryTime()); - ps.setInt(6, getAllyPenaltyType()); - ps.setLong(7, getCharPenaltyExpiryTime()); - ps.setLong(8, getDissolvingExpiryTime()); - ps.setInt(9, getNewLeaderId()); - ps.setInt(10, getId()); + ps.setInt(2, _allyId); + ps.setString(3, _allyName); + ps.setInt(4, _reputationScore); + ps.setLong(5, _allyPenaltyExpiryTime); + ps.setInt(6, _allyPenaltyType); + ps.setLong(7, _charPenaltyExpiryTime); + ps.setLong(8, _dissolvingExpiryTime); + ps.setInt(9, _newLeaderId); + ps.setInt(10, _clanId); ps.execute(); } catch (Exception e) @@ -1015,19 +1015,19 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_CLAN_DATA)) { - ps.setInt(1, getId()); - ps.setString(2, getName()); - ps.setInt(3, getLevel()); - ps.setInt(4, getCastleId()); - ps.setInt(5, getBloodAllianceCount()); - ps.setInt(6, getBloodOathCount()); - ps.setInt(7, getAllyId()); - ps.setString(8, getAllyName()); + ps.setInt(1, _clanId); + ps.setString(2, _name); + ps.setInt(3, _level); + ps.setInt(4, _castleId); + ps.setInt(5, _bloodAllianceCount); + ps.setInt(6, _bloodOathCount); + ps.setInt(7, _allyId); + ps.setString(8, _allyName); ps.setInt(9, getLeaderId()); - ps.setInt(10, getCrestId()); - ps.setInt(11, getCrestLargeId()); - ps.setInt(12, getAllyCrestId()); - ps.setInt(13, getNewLeaderId()); + ps.setInt(10, _crestId); + ps.setInt(11, _crestLargeId); + ps.setInt(12, _allyCrestId); + ps.setInt(13, _newLeaderId); ps.execute(); } catch (Exception e) @@ -1071,7 +1071,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CLAN_DATA)) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet clanData = ps.executeQuery()) { if (clanData.next()) @@ -1084,12 +1084,12 @@ public class L2Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((getCharPenaltyExpiryTime() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1109,7 +1109,7 @@ public class L2Clan implements IIdentifiable, INamable try (PreparedStatement select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) { - select.setInt(1, getId()); + select.setInt(1, _clanId); try (ResultSet clanMember = select.executeQuery()) { L2ClanMember member = null; @@ -1146,7 +1146,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet noticeData = ps.executeQuery()) { while (noticeData.next()) @@ -1177,7 +1177,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setString(2, notice); if (enabled) { @@ -1237,7 +1237,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { // Go though the recordset of this SQL query @@ -1364,7 +1364,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, newSkill.getLevel()); ps.setInt(2, oldSkill.getId()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.execute(); } } @@ -1372,7 +1372,7 @@ public class L2Clan implements IIdentifiable, INamable { try (PreparedStatement ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, newSkill.getId()); ps.setInt(3, newSkill.getLevel()); ps.setString(4, newSkill.getName()); @@ -1612,7 +1612,7 @@ public class L2Clan implements IIdentifiable, INamable @Override public String toString() { - return getName() + "[" + getId() + "]"; + return _name + "[" + _clanId + "]"; } public ItemContainer getWarehouse() @@ -1765,7 +1765,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) { // Retrieve all subpledges of this clan from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); try (ResultSet rset = ps.executeQuery()) { while (rset.next()) @@ -1855,7 +1855,7 @@ public class L2Clan implements IIdentifiable, INamable // Royal Guard 5000 points per each // Order of Knights 10000 points per each - if ((pledgeType != -1) && (((getReputationScore() < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) + if ((pledgeType != -1) && (((_reputationScore < Config.ROYAL_GUARD_COST) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < Config.KNIGHT_UNIT_COST) && (pledgeType > SUBUNIT_ROYAL2)))) { player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_IS_TOO_LOW); return null; @@ -1864,7 +1864,7 @@ public class L2Clan implements IIdentifiable, INamable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) { - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, pledgeType); ps.setString(3, subPledgeName); ps.setInt(4, pledgeType != -1 ? leaderId : 0); @@ -1879,11 +1879,11 @@ public class L2Clan implements IIdentifiable, INamable // Order of Knights 10000 points per each if (pledgeType < SUBUNIT_KNIGHT1) { - setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true); + setReputationScore(_reputationScore - Config.ROYAL_GUARD_COST, true); } else { - setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true); + setReputationScore(_reputationScore - Config.KNIGHT_UNIT_COST, true); // TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST } } @@ -1949,7 +1949,7 @@ public class L2Clan implements IIdentifiable, INamable { ps.setInt(1, getSubPledge(pledgeType).getLeaderId()); ps.setString(2, getSubPledge(pledgeType).getName()); - ps.setInt(3, getId()); + ps.setInt(3, _clanId); ps.setInt(4, pledgeType); ps.execute(); } @@ -1965,7 +1965,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("SELECT privs,rank,party FROM clan_privs WHERE clan_id=?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); // LOGGER.warning("clanPrivs restore for ClanId : "+getClanId()); try (ResultSet rset = ps.executeQuery()) { @@ -2014,7 +2014,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE privs = ?")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2026,7 +2026,7 @@ public class L2Clan implements IIdentifiable, INamable LOGGER.log(Level.WARNING, "Could not store clan privs for rank: " + e.getMessage(), e); } - for (L2ClanMember cm : getMembers()) + for (L2ClanMember cm : _members.values()) { if (cm.isOnline()) { @@ -2050,7 +2050,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("INSERT INTO clan_privs (clan_id,rank,party,privs) VALUES (?,?,?,?)")) { // Retrieve all skills of this L2PcInstance from the database - ps.setInt(1, getId()); + ps.setInt(1, _clanId); ps.setInt(2, rank); ps.setInt(3, 0); ps.setInt(4, privs); @@ -2090,12 +2090,12 @@ public class L2Clan implements IIdentifiable, INamable public synchronized void addReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() + value, save); + setReputationScore(_reputationScore + value, save); } public synchronized void takeReputationScore(int value, boolean save) { - setReputationScore(getReputationScore() - value, save); + setReputationScore(_reputationScore - value, save); } private void setReputationScore(int value, boolean save) @@ -2169,7 +2169,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) { ps.setInt(1, id); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2206,7 +2206,7 @@ public class L2Clan implements IIdentifiable, INamable activeChar.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { activeChar.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2238,7 +2238,7 @@ public class L2Clan implements IIdentifiable, INamable if (pledgeType == 0) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_FULL_AND_CANNOT_ACCEPT_ADDITIONAL_CLAN_MEMBERS_AT_THIS_TIME); - sm.addString(getName()); + sm.addString(_name); activeChar.sendPacket(sm); } else @@ -2390,22 +2390,22 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); return; } - if (getAllyId() != 0) + if (_allyId != 0) { player.sendPacket(SystemMessageId.YOU_ALREADY_BELONG_TO_ANOTHER_ALLIANCE); return; } - if (getLevel() < 5) + if (_level < 5) { player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (getDissolvingExpiryTime() > System.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2426,7 +2426,7 @@ public class L2Clan implements IIdentifiable, INamable return; } - setAllyId(getId()); + setAllyId(_clanId); setAllyName(allyName.trim()); setAllyPenaltyExpiryTime(0, 0); updateClanInDB(); @@ -2439,12 +2439,12 @@ public class L2Clan implements IIdentifiable, INamable public void dissolveAlly(L2PcInstance player) { - if (getAllyId() == 0) + if (_allyId == 0) { player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return; } - if (!player.isClanLeader() || (getId() != getAllyId())) + if (!player.isClanLeader() || (_clanId != _allyId)) { player.sendPacket(SystemMessageId.THIS_FEATURE_IS_ONLY_AVAILABLE_TO_ALLIANCE_LEADERS); return; @@ -2483,7 +2483,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (System.currentTimeMillis() < getDissolvingExpiryTime()) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2492,12 +2492,12 @@ public class L2Clan implements IIdentifiable, INamable boolean increaseClanLevel = false; // Such as https://l2wiki.com/classic/Clans_–_Clan_Level - switch (getLevel()) + switch (_level) { case 0: { // Upgrade to 1 - if ((player.getSp() >= 1000) && (player.getAdena() >= 150000) && (getMembersCount() >= 1)) + if ((player.getSp() >= 1000) && (player.getAdena() >= 150000) && (_members.size() >= 1)) { if (player.reduceAdena("ClanLvl", 150000, player.getTarget(), true)) { @@ -2513,7 +2513,7 @@ public class L2Clan implements IIdentifiable, INamable case 1: { // Upgrade to 2 - if ((player.getSp() >= 15000) && (player.getAdena() >= 300000) && (getMembersCount() >= 1)) + if ((player.getSp() >= 15000) && (player.getAdena() >= 300000) && (_members.size() >= 1)) { if (player.reduceAdena("ClanLvl", 300000, player.getTarget(), true)) { @@ -2529,7 +2529,7 @@ public class L2Clan implements IIdentifiable, INamable case 2: { // Upgrade to 3 - if ((player.getSp() >= 100000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 100000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 100, player.getTarget(), true)) @@ -2549,7 +2549,7 @@ public class L2Clan implements IIdentifiable, INamable case 3: { // Upgrade to 4 - if ((player.getSp() >= 1000000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 1000000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 5000, player.getTarget(), true)) @@ -2569,7 +2569,7 @@ public class L2Clan implements IIdentifiable, INamable case 4: { // Upgrade to 5 - if ((player.getSp() >= 5000000) && (player.getInventory().getItemByItemId(1419) != null) && (getMembersCount() >= 1)) + if ((player.getSp() >= 5000000) && (player.getInventory().getItemByItemId(1419) != null) && (_members.size() >= 1)) { // itemId 1419 == Blood Mark if (player.destroyItemByItemId("ClanLvl", 1419, 10000, player.getTarget(), true)) @@ -2605,7 +2605,7 @@ public class L2Clan implements IIdentifiable, INamable player.sendItemList(false); - changeLevel(getLevel() + 1); + changeLevel(_level + 1); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanLvlUp(player, this)); @@ -2618,7 +2618,7 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) { ps.setInt(1, level); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.execute(); } catch (Exception e) @@ -2628,9 +2628,9 @@ public class L2Clan implements IIdentifiable, INamable setLevel(level); - if (getLeader().isOnline()) + if (_leader.isOnline()) { - final L2PcInstance leader = getLeader().getPlayerInstance(); + final L2PcInstance leader = _leader.getPlayerInstance(); if (level > 4) { SiegeManager.getInstance().addSiegeSkills(leader); @@ -2653,7 +2653,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeClanCrest(int crestId) { - if (getCrestId() != 0) + if (_crestId != 0) { CrestTable.getInstance().removeCrest(getCrestId()); } @@ -2664,12 +2664,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -2686,15 +2686,15 @@ public class L2Clan implements IIdentifiable, INamable public void changeAllyCrest(int crestId, boolean onlyThisClan) { String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?"; - int allyId = getId(); + int allyId = _clanId; if (!onlyThisClan) { - if (getAllyCrestId() != 0) + if (_allyCrestId != 0) { CrestTable.getInstance().removeCrest(getAllyCrestId()); } sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?"; - allyId = getAllyId(); + allyId = _allyId; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -2736,7 +2736,7 @@ public class L2Clan implements IIdentifiable, INamable */ public void changeLargeCrest(int crestId) { - if (getCrestLargeId() != 0) + if (_crestLargeId != 0) { CrestTable.getInstance().removeCrest(getCrestLargeId()); } @@ -2747,12 +2747,12 @@ public class L2Clan implements IIdentifiable, INamable PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) { ps.setInt(1, crestId); - ps.setInt(2, getId()); + ps.setInt(2, _clanId); ps.executeUpdate(); } catch (SQLException e) { - LOGGER.log(Level.WARNING, "Could not update large crest for clan " + getName() + " [" + getId() + "] : " + e.getMessage(), e); + LOGGER.log(Level.WARNING, "Could not update large crest for clan " + _name + " [" + _clanId + "] : " + e.getMessage(), e); } for (L2PcInstance member : getOnlineMembers(0)) @@ -3022,7 +3022,7 @@ public class L2Clan implements IIdentifiable, INamable getVariables().set("PREVIOUS_HUNTING_POINTS", getHuntingPoints()); // Reset - getMembers().forEach(L2ClanMember::resetBonus); + _members.values().forEach(L2ClanMember::resetBonus); getVariables().remove("HUNTING_POINTS"); // force store @@ -3040,7 +3040,7 @@ public class L2Clan implements IIdentifiable, INamable { if (_vars == null) { - _vars = new ClanVariables(getId()); + _vars = new ClanVariables(_clanId); if (Config.CLAN_VARIABLES_STORE_INTERVAL > 0) { ThreadPool.scheduleAtFixedRate(this::storeVariables, Config.CLAN_VARIABLES_STORE_INTERVAL, Config.CLAN_VARIABLES_STORE_INTERVAL); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ClanMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ClanMember.java index 7f0fa86028..8827f75a89 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ClanMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2ClanMember.java @@ -855,7 +855,6 @@ public class L2ClanMember private PlayerVariables getVariables() { - final L2PcInstance player = getPlayerInstance(); - return player != null ? player.getVariables() : new PlayerVariables(_objectId); + return _player != null ? _player.getVariables() : new PlayerVariables(_objectId); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index d91e7e0554..df5da1b8ba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -162,7 +162,7 @@ public class L2CommandChannel extends AbstractPlayerGroup public List getMembers() { final List members = new LinkedList<>(); - for (L2Party party : getPartys()) + for (L2Party party : _parties) { members.addAll(party.getMembers()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Crest.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Crest.java index dc3c3497a3..24eedf1679 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -94,42 +94,41 @@ public final class L2Crest implements IIdentifiable public String getClientPath(L2PcInstance activeChar) { String path = null; - switch (getType()) + switch (_type) { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new PledgeCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } case PLEDGE_LARGE: { - final byte[] data = getData(); - if (data != null) + if (_data != null) { for (int i = 0; i <= 4; i++) { if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); - activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); + System.arraycopy(_data, (14336 * i), fullChunk, 0, 14336); + activeChar.sendPacket(new ExPledgeEmblem(_id, fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); - activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); + System.arraycopy(_data, (14336 * i), lastChunk, 0, 8320); + activeChar.sendPacket(new ExPledgeEmblem(_id, lastChunk, 0, i)); } } } - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId() + "_l"; + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id + "_l"; break; } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); - path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); + activeChar.sendPacket(new AllyCrest(_id, _data)); + path = "Crest.crest_" + Config.SERVER_ID + "_" + _id; break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Mentee.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Mentee.java index a1eb3d2480..5c086b9d83 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Mentee.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Mentee.java @@ -52,7 +52,7 @@ public class L2Mentee try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT char_name, level, base_class FROM characters WHERE charId = ?")) { - statement.setInt(1, getObjectId()); + statement.setInt(1, _objectId); try (ResultSet rset = statement.executeQuery()) { if (rset.next()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java index 171ad1e543..70a2a9e6e2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Object.java @@ -148,15 +148,10 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean decayMe() { - final L2WorldRegion reg = getWorldRegion(); - synchronized (this) - { - _isSpawned = false; - setWorldRegion(null); - } - - L2World.getInstance().removeVisibleObject(this, reg); + _isSpawned = false; + L2World.getInstance().removeVisibleObject(this, _worldRegion); L2World.getInstance().removeObject(this); + setWorldRegion(null); return true; } @@ -180,7 +175,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab L2World.getInstance().addObject(this); // Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion - getWorldRegion().addVisibleObject(this); + _worldRegion.addVisibleObject(this); } // this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks @@ -242,7 +237,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final boolean isSpawned() { - return getWorldRegion() != null; + return _worldRegion != null; } public final void setSpawned(boolean value) @@ -632,7 +627,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public Location getLocation() { - return new Location(getX(), getY(), getZ(), getHeading()); + return new Location(_x.get(), _y.get(), _z.get(), _heading.get()); } /** @@ -680,13 +675,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab if (_isSpawned) { - final L2WorldRegion oldRegion = getWorldRegion(); final L2WorldRegion newRegion = L2World.getInstance().getRegion(this); - if ((newRegion != null) && (newRegion != oldRegion)) + if ((newRegion != null) && (newRegion != _worldRegion)) { - if (oldRegion != null) + if (_worldRegion != null) { - oldRegion.removeVisibleObject(this); + _worldRegion.removeVisibleObject(this); } newRegion.addVisibleObject(this); L2World.getInstance().switchRegion(this, newRegion); @@ -781,7 +775,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { - final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); + final double distance = Math.pow(x - _x.get(), 2) + Math.pow(y - _y.get(), 2) + (includeZAxis ? Math.pow(z - _z.get(), 2) : 0); return squared ? distance : Math.sqrt(distance); } @@ -806,7 +800,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public final double calculateDirectionTo(ILocational target) { - int heading = Util.calculateHeadingFrom(this, target) - getHeading(); + int heading = Util.calculateHeadingFrom(this, target) - _heading.get(); if (heading < 0) { heading = 65535 + heading; @@ -851,7 +845,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab */ public boolean isVisibleFor(L2PcInstance player) { - return !isInvisible() || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); + return !_isInvisible || player.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS); } /** @@ -880,19 +874,18 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab return false; } - final L2WorldRegion worldRegion1 = worldObject.getWorldRegion(); - if (worldRegion1 == null) + final L2WorldRegion worldRegion = worldObject.getWorldRegion(); + if (worldRegion == null) { return false; } - final L2WorldRegion worldRegion2 = getWorldRegion(); - if (worldRegion2 == null) + if (_worldRegion == null) { return false; } - return worldRegion1.isSurroundingRegion(worldRegion2); + return worldRegion.isSurroundingRegion(_worldRegion); } @Override @@ -904,6 +897,6 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public String toString() { - return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; + return getClass().getSimpleName() + ":" + _name + "[" + _objectId + "]"; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java index 9636853228..d01a52009e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java @@ -168,7 +168,7 @@ public class L2Party extends AbstractPlayerGroup private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) { final List availableMembers = new ArrayList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -195,7 +195,7 @@ public class L2Party extends AbstractPlayerGroup L2PcInstance member; try { - member = getMembers().get(_itemLastLoot); + member = _members.get(_itemLastLoot); if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { return member; @@ -260,7 +260,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembersNewLeader() { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -279,7 +279,7 @@ public class L2Party extends AbstractPlayerGroup */ public void broadcastToPartyMembers(L2PcInstance player, IClientOutgoingPacket msg) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if ((member != null) && (member.getObjectId() != player.getObjectId())) { @@ -294,7 +294,7 @@ public class L2Party extends AbstractPlayerGroup */ public void addPartyMember(L2PcInstance player) { - if (getMembers().contains(player)) + if (_members.contains(player)) { return; } @@ -305,14 +305,14 @@ public class L2Party extends AbstractPlayerGroup } // add player to party - getMembers().add(player); + _members.add(player); // sends new member party window for all members // we do all actions before adding member to a list, this speeds things up a little player.sendPacket(new PartySmallWindowAll(player, this)); // sends pets/summons of party members - for (L2PcInstance pMember : getMembers()) + for (L2PcInstance pMember : _members) { if (pMember != null) { @@ -333,7 +333,7 @@ public class L2Party extends AbstractPlayerGroup msg.addString(player.getName()); broadcastPacket(msg); - getMembers().stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); + _members.stream().filter(member -> member != player).forEach(member -> member.sendPacket(new PartySmallWindowAdd(player, this))); // send the position of all party members to the new party member // player.sendPacket(new PartyMemberPosition(this)); @@ -357,7 +357,7 @@ public class L2Party extends AbstractPlayerGroup // update partySpelled L2Summon summon; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member != null) { @@ -439,7 +439,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(target, tacticalSignId)); m.sendPacket(sm); @@ -450,7 +450,7 @@ public class L2Party extends AbstractPlayerGroup // Sign already assigned // If the sign is applied on the same target, remove it _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); + _members.forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); } else { @@ -462,7 +462,7 @@ public class L2Party extends AbstractPlayerGroup sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); - getMembers().forEach(m -> + _members.forEach(m -> { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); @@ -502,19 +502,19 @@ public class L2Party extends AbstractPlayerGroup */ public void removePartyMember(L2PcInstance player, MessageType type) { - if (getMembers().contains(player)) + if (_members.contains(player)) { final boolean isLeader = isLeader(player); if (!_disbanding) { - if ((getMembers().size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) + if ((_members.size() == 2) || (isLeader && !Config.ALT_LEAVE_PARTY_LEADER && (type != MessageType.DISCONNECTED))) { disbandParty(); return; } } - getMembers().remove(player); + _members.remove(player); recalculatePartyLevel(); if (player.isInDuel()) @@ -573,25 +573,25 @@ public class L2Party extends AbstractPlayerGroup { player.sendPacket(ExCloseMPCC.STATIC_PACKET); } - if (isLeader && (getMembers().size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) + if (isLeader && (_members.size() > 1) && (Config.ALT_LEAVE_PARTY_LEADER || (type == MessageType.DISCONNECTED))) { msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); broadcastPacket(msg); broadcastToPartyMembersNewLeader(); } - else if (getMembers().size() == 1) + else if (_members.size() == 1) { if (isInCommandChannel()) { // delete the whole command channel when the party who opened the channel is disbanded - if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) + if (_commandChannel.getLeader().getObjectId() == getLeader().getObjectId()) { - getCommandChannel().disbandChannel(); + _commandChannel.disbandChannel(); } else { - getCommandChannel().removeParty(this); + _commandChannel.removeParty(this); } } @@ -653,7 +653,7 @@ public class L2Party extends AbstractPlayerGroup { if ((player != null) && !player.isInDuel()) { - if (getMembers().contains(player)) + if (_members.contains(player)) { if (isLeader(player)) { @@ -663,9 +663,9 @@ public class L2Party extends AbstractPlayerGroup { // Swap party members final L2PcInstance temp = getLeader(); - final int p1 = getMembers().indexOf(player); - getMembers().set(0, player); - getMembers().set(p1, temp); + final int p1 = _members.indexOf(player); + _members.set(0, player); + _members.set(p1, temp); SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_THE_PARTY_LEADER); msg.addString(getLeader().getName()); @@ -694,7 +694,7 @@ public class L2Party extends AbstractPlayerGroup */ private L2PcInstance getPlayerByName(String name) { - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member.getName().equalsIgnoreCase(name)) { @@ -800,7 +800,7 @@ public class L2Party extends AbstractPlayerGroup // Check the number of party members that must be rewarded // (The party member must be in range to receive its reward) final List toReward = new LinkedList<>(); - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) { @@ -930,11 +930,11 @@ public class L2Party extends AbstractPlayerGroup public void recalculatePartyLevel() { int newLevel = 0; - for (L2PcInstance member : getMembers()) + for (L2PcInstance member : _members) { if (member == null) { - getMembers().remove(member); + _members.remove(member); continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2SiegeClan.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2SiegeClan.java index 2ba2a8a219..57266247c3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2SiegeClan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2SiegeClan.java @@ -53,12 +53,12 @@ public class L2SiegeClan flag.deleteMe(); - return getFlag().remove(flag); + return _flags.remove(flag); } public void removeFlags() { - for (L2Npc flag : getFlag()) + for (L2Npc flag : _flags) { removeFlag(flag); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java index 1b7cb26b50..f36fed74eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -511,7 +511,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable newlocz = loc.getZ(); setLocation(loc); } - else if ((getX() == 0) && (getY() == 0)) + else if ((_location.getX() == 0) && (_location.getY() == 0)) { LOGGER.warning("NPC " + npc + " doesn't have spawn location!"); return null; @@ -519,9 +519,9 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable else { // The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz) - newlocx = getX(); - newlocy = getY(); - newlocz = getZ(); + newlocx = _location.getX(); + newlocy = _location.getY(); + newlocz = _location.getZ(); } // If random spawn system is enabled @@ -539,16 +539,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable } // Set is not random walk default value - npc.setRandomWalking(getRandomWalking()); + npc.setRandomWalking(_randomWalk); // Set the heading of the L2NpcInstance (random heading if not defined) - if (getHeading() == -1) + if (_location.getHeading() == -1) { npc.setHeading(Rnd.nextInt(61794)); } else { - npc.setHeading(getHeading()); + npc.setHeading(_location.getHeading()); } // Set custom Npc server side name and title @@ -670,7 +670,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable @Override public String toString() { - return "L2Spawn ID: " + getId() + " " + getLocation(); + return "L2Spawn ID: " + _template.getId() + " " + _location; } public final boolean getRandomWalking() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 97608b326d..4a88a92311 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -238,7 +238,7 @@ public final class L2WorldRegion if (object.isPlayable()) { // if this is the first player to enter the region, activate self & neighbors - if (!isActive() && (!Config.GRIDS_ALWAYS_ON)) + if (!_active && (!Config.GRIDS_ALWAYS_ON)) { startActivation(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java index 4b5e290517..3794527a37 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Location.java @@ -190,6 +190,6 @@ public class Location implements IPositionable @Override public String toString() { - return "[" + getClass().getSimpleName() + "] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading; + return "[" + getClass().getSimpleName() + "] X: " + _x + " Y: " + _y + " Z: " + _z + " Heading: " + _heading; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java index 4eb38cf27b..ef36048457 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -136,16 +136,16 @@ public final class MobGroup public void spawnGroup(int x, int y, int z) { - if (getActiveMobCount() > 0) + if (getMobs().size() > 0) { return; } try { - for (int i = 0; i < getMaxMobCount(); i++) + for (int i = 0; i < _maxMobCount; i++) { - final L2GroupSpawn spawn = new L2GroupSpawn(getTemplate()); + final L2GroupSpawn spawn = new L2GroupSpawn(_npcTemplate); final int signX = (Rnd.nextInt(2) == 0) ? -1 : 1; final int signY = (Rnd.nextInt(2) == 0) ? -1 : 1; @@ -200,12 +200,12 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return null; } - int choice = Rnd.nextInt(getActiveMobCount()); + int choice = Rnd.nextInt(getMobs().size()); for (L2ControllableMobInstance mob : getMobs()) { if (--choice == 0) @@ -220,7 +220,7 @@ public final class MobGroup { removeDead(); - if (getActiveMobCount() == 0) + if (getMobs().size() == 0) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroupTable.java index da1b620a40..121e34e9c4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -70,7 +70,7 @@ public class MobGroupTable public MobGroup[] getGroups() { - return _groupMap.values().toArray(new MobGroup[getGroupCount()]); + return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Petition.java index cbed80441a..ff4816d7ef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Petition.java @@ -67,34 +67,34 @@ public final class Petition { setState(endState); - if ((getResponder() != null) && getResponder().isOnline()) + if ((_responder != null) && _responder.isOnline()) { if (endState == PetitionState.RESPONDER_REJECT) { - getPetitioner().sendMessage("Your petition was rejected. Please try again later."); + _petitioner.sendMessage("Your petition was rejected. Please try again later."); } else { // Ending petition consultation with . SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CONSULTATION_WITH_C1_HAS_ENDED); - sm.addString(getPetitioner().getName()); - getResponder().sendPacket(sm); + sm.addString(_petitioner.getName()); + _responder.sendPacket(sm); if (endState == PetitionState.PETITIONER_CANCEL) { // Receipt No. petition cancelled. sm = SystemMessage.getSystemMessage(SystemMessageId.RECEIPT_NO_S1_PETITION_CANCELLED); - sm.addInt(getId()); - getResponder().sendPacket(sm); + sm.addInt(_id); + _responder.sendPacket(sm); } } } // End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button - if ((getPetitioner() != null) && getPetitioner().isOnline()) + if ((_petitioner != null) && _petitioner.isOnline()) { - getPetitioner().sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); - getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET); + _petitioner.sendPacket(SystemMessageId.THIS_ENDS_THE_GM_PETITION_CONSULTATION_NPLEASE_GIVE_US_FEEDBACK_ON_THE_PETITION_SERVICE); + _petitioner.sendPacket(PetitionVotePacket.STATIC_PACKET); } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); @@ -138,7 +138,7 @@ public final class Petition public void sendPetitionerPacket(IClientOutgoingPacket responsePacket) { - if ((getPetitioner() == null) || !getPetitioner().isOnline()) + if ((_petitioner == null) || !_petitioner.isOnline()) { // Allows petitioners to see the results of their petition when // they log back into the game. @@ -147,18 +147,18 @@ public final class Petition return; } - getPetitioner().sendPacket(responsePacket); + _petitioner.sendPacket(responsePacket); } public void sendResponderPacket(IClientOutgoingPacket responsePacket) { - if ((getResponder() == null) || !getResponder().isOnline()) + if ((_responder == null) || !_responder.isOnline()) { endPetitionConsultation(PetitionState.RESPONDER_MISSING); return; } - getResponder().sendPacket(responsePacket); + _responder.sendPacket(responsePacket); } public void setState(PetitionState state) @@ -168,7 +168,7 @@ public final class Petition public void setResponder(L2PcInstance respondingAdmin) { - if (getResponder() != null) + if (_responder != null) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TempItem.java index fa918cfc55..db4b2f817f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TempItem.java @@ -28,7 +28,7 @@ public final class TempItem { private final int _itemId; private int _quantity; - private final int _referencePrice; + private final long _referencePrice; private final String _itemName; /** @@ -60,7 +60,7 @@ public final class TempItem _quantity = quantity; } - public int getReferencePrice() + public long getReferencePrice() { return _referencePrice; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java index 5799628a4b..e9a73532b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java @@ -150,11 +150,7 @@ public class TradeList { if (exclItem.getItem().getId() == item.getId()) { - if (item.getCount() <= exclItem.getCount()) - { - return null; - } - return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice()); + return item.getCount() <= exclItem.getCount() ? null : new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice()); } } } @@ -201,7 +197,7 @@ public class TradeList */ public synchronized TradeItem addItem(int objectId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -215,13 +211,13 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if (!(item.isTradeable() || (_owner.isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { LOGGER.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; } - if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) + if (!_owner.getInventory().canManipulateWithItemId(item.getId())) { LOGGER.warning(_owner.getName() + ": Attempt to add an item that can't manipualte!"); return null; @@ -271,7 +267,7 @@ public class TradeList */ public synchronized TradeItem addItemByItemId(int itemId, long count, long price) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -318,7 +314,7 @@ public class TradeList */ public synchronized TradeItem removeItem(int objectId, int itemId, long count) { - if (isLocked()) + if (_locked) { LOGGER.warning(_owner.getName() + ": Attempt to modify locked TradeList!"); return null; @@ -441,11 +437,7 @@ public class TradeList { partnerList.lock(); lock(); - if (!partnerList.validate()) - { - return false; - } - if (!validate()) + if (!partnerList.validate() || !validate()) { return false; } @@ -617,15 +609,15 @@ public class TradeList boolean success = false; // check weight and slots - if ((!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) + if ((!_owner.getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); - getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); + _owner.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if ((!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) + else if ((!_owner.getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); - getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); + _owner.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); } else { @@ -634,7 +626,7 @@ public class TradeList final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); // Transfer items - partnerList.TransferItems(getOwner(), partnerIU, ownerIU); + partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet @@ -659,7 +651,7 @@ public class TradeList } // Finish the trade partnerList.getOwner().onTradeFinish(success); - getOwner().onTradeFinish(success); + _owner.onTradeFinish(success); } /** @@ -715,7 +707,7 @@ public class TradeList // item with this objectId and price not found in tradelist if (!found) { - if (isPackaged()) + if (_packaged) { Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!", Config.DEFAULT_PUNISH); return 2; @@ -880,11 +872,7 @@ public class TradeList // Send inventory update packet _owner.sendInventoryUpdate(ownerIU); player.sendInventoryUpdate(playerIU); - if (ok) - { - return 0; - } - return 2; + return ok ? 0 : 2; } /** @@ -895,12 +883,7 @@ public class TradeList */ public synchronized boolean privateStoreSell(L2PcInstance player, ItemRequest[] requestedItems) { - if (_locked) - { - return false; - } - - if (!_owner.isOnline() || !player.isOnline()) + if (_locked || !_owner.isOnline() || !player.isOnline()) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 0acc52a711..00b850b661 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -208,7 +208,7 @@ public class L2Attackable extends L2Npc @Override public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) { - if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) + if (_isRaid && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) { if (_firstCommandChannelAttacked == null) // looting right isn't set { @@ -239,7 +239,7 @@ public class L2Attackable extends L2Npc addDamage(attacker, (int) value, skill); // Check Raidboss attack. Character will be petrified if attacking a raid that's more than 8 levels lower. In retail you deal damage to raid before curse. - if (isRaid() && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) + if (_isRaid && giveRaidCurse() && !Config.RAID_DISABLE_CURSE) { if (attacker.getLevel() > (getLevel() + 8)) { @@ -386,7 +386,7 @@ public class L2Attackable extends L2Npc } // Calculate raidboss points - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final L2PcInstance player = (maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker.getActingPlayer(); broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); @@ -480,7 +480,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -489,8 +489,8 @@ public class L2Attackable extends L2Npc exp *= penalty; // Check for an over-hit enabled strike - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -515,7 +515,7 @@ public class L2Attackable extends L2Npc } clan.addHuntingPoints(attacker, this, finalExp); } - attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, isRaid()), true, false); + attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); PcCafePointsManager.getInstance().givePcCafePoint(attacker, exp); } } @@ -592,7 +592,7 @@ public class L2Attackable extends L2Npc double exp = expSp[0]; double sp = expSp[1]; - if (Config.CHAMPION_ENABLE && isChampion()) + if (Config.CHAMPION_ENABLE && _champion) { exp *= Config.CHAMPION_REWARDS_EXP_SP; sp *= Config.CHAMPION_REWARDS_EXP_SP; @@ -603,8 +603,8 @@ public class L2Attackable extends L2Npc // Check for an over-hit enabled strike // (When in party, the over-hit exp bonus is given to the whole party and splitted proportionally through the party members) - final L2Character overhitAttacker = getOverhitAttacker(); - if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) + final L2Character overhitAttacker = _overhitAttacker; + if (_overhit && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) { attacker.sendPacket(SystemMessageId.OVER_HIT); exp += calculateOverhitExp(exp); @@ -984,7 +984,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS)))) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS)))) { // do nothing } @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc { final L2Item item = ItemTable.getInstance().getTemplate(drop.getId()); // Check if the autoLoot mode is active - if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!isRaid() && Config.AUTO_LOOT) || (isRaid() && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) + if (Config.AUTO_LOOT_ITEM_IDS.contains(item.getId()) || isFlying() || (!item.hasExImmediateEffect() && ((!_isRaid && Config.AUTO_LOOT) || (_isRaid && Config.AUTO_LOOT_RAIDS))) || (item.hasExImmediateEffect() && Config.AUTO_LOOT_HERBS)) { player.doAutoLoot(this, drop); // Give the item(s) to the L2PcInstance that has killed the L2Attackable } @@ -1036,7 +1036,7 @@ public class L2Attackable extends L2Npc } // Broadcast message if RaidBoss was defeated - if (isRaid() && !isRaidMinion()) + if (_isRaid && !_isRaidMinion) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); sm.addString(getName()); @@ -1048,7 +1048,7 @@ public class L2Attackable extends L2Npc } // Apply Special Item drop with random(rnd) quantity(qty) for champions. - if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) + if (Config.CHAMPION_ENABLE && _champion && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0))) { int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY); final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty); @@ -1230,7 +1230,7 @@ public class L2Attackable extends L2Npc */ public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) { - if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) + if ((sweeper.getObjectId() != _spoilerObjectId) && !sweeper.isInLooterParty(_spoilerObjectId)) { if (sendMessage) { @@ -1384,7 +1384,7 @@ public class L2Attackable extends L2Npc public double calculateOverhitExp(double exp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = ((_overhitDamage * 100) / getMaxHp()); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1458,7 +1458,7 @@ public class L2Attackable extends L2Npc if (Config.CHAMPION_ENABLE) { // Set champion on next spawn - if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) + if (isMonster() && !getTemplate().isUndying() && !_isRaid && !_isRaidMinion && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0))) { if (Rnd.get(100) < Config.CHAMPION_FREQUENCY) { @@ -1683,7 +1683,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return !isChampion() || Config.CHAMPION_ENABLE_VITALITY; + return !_champion || Config.CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b8662c6e57..a5d7f51aa7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -499,13 +499,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public double getCollisionRadius() { - final double defaultCollisionRadius = getTemplate().getCollisionRadius(); + final double defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } public double getCollisionHeight() { - final double defaultCollisionHeight = getTemplate().getCollisionHeight(); + final double defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -530,7 +530,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe protected void initCharStatusUpdateValues() { - _hpUpdateIncCheck = getMaxHp(); + _hpUpdateIncCheck = _stat.getMaxHp(); _hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX; _hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval; } @@ -550,9 +550,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Stop on creature see task and clear the data @@ -584,7 +584,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } try { - if (!isTeleporting()) + if (!_isTeleporting) { return; } @@ -649,8 +649,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ protected boolean needHpUpdate() { - final double currentHp = getCurrentHp(); - final double maxHp = getMaxHp(); + final double currentHp = _status.getCurrentHp(); + final double maxHp = _stat.getMaxHp(); if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) { @@ -703,8 +703,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // HP - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); - su.addUpdate(StatusUpdateType.CUR_HP, (int) getCurrentHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); + su.addUpdate(StatusUpdateType.CUR_HP, (int) _status.getCurrentHp()); // MP computeStatusUpdate(su, StatusUpdateType.MAX_MP); @@ -1053,7 +1053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe mpConsume = weaponItem.getReducedMpConsume(); } mpConsume = isAffected(EffectFlag.CHEAPSHOT) ? 0 : mpConsume; - if (getCurrentMp() < mpConsume) + if (_status.getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); @@ -1065,7 +1065,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // If L2PcInstance have enough MP, the bow consumes it if (mpConsume > 0) { - getStatus().reduceMp(mpConsume); + _status.reduceMp(mpConsume); } } } @@ -1073,7 +1073,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final WeaponType attackType = getAttackType(); final boolean isTwoHanded = (weaponItem != null) && (weaponItem.getBodyPart() == L2Item.SLOT_LR_HAND); - final int timeAtk = Formulas.calculateTimeBetweenAttacks(getPAtkSpd()); + final int timeAtk = Formulas.calculateTimeBetweenAttacks(_stat.getPAtkSpd()); final int timeToHit = Formulas.calculateTimeToHit(timeAtk, weaponType, isTwoHanded, false); _attackEndTime = System.nanoTime() + (TimeUnit.MILLISECONDS.toNanos(timeAtk)); @@ -1196,12 +1196,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599). - int attackCountMax = (int) getStat().getValue(Stats.ATTACK_COUNT_MAX, 1); - if ((attackCountMax > 1) && !(getStat().getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) + int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1); + if ((attackCountMax > 1) && !(_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0)) { final double headingAngle = Util.convertHeadingToDegree(getHeading()); - final int maxRadius = getStat().getPhysicalAttackRadius(); - final int physicalAttackAngle = getStat().getPhysicalAttackAngle(); + final int maxRadius = _stat.getPhysicalAttackRadius(); + final int physicalAttackAngle = _stat.getPhysicalAttackAngle(); for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius)) { // Skip main target. @@ -1251,7 +1251,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss) { shld = Formulas.calcShldUse(this, target); - crit = Formulas.calcCrit(getStat().getCriticalHit(), this, target, null); + crit = Formulas.calcCrit(_stat.getCriticalHit(), this, target, null); damage = (int) Formulas.calcAutoAttackDamage(this, target, shld, crit, shotConsumed); if (halfDamage) { @@ -1294,7 +1294,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Try casting the skill - final SkillCaster skillCaster = SkillCaster.castSkill(this, getTarget(), skill, item, castingType, ctrlPressed, shiftPressed); + final SkillCaster skillCaster = SkillCaster.castSkill(this, _target, skill, item, castingType, ctrlPressed, shiftPressed); if ((skillCaster == null) && isPlayer()) { // Skill casting failed, notify player. @@ -1612,7 +1612,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // killing is only possible one time synchronized (this) { - if (isDead()) + if (_isDead) { return false; } @@ -1636,7 +1636,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe stopMove(null); // Stop HP/MP/CP Regeneration task - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); if (isMonster()) { @@ -1676,9 +1676,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Removes itself from the summoned list. - if ((getSummoner() != null)) + if ((_summoner != null)) { - getSummoner().removeSummonedNpc(getObjectId()); + _summoner.removeSummonedNpc(getObjectId()); } // Remove all effects, do not broadcast changes. @@ -1696,26 +1696,26 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Sets HP, MP and CP and revives the L2Character. */ public void doRevive() { - if (!isDead()) + if (!_isDead) { return; } - if (!isTeleporting()) + if (!_isTeleporting) { setIsPendingRevive(false); setIsDead(false); - if ((Config.RESPAWN_RESTORE_CP > 0) && (getCurrentCp() < (getMaxCp() * Config.RESPAWN_RESTORE_CP))) + if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP))) { - _status.setCurrentCp(getMaxCp() * Config.RESPAWN_RESTORE_CP); + _status.setCurrentCp(_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP); } - if ((Config.RESPAWN_RESTORE_HP > 0) && (getCurrentHp() < (getMaxHp() * Config.RESPAWN_RESTORE_HP))) + if ((Config.RESPAWN_RESTORE_HP > 0) && (_status.getCurrentHp() < (_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP))) { - _status.setCurrentHp(getMaxHp() * Config.RESPAWN_RESTORE_HP); + _status.setCurrentHp(_stat.getMaxHp() * Config.RESPAWN_RESTORE_HP); } - if ((Config.RESPAWN_RESTORE_MP > 0) && (getCurrentMp() < (getMaxMp() * Config.RESPAWN_RESTORE_MP))) + if ((Config.RESPAWN_RESTORE_MP > 0) && (_status.getCurrentMp() < (_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP))) { - _status.setCurrentMp(getMaxMp() * Config.RESPAWN_RESTORE_MP); + _status.setCurrentMp(_stat.getMaxMp() * Config.RESPAWN_RESTORE_MP); } // Start broadcast status @@ -1855,7 +1855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public boolean isAttackingDisabled() { - return isFlying() || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled(); + return _isFlying || hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; } public final boolean isConfused() @@ -1915,7 +1915,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isMovementDisabled() { // check for isTeleporting to prevent teleport cheating (if appear packet not received) - return hasBlockActions() || isRooted() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting(); + return hasBlockActions() || isRooted() || _isOverloaded || _isImmobilized || isAlikeDead() || _isTeleporting; } public final boolean isOverloaded() @@ -1934,7 +1934,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isPendingRevive() { - return isDead() && _isPendingRevive; + return _isDead && _isPendingRevive; } public final void setIsPendingRevive(boolean value) @@ -2023,7 +2023,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } _isRunning = value; - if (getRunSpeed() != 0) + if (_stat.getRunSpeed() != 0) { broadcastPacket(new ChangeMoveType(this)); } @@ -2048,7 +2048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2379,7 +2379,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.STUN); + _effectList.stopEffects(AbnormalType.STUN); } if (!isPlayer()) @@ -2402,11 +2402,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (removeEffects) { - getEffectList().stopEffects(AbnormalType.TRANSFORM); - getEffectList().stopEffects(AbnormalType.CHANGEBODY); + _effectList.stopEffects(AbnormalType.TRANSFORM); + _effectList.stopEffects(AbnormalType.CHANGEBODY); } - if (isTransformed()) + if (_transform.isPresent()) { untransform(); } @@ -2517,7 +2517,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet. - if (isMoving() && (getMoveSpeed() <= 0)) + if (isMoving() && (_stat.getMoveSpeed() <= 0)) { stopMove(null); } @@ -2585,7 +2585,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxCp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp()); } break; } @@ -2597,7 +2597,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_HP, getMaxHp()); + su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp()); } break; } @@ -2609,7 +2609,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - su.addUpdate(StatusUpdateType.MAX_CP, getMaxMp()); + su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp()); } break; } @@ -2682,7 +2682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { player.sendPacket(new FakePlayerInfo((L2Npc) this)); } - else if (getRunSpeed() == 0) + else if (_stat.getRunSpeed() == 0) { player.sendPacket(new ServerObjectInfo((L2Npc) this, player)); } @@ -2924,7 +2924,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Z coordinate will follow client values dz = m._zDestination - zPrev; - final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); + final boolean isFloating = _isFlying || isInsideZone(ZoneId.WATER); double delta = (dx * dx) + (dy * dy); if ((delta < 10000) && ((dz * dz) > 2500) // close enough, allows error between client and server geodata if it cannot be avoided @@ -2940,7 +2940,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double distFraction = Double.MAX_VALUE; if (delta > 1) { - final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; + final double distPassed = (_stat.getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND; distFraction = distPassed / delta; } @@ -3147,7 +3147,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void moveToLocation(int x, int y, int z, int offset) { // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { return; @@ -3174,7 +3174,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe double dz = (z - curZ); double distance = Math.hypot(dx, dy); - final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); + final boolean verticalMovementOnly = _isFlying && (distance == 0) && (dz != 0); if (verticalMovementOnly) { distance = Math.abs(dz); @@ -3252,7 +3252,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m.onGeodataPathIndex = -1; // Initialize not on geodata path m.disregardingGeodata = false; - if (!isFlying() && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) + if (!_isFlying && !isInsideZone(ZoneId.WATER) && !isVehicle() && !_cursorKeyMovement) { final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null); if (isInVehicle) @@ -3381,7 +3381,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Apply Z distance for flying or swimming for correct timing calculations - if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) + if ((_isFlying || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) { distance = Math.hypot(distance, dz); } @@ -3428,7 +3428,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Get the Move Speed of the L2Charcater - final double speed = getMoveSpeed(); + final double speed = _stat.getMoveSpeed(); if ((speed <= 0) || isMovementDisabled()) { // Cancel the move action @@ -3623,7 +3623,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public void onHitTimeNotDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3652,7 +3652,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onFirstHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime, int attackTime, int delayForSecondAttack) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3682,7 +3682,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void onSecondHitTimeForDual(L2Weapon weapon, Attack attack, int hitTime1, int hitTime2, int attackTime) { - if (isAlikeDead()) + if (_isDead) { getAI().notifyEvent(CtrlEvent.EVT_CANCEL); return; @@ -3970,10 +3970,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Stop all effects of that skill if (oldSkill.isPassive()) { - getEffectList().stopSkillEffects(true, oldSkill); + _effectList.stopSkillEffects(true, oldSkill); } - getStat().recalculateStats(true); + _stat.recalculateStats(true); } if (newSkill.isPassive()) @@ -4008,7 +4008,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) { stopSkillEffects(true, oldSkill.getId()); - getStat().recalculateStats(true); + _stat.recalculateStats(true); } } @@ -4105,7 +4105,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final double getRandomDamageMultiplier() { - final int random = (int) getStat().getValue(Stats.RANDOM_DAMAGE); + final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE); return (1 + ((double) Rnd.get(-random, random) / 100)); } @@ -4127,193 +4127,193 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public int getAccuracy() { - return getStat().getAccuracy(); + return _stat.getAccuracy(); } public int getMagicAccuracy() { - return getStat().getMagicAccuracy(); + return _stat.getMagicAccuracy(); } public int getMagicEvasionRate() { - return getStat().getMagicEvasionRate(); + return _stat.getMagicEvasionRate(); } public final double getAttackSpeedMultiplier() { - return getStat().getAttackSpeedMultiplier(); + return _stat.getAttackSpeedMultiplier(); } public final double getCriticalDmg(int init) { - return getStat().getCriticalDmg(init); + return _stat.getCriticalDmg(init); } public int getCriticalHit() { - return getStat().getCriticalHit(); + return _stat.getCriticalHit(); } public int getEvasionRate() { - return getStat().getEvasionRate(); + return _stat.getEvasionRate(); } public final int getMagicalAttackRange(Skill skill) { - return getStat().getMagicalAttackRange(skill); + return _stat.getMagicalAttackRange(skill); } public final int getMaxCp() { - return getStat().getMaxCp(); + return _stat.getMaxCp(); } public final int getMaxRecoverableCp() { - return getStat().getMaxRecoverableCp(); + return _stat.getMaxRecoverableCp(); } public int getMAtk() { - return getStat().getMAtk(); + return _stat.getMAtk(); } public int getMAtkSpd() { - return getStat().getMAtkSpd(); + return _stat.getMAtkSpd(); } public int getMaxMp() { - return getStat().getMaxMp(); + return _stat.getMaxMp(); } public int getMaxRecoverableMp() { - return getStat().getMaxRecoverableMp(); + return _stat.getMaxRecoverableMp(); } public int getMaxHp() { - return getStat().getMaxHp(); + return _stat.getMaxHp(); } public int getMaxRecoverableHp() { - return getStat().getMaxRecoverableHp(); + return _stat.getMaxRecoverableHp(); } public final int getMCriticalHit() { - return getStat().getMCriticalHit(); + return _stat.getMCriticalHit(); } public int getMDef() { - return getStat().getMDef(); + return _stat.getMDef(); } public int getPAtk() { - return getStat().getPAtk(); + return _stat.getPAtk(); } public int getPAtkSpd() { - return getStat().getPAtkSpd(); + return _stat.getPAtkSpd(); } public int getPDef() { - return getStat().getPDef(); + return _stat.getPDef(); } public final int getPhysicalAttackRange() { - return getStat().getPhysicalAttackRange(); + return _stat.getPhysicalAttackRange(); } public double getMovementSpeedMultiplier() { - return getStat().getMovementSpeedMultiplier(); + return _stat.getMovementSpeedMultiplier(); } public double getRunSpeed() { - return getStat().getRunSpeed(); + return _stat.getRunSpeed(); } public double getWalkSpeed() { - return getStat().getWalkSpeed(); + return _stat.getWalkSpeed(); } public final double getSwimRunSpeed() { - return getStat().getSwimRunSpeed(); + return _stat.getSwimRunSpeed(); } public final double getSwimWalkSpeed() { - return getStat().getSwimWalkSpeed(); + return _stat.getSwimWalkSpeed(); } public double getMoveSpeed() { - return getStat().getMoveSpeed(); + return _stat.getMoveSpeed(); } public final int getShldDef() { - return getStat().getShldDef(); + return _stat.getShldDef(); } public int getSTR() { - return getStat().getSTR(); + return _stat.getSTR(); } public int getDEX() { - return getStat().getDEX(); + return _stat.getDEX(); } public int getCON() { - return getStat().getCON(); + return _stat.getCON(); } public int getINT() { - return getStat().getINT(); + return _stat.getINT(); } public int getWIT() { - return getStat().getWIT(); + return _stat.getWIT(); } public int getMEN() { - return getStat().getMEN(); + return _stat.getMEN(); } public int getLUC() { - return getStat().getLUC(); + return _stat.getLUC(); } public int getCHA() { - return getStat().getCHA(); + return _stat.getCHA(); } // Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE public void addStatusListener(L2Character object) { - getStatus().addStatusListener(object); + _status.addStatusListener(object); } public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) @@ -4338,7 +4338,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // RearDamage effect bonus. if (isBehind(target)) { - damage *= getStat().getValue(Stats.REAR_DAMAGE_RATE, 1); + damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1); } // Counterattacks happen before damage received. @@ -4383,27 +4383,27 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Absorb HP from the damage inflicted double absorbPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1); - if ((absorbPercent > 0) && (Rnd.nextDouble() < getStat().getValue(Stats.ABSORB_DAMAGE_CHANCE))) + if ((absorbPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE))) { - int absorbDamage = (int) Math.min(absorbPercent * damage, getMaxRecoverableHp() - getCurrentHp()); + int absorbDamage = (int) Math.min(absorbPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp()); if (absorbDamage > 0) { - setCurrentHp(getCurrentHp() + absorbDamage); + setCurrentHp(_status.getCurrentHp() + absorbDamage); } } // Absorb MP from the damage inflicted. Unconfirmed for skill attacks. if (skill == null) { - absorbPercent = getStat().getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); + absorbPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0); if (absorbPercent > 0) { - int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, getMaxRecoverableMp() - getCurrentMp()); + int absorbDamage = (int) Math.min((absorbPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp()); absorbDamage = Math.min(absorbDamage, (int) target.getCurrentMp()); if (absorbDamage > 0) { - setCurrentMp(getCurrentMp() + absorbDamage); + setCurrentMp(_status.getCurrentMp() + absorbDamage); } } } @@ -4448,7 +4448,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - final double damageCap = getStat().getValue(Stats.DAMAGE_LIMIT); + final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT); if (damageCap > 0) { value = Math.min(value, damageCap); @@ -4459,17 +4459,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + getStat().getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100; } else { - value *= (100 + getStat().getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100; } } if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0)) { - getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } else if (isPlayer()) { @@ -4477,7 +4477,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); + _status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } if (attacker != null) @@ -4488,83 +4488,83 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void reduceCurrentMp(double i) { - getStatus().reduceMp(i); + _status.reduceMp(i); } @Override public void removeStatusListener(L2Character object) { - getStatus().removeStatusListener(object); + _status.removeStatusListener(object); } protected void stopHpMpRegeneration() { - getStatus().stopHpMpRegeneration(); + _status.stopHpMpRegeneration(); } public final double getCurrentCp() { - return getStatus().getCurrentCp(); + return _status.getCurrentCp(); } public final int getCurrentCpPercent() { - return (int) ((getCurrentCp() * 100) / getMaxCp()); + return (int) ((_status.getCurrentCp() * 100) / _stat.getMaxCp()); } public final void setCurrentCp(double newCp) { - getStatus().setCurrentCp(newCp); + _status.setCurrentCp(newCp); } public final void setCurrentCp(double newCp, boolean broadcast) { - getStatus().setCurrentCp(newCp, broadcast); + _status.setCurrentCp(newCp, broadcast); } public final double getCurrentHp() { - return getStatus().getCurrentHp(); + return _status.getCurrentHp(); } public final int getCurrentHpPercent() { - return (int) ((getCurrentHp() * 100) / getMaxHp()); + return (int) ((_status.getCurrentHp() * 100) / _stat.getMaxHp()); } public final void setCurrentHp(double newHp) { - getStatus().setCurrentHp(newHp); + _status.setCurrentHp(newHp); } public final void setCurrentHp(double newHp, boolean broadcast) { - getStatus().setCurrentHp(newHp, broadcast); + _status.setCurrentHp(newHp, broadcast); } public final void setCurrentHpMp(double newHp, double newMp) { - getStatus().setCurrentHpMp(newHp, newMp); + _status.setCurrentHpMp(newHp, newMp); } public final double getCurrentMp() { - return getStatus().getCurrentMp(); + return _status.getCurrentMp(); } public final int getCurrentMpPercent() { - return (int) ((getCurrentMp() * 100) / getMaxMp()); + return (int) ((_status.getCurrentMp() * 100) / _stat.getMaxMp()); } public final void setCurrentMp(double newMp) { - getStatus().setCurrentMp(newMp); + _status.setCurrentMp(newMp); } public final void setCurrentMp(double newMp, boolean broadcast) { - getStatus().setCurrentMp(newMp, false); + _status.setCurrentMp(newMp, false); } /** @@ -4577,7 +4577,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Weight Limit = (CON Modifier*69000) * Skills // Source http://l2p.bravehost.com/weightlimit.html (May 2007) final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT); - return (int) getStat().getValue(Stats.WEIGHT_LIMIT, baseLoad); + return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad); } return 0; } @@ -4586,7 +4586,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if (isPlayer() || isPet()) { - return (int) getStat().getValue(Stats.WEIGHT_PENALTY, 1); + return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1); } return 0; } @@ -4623,17 +4623,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public AttributeType getAttackElement() { - return getStat().getAttackElement(); + return _stat.getAttackElement(); } public int getAttackElementValue(AttributeType attackAttribute) { - return getStat().getAttackElementValue(attackAttribute); + return _stat.getAttackElementValue(attackAttribute); } public int getDefenseElementValue(AttributeType defenseAttribute) { - return getStat().getDefenseElementValue(defenseAttribute); + return _stat.getDefenseElementValue(defenseAttribute); } public final void startPhysicalAttackMuted() @@ -4852,8 +4852,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return weapon.getItemType(); } - final WeaponType defaultWeaponType = getTemplate().getBaseAttackType(); - return getTransformation().map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); + final WeaponType defaultWeaponType = _template.getBaseAttackType(); + return _transform.map(transform -> transform.getBaseAttackType(this, defaultWeaponType)).orElse(defaultWeaponType); } public final boolean isInCategory(CategoryType type) @@ -5001,7 +5001,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).collect(Collectors.toList()); + return _skillCasters.values().stream().filter(filter).collect(Collectors.toList()); } @SafeVarargs @@ -5012,7 +5012,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe filter = filter.and(additionalFilter); } - return getSkillCasters().stream().filter(filter).findAny().orElse(null); + return _skillCasters.values().stream().filter(filter).findAny().orElse(null); } /** @@ -5098,7 +5098,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Queue getListeners(EventType type) { final Queue objectListenres = super.getListeners(type); - final Queue templateListeners = getTemplate().getListeners(type); + final Queue templateListeners = _template.getListeners(type); final Queue globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue(); // Attempt to do not create collection @@ -5128,7 +5128,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public Race getRace() { - return getTemplate().getRace(); + return _template.getRace(); } @Override @@ -5200,7 +5200,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean hasAbnormalType(AbnormalType abnormalType) { - return getEffectList().hasAbnormalType(abnormalType); + return _effectList.hasAbnormalType(abnormalType); } public void addBlockActionsAllowedSkill(int skillId) @@ -5267,11 +5267,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public MoveType getMoveType() { - if (isMoving() && isRunning()) + if (isMoving() && _isRunning) { return MoveType.RUNNING; } - else if (isMoving() && !isRunning()) + else if (isMoving() && !_isRunning) { return MoveType.WALKING; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 87e507807a..c6d0dec751 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -372,7 +372,7 @@ public class L2Npc extends L2Character return; } - if (isFakePlayer()) + if (_isFakePlayer) { player.sendPacket(new FakePlayerInfo(this)); } @@ -514,7 +514,7 @@ public class L2Npc extends L2Character { return false; } - else if (isBusy()) + else if (_isBusy) { return false; } @@ -745,7 +745,7 @@ public class L2Npc extends L2Character */ public void showChatWindow(L2PcInstance player, int val) { - if (!isTalkable()) + if (!_isTalkable) { player.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -925,7 +925,7 @@ public class L2Npc extends L2Character final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; - if (isFakePlayer() && (killer != null) && killer.isPlayable()) + if (_isFakePlayer && (killer != null) && killer.isPlayable()) { final L2PcInstance player = killer.getActingPlayer(); if (isScriptValue(0) && (getReputation() >= 0)) @@ -999,10 +999,9 @@ public class L2Npc extends L2Character DecayTaskManager.getInstance().add(this); - final L2Spawn spawn = getSpawn(); - if (spawn != null) + if (_spawn != null) { - final NpcSpawnTemplate npcTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcTemplate = _spawn.getNpcSpawnTemplate(); if (npcTemplate != null) { npcTemplate.notifyNpcDeath(this, killer); @@ -1140,7 +1139,7 @@ public class L2Npc extends L2Character @Override public void onDecay() { - if (isDecayed()) + if (_isDecayed) { return; } @@ -1228,7 +1227,7 @@ public class L2Npc extends L2Character public void endDecayTask() { - if (!isDecayed()) + if (!_isDecayed) { DecayTaskManager.getInstance().cancel(this); onDecay(); @@ -1299,7 +1298,7 @@ public class L2Npc extends L2Character activeChar.sendMessage("Added NPC: " + getName()); } - if (isFakePlayer()) + if (_isFakePlayer) { activeChar.sendPacket(new FakePlayerInfo(this)); } @@ -1318,7 +1317,7 @@ public class L2Npc extends L2Character { ThreadPool.schedule(() -> { - if (!isDecayed()) + if (!_isDecayed) { deleteMe(); } @@ -1394,7 +1393,7 @@ public class L2Npc extends L2Character @Override public void rechargeShots(boolean physical, boolean magic, boolean fish) { - if (isFakePlayer() && Config.FAKE_PLAYER_USE_SHOTS) + if (_isFakePlayer && Config.FAKE_PLAYER_USE_SHOTS) { if (physical) { @@ -1474,7 +1473,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX() == getX()) && (getSpawn().getY() == getY())); + return ((_spawn != null) && (_spawn.getX() == getX()) && (_spawn.getY() == getY())); } /** @@ -1784,10 +1783,9 @@ public class L2Npc extends L2Character return _params; } - final L2Spawn spawn = getSpawn(); - if (spawn != null) // Minions doesn't have L2Spawn object bound + if (_spawn != null) // Minions doesn't have L2Spawn object bound { - final NpcSpawnTemplate npcSpawnTemplate = spawn.getNpcSpawnTemplate(); + final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { final StatsSet params = getTemplate().getParameters(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 67b1130e8f..4c28ea1dcb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -118,15 +118,15 @@ public abstract class L2Summon extends L2Playable setFollowStatus(true); updateAndBroadcastStatus(0); - sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false)); + sendPacket(new RelationChanged(this, _owner.getRelation(_owner), false)); L2World.getInstance().forEachVisibleObjectInRange(getOwner(), L2PcInstance.class, 800, player -> { - player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player))); + player.sendPacket(new RelationChanged(this, _owner.getRelation(player), isAutoAttackable(player))); }); - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowAdd(this)); } setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation // if someone comes into range now, the animation shouldn't show any more @@ -196,7 +196,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if (player == getOwner()) + if (player == _owner) { player.sendPacket(new PetInfo(this, 1)); return; @@ -242,19 +242,19 @@ public abstract class L2Summon extends L2Playable @Override public final int getReputation() { - return getOwner() != null ? getOwner().getReputation() : 0; + return _owner != null ? _owner.getReputation() : 0; } @Override public final byte getPvpFlag() { - return getOwner() != null ? getOwner().getPvpFlag() : 0; + return _owner != null ? _owner.getPvpFlag() : 0; } @Override public final Team getTeam() { - return getOwner() != null ? getOwner().getTeam() : Team.NONE; + return _owner != null ? _owner.getTeam() : Team.NONE; } public final L2PcInstance getOwner() @@ -313,8 +313,7 @@ public abstract class L2Summon extends L2Playable return false; } - final L2PcInstance owner = getOwner(); - if (owner != null) + if (_owner != null) { L2World.getInstance().forEachVisibleObject(this, L2Attackable.class, TgMob -> { @@ -326,7 +325,7 @@ public abstract class L2Summon extends L2Playable final AggroInfo info = TgMob.getAggroList().get(this); if (info != null) { - TgMob.addDamageHate(owner, info.getDamage(), info.getHate()); + TgMob.addDamageHate(_owner, info.getDamage(), info.getHate()); } }); } @@ -392,7 +391,7 @@ public abstract class L2Summon extends L2Playable // pet will be deleted along with all his items if (getInventory() != null) { - getInventory().destroyAllItems("pet deleted", getOwner(), this); + getInventory().destroyAllItems("pet deleted", _owner, this); } decayMe(); } @@ -434,12 +433,12 @@ public abstract class L2Summon extends L2Playable if ((getInventory() != null) && (getInventory().getSize() > 0)) { - getOwner().setPetInvItems(true); + _owner.setPetInvItems(true); sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_YOUR_PET_INVENTORY_RENDERING_YOU_UNABLE_TO_SELL_TRADE_DROP_PET_SUMMONING_ITEMS_PLEASE_EMPTY_YOUR_PET_INVENTORY); } else { - getOwner().setPetInvItems(false); + _owner.setPetInvItems(false); } } @@ -477,7 +476,7 @@ public abstract class L2Summon extends L2Playable _follow = state; if (_follow) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner()); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } else { @@ -546,7 +545,7 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInvul() { - return super.isInvul() || getOwner().isSpawnProtected(); + return super.isInvul() || _owner.isSpawnProtected(); } /** @@ -591,7 +590,7 @@ public abstract class L2Summon extends L2Playable public boolean useMagic(Skill skill, L2ItemInstance item, boolean forceUse, boolean dontMove) { // Null skill, dead summon or null owner are reasons to prevent casting. - if ((skill == null) || isDead() || (getOwner() == null)) + if ((skill == null) || isDead() || (_owner == null)) { return false; } @@ -654,7 +653,7 @@ public abstract class L2Summon extends L2Playable if (skill.isBad()) { // If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { sendPacket(ActionFailed.STATIC_PACKET); return false; @@ -673,7 +672,7 @@ public abstract class L2Summon extends L2Playable if (value) { - _previousFollowStatus = getFollowStatus(); + _previousFollowStatus = _follow; // if immobilized temporarily disable follow mode if (_previousFollowStatus) { @@ -695,13 +694,13 @@ public abstract class L2Summon extends L2Playable @Override public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) { - if (miss || (getOwner() == null)) + if (miss || (_owner == null)) { return; } // Prevents the double spam of system messages, if the target is the owning player. - if (target.getObjectId() != getOwner().getObjectId()) + if (target.getObjectId() != _owner.getObjectId()) { if (crit) { @@ -715,14 +714,14 @@ public abstract class L2Summon extends L2Playable } } - if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) + if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) { OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } final SystemMessage sm; - if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !getActingPlayer().isAffected(EffectFlag.FACEOFF))) + if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !_owner.isAffected(EffectFlag.FACEOFF))) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } @@ -744,7 +743,7 @@ public abstract class L2Summon extends L2Playable { super.reduceCurrentHp(damage, attacker, skill); - if (!isDead() && !isHpBlocked() && (getOwner() != null) && (attacker != null) && (!getOwner().isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) + if (!isDead() && !isHpBlocked() && (_owner != null) && (attacker != null) && (!_owner.isAffected(EffectFlag.DUELIST_FURY) || attacker.isAffected(EffectFlag.FACEOFF))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RECEIVED_S3_DAMAGE_FROM_C2); sm.addNpcName(this); @@ -757,14 +756,13 @@ public abstract class L2Summon extends L2Playable @Override public void doCast(Skill skill) { - final L2PcInstance actingPlayer = getActingPlayer(); - if ((skill.getTarget(this, false, false, false) == null) && !actingPlayer.getAccessLevel().allowPeaceAttack()) + if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack()) { // Send a System Message to the L2PcInstance - actingPlayer.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + _owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); // Send a Server->Client packet ActionFailed to the L2PcInstance - actingPlayer.sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -774,18 +772,18 @@ public abstract class L2Summon extends L2Playable @Override public boolean isInCombat() { - return (getOwner() != null) && getOwner().isInCombat(); + return (_owner != null) && _owner.isInCombat(); } @Override public L2PcInstance getActingPlayer() { - return getOwner(); + return _owner; } public void updateAndBroadcastStatus(int val) { - if (getOwner() == null) + if (_owner == null) { return; } @@ -796,10 +794,10 @@ public abstract class L2Summon extends L2Playable { broadcastNpcInfo(val); } - final L2Party party = getOwner().getParty(); + final L2Party party = _owner.getParty(); if (party != null) { - party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this)); + party.broadcastToPartyMembers(_owner, new ExPartyPetWindowUpdate(this)); } } @@ -807,7 +805,7 @@ public abstract class L2Summon extends L2Playable { L2World.getInstance().forEachVisibleObject(this, L2PcInstance.class, player -> { - if ((player == getOwner())) + if ((player == _owner)) { return; } @@ -842,7 +840,7 @@ public abstract class L2Summon extends L2Playable public void sendInfo(L2PcInstance activeChar) { // Check if the L2PcInstance is the owner of the Pet - if (activeChar == getOwner()) + if (activeChar == _owner) { activeChar.sendPacket(new PetInfo(this, isDead() ? 0 : 1)); if (isPet()) @@ -870,7 +868,7 @@ public abstract class L2Summon extends L2Playable @Override public String toString() { - return super.toString() + "(" + getId() + ") Owner: " + getOwner(); + return super.toString() + "(" + getId() + ") Owner: " + _owner; } @Override @@ -904,7 +902,7 @@ public abstract class L2Summon extends L2Playable */ public void doAttack(L2Object target) { - if (getOwner() != null) + if (_owner != null) { if (target != null) { @@ -912,7 +910,7 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); if (target.isFakePlayer()) { - getOwner().updatePvPStatus(); + _owner.updatePvPStatus(); } } } @@ -926,12 +924,12 @@ public abstract class L2Summon extends L2Playable */ public final boolean canAttack(L2Object target, boolean ctrlPressed) { - if (getOwner() == null) + if (_owner == null) { return false; } - if ((target == null) || (this == target) || (getOwner() == target)) + if ((target == null) || (this == target) || (_owner == target)) { return false; } @@ -940,7 +938,7 @@ public abstract class L2Summon extends L2Playable final int npcId = getId(); if (CommonUtil.contains(PASSIVE_SUMMONS, npcId)) { - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } @@ -960,28 +958,28 @@ public abstract class L2Summon extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } - if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) + if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) { sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) + if (_owner.isInOlympiadMode() && !_owner.isOlympiadStart()) { // If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed - getOwner().sendPacket(ActionFailed.STATIC_PACKET); + _owner.sendPacket(ActionFailed.STATIC_PACKET); return false; } - if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) + if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide())) { sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE); sendPacket(ActionFailed.STATIC_PACKET); return false; } - if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) + if (!_owner.getAccessLevel().allowPeaceAttack() && _owner.isInsidePeaceZone(this, target)) { sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); return false; @@ -994,7 +992,7 @@ public abstract class L2Summon extends L2Playable } // Summons can attack NPCs even when the owner cannot. - if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) + if (!target.isAutoAttackable(_owner) && !ctrlPressed && !target.isNpc()) { setFollowStatus(false); getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); @@ -1014,18 +1012,18 @@ public abstract class L2Summon extends L2Playable @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } @@ -1041,14 +1039,14 @@ public abstract class L2Summon extends L2Playable L2ItemInstance item; IItemHandler handler; - if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) + if ((_owner.getAutoSoulShot() == null) || _owner.getAutoSoulShot().isEmpty()) { return; } - for (int itemId : getOwner().getAutoSoulShot()) + for (int itemId : _owner.getAutoSoulShot()) { - item = getOwner().getInventory().getItemByItemId(itemId); + item = _owner.getInventory().getItemByItemId(itemId); if (item != null) { @@ -1059,7 +1057,7 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } @@ -1071,14 +1069,14 @@ public abstract class L2Summon extends L2Playable handler = ItemHandler.getInstance().getHandler(item.getEtcItem()); if (handler != null) { - handler.useItem(getOwner(), item, false); + handler.useItem(_owner, item, false); } } } } else { - getOwner().removeAutoSoulShot(itemId); + _owner.removeAutoSoulShot(itemId); } } } @@ -1086,13 +1084,13 @@ public abstract class L2Summon extends L2Playable @Override public int getClanId() { - return (getOwner() != null) ? getOwner().getClanId() : 0; + return (_owner != null) ? _owner.getClanId() : 0; } @Override public int getAllyId() { - return (getOwner() != null) ? getOwner().getAllyId() : 0; + return (_owner != null) ? _owner.getAllyId() : 0; } public int getFormId() @@ -1144,7 +1142,7 @@ public abstract class L2Summon extends L2Playable public void sendInventoryUpdate(InventoryUpdate iu) { - final L2PcInstance owner = getOwner(); + final L2PcInstance owner = _owner; if (owner != null) { owner.sendInventoryUpdate(iu); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java index fe1f4c81cf..a03a262e08 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/appearance/PcAppearance.java @@ -74,7 +74,7 @@ public class PcAppearance { if (_visibleName == null) { - return getOwner().getName(); + return _owner.getName(); } return _visibleName; } @@ -94,7 +94,7 @@ public class PcAppearance { if (_visibleTitle == null) { - return getOwner().getTitle(); + return _owner.getTitle(); } return _visibleTitle; } @@ -220,27 +220,27 @@ public class PcAppearance public int getVisibleClanId() { - return _visibleClanId != -1 ? _visibleClanId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanId(); + return _visibleClanId != -1 ? _visibleClanId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanId(); } public int getVisibleClanCrestId() { - return _visibleClanCrestId != -1 ? _visibleClanCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestId(); + return _visibleClanCrestId != -1 ? _visibleClanCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestId(); } public int getVisibleClanLargeCrestId() { - return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getClanCrestLargeId(); + return _visibleClanLargeCrestId != -1 ? _visibleClanLargeCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getClanCrestLargeId(); } public int getVisibleAllyId() { - return _visibleAllyId != -1 ? _visibleAllyId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyId(); + return _visibleAllyId != -1 ? _visibleAllyId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyId(); } public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : getOwner().isCursedWeaponEquipped() ? 0 : getOwner().getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java index 91548e2a10..7aae137ada 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java @@ -53,7 +53,7 @@ public class L2DecoyInstance extends L2Character _totalLifeTime = totalLifeTime; _timeRemaining = _totalLifeTime; final int skilllevel = getTemplate().getDisplayId() - 13070; - _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000); + _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); } @@ -269,18 +269,18 @@ public class L2DecoyInstance extends L2Character @Override public void sendPacket(IClientOutgoingPacket... packets) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(packets); + _owner.sendPacket(packets); } } @Override public void sendPacket(SystemMessageId id) { - if (getOwner() != null) + if (_owner != null) { - getOwner().sendPacket(id); + _owner.sendPacket(id); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index baab09b858..d82f30b44d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -51,7 +51,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class L2DoorInstance extends L2Character { - private boolean _open = false; + boolean _open = false; private boolean _isAttackableDoor = false; private boolean _isInverted = false; private int _meshindex = 1; @@ -293,7 +293,7 @@ public final class L2DoorInstance extends L2Character { return false; } - else if (getIsAttackableDoor()) + else if (_isAttackableDoor) { return true; } @@ -369,13 +369,13 @@ public final class L2DoorInstance extends L2Character OnEventTrigger oe = null; if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - oe = new OnEventTrigger(getEmitter(), !isOpen()); + oe = new OnEventTrigger(getEmitter(), !_open); } else { - oe = new OnEventTrigger(getEmitter(), isOpen()); + oe = new OnEventTrigger(getEmitter(), _open); } } @@ -592,13 +592,13 @@ public final class L2DoorInstance extends L2Character { if (getEmitter() > 0) { - if (isInverted()) + if (_isInverted) { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), !isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), !_open)); } else { - activeChar.sendPacket(new OnEventTrigger(getEmitter(), isOpen())); + activeChar.sendPacket(new OnEventTrigger(getEmitter(), _open)); } } activeChar.sendPacket(new StaticObject(this, activeChar.isGM())); @@ -649,7 +649,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - if (isOpen()) + if (_open) { closeMe(); } @@ -661,8 +661,7 @@ public final class L2DoorInstance extends L2Character @Override public void run() { - final boolean open = isOpen(); - if (open) + if (_open) { closeMe(); } @@ -671,7 +670,7 @@ public final class L2DoorInstance extends L2Character openMe(); } - int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); + int delay = _open ? getTemplate().getCloseTime() : getTemplate().getOpenTime(); if (getTemplate().getRandomTime() > 0) { delay += Rnd.get(getTemplate().getRandomTime()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 35cb265650..53df3b876a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -75,7 +75,7 @@ public class L2MonsterInstance extends L2Attackable } // Check if the L2MonsterInstance target is aggressive - if (Config.GUARD_ATTACK_AGGRO_MOB && isAggressive() && (attacker instanceof L2GuardInstance)) + if (Config.GUARD_ATTACK_AGGRO_MOB && getTemplate().isAggressive() && (attacker instanceof L2GuardInstance)) { return true; } @@ -108,11 +108,11 @@ public class L2MonsterInstance extends L2Attackable { if (!isTeleporting()) { - if (getLeader() != null) + if (_master != null) { setRandomWalking(false); - setIsRaidMinion(getLeader().isRaid()); - getLeader().getMinionList().onMinionSpawn(this); + setIsRaidMinion(_master.isRaid()); + _master.getMinionList().onMinionSpawn(this); } startMaintenanceTask(); @@ -173,9 +173,9 @@ public class L2MonsterInstance extends L2Attackable getMinionList().onMasterDie(true); } - if (getLeader() != null) + if (_master != null) { - getLeader().getMinionList().onMinionDie(this, 0); + _master.getMinionList().onMinionDie(this, 0); } return super.deleteMe(); @@ -229,7 +229,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return ((_master == null) ? super.isWalker() : _master.isWalker()); } /** @@ -238,7 +238,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean giveRaidCurse() { - return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse(); + return (isRaidMinion() && (_master != null)) ? _master.giveRaidCurse() : super.giveRaidCurse(); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index a7f127c782..080eca1334 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -503,7 +503,7 @@ public final class L2PcInstance extends L2Playable private AdminTeleportType _teleportType = AdminTeleportType.NORMAL; private boolean _inCrystallize; - private boolean _inCraftMode; + private boolean _isCrafting; private long _offlineShopStart = 0; @@ -908,7 +908,7 @@ public final class L2PcInstance extends L2Playable public String getAccountName() { - return _client == null ? getAccountNamePlayer() : _client.getAccountName(); + return _client == null ? _accountName : _client.getAccountName(); } public String getAccountNamePlayer() @@ -925,7 +925,7 @@ public final class L2PcInstance extends L2Playable { int result = 0; - if (getClan() != null) + if (_clan != null) { result |= RelationChanged.RELATION_CLAN_MEMBER; if (getClan() == target.getClan()) @@ -944,9 +944,9 @@ public final class L2PcInstance extends L2Playable if ((getParty() != null) && (getParty() == target.getParty())) { result |= RelationChanged.RELATION_HAS_PARTY; - for (int i = 0; i < getParty().getMembers().size(); i++) + for (int i = 0; i < _party.getMembers().size(); i++) { - if (getParty().getMembers().get(i) != this) + if (_party.getMembers().get(i) != this) { continue; } @@ -1000,7 +1000,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getSiegeState() != 0) + if (_siegeState != 0) { result |= RelationChanged.RELATION_INSIEGE; if (getSiegeState() != target.getSiegeState()) @@ -1011,7 +1011,7 @@ public final class L2PcInstance extends L2Playable { result |= RelationChanged.RELATION_ALLY; } - if (getSiegeState() == 1) + if (_siegeState == 1) { result |= RelationChanged.RELATION_ATTACKER; } @@ -1027,7 +1027,7 @@ public final class L2PcInstance extends L2Playable } } } - if (getBlockCheckerArena() != -1) + if (_handysBlockCheckerEventArena != -1) { result |= RelationChanged.RELATION_INSIEGE; final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena()); @@ -1207,17 +1207,17 @@ public final class L2PcInstance extends L2Playable public boolean isInStoreMode() { - return getPrivateStoreType() != PrivateStoreType.NONE; + return _privateStoreType != PrivateStoreType.NONE; } - public boolean isInCraftMode() + public boolean isCrafting() { - return _inCraftMode; + return _isCrafting; } - public void isInCraftMode(boolean b) + public void setIsCrafting(boolean isCrafting) { - _inCraftMode = b; + _isCrafting = isCrafting; } /** @@ -1294,7 +1294,7 @@ public final class L2PcInstance extends L2Playable LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId); } - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) { @@ -1427,13 +1427,13 @@ public final class L2PcInstance extends L2Playable return; } - final L2Npc target = getLastFolkNPC(); + final L2Npc target = _lastFolkNpc; if ((target != null) && isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false)) { quest.notifyEvent(event, target, this); } - else if (getLastQuestNpcObject() > 0) + else if (_questNpcObject > 0) { final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); @@ -1634,7 +1634,7 @@ public final class L2PcInstance extends L2Playable @Override public void updatePvPFlag(int value) { - if (getPvpFlag() == value) + if (_pvpFlag == value) { return; } @@ -1652,7 +1652,7 @@ public final class L2PcInstance extends L2Playable if (hasSummon()) { final RelationChanged rc = new RelationChanged(); - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, getRelation(this), false); @@ -1679,7 +1679,7 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); + final L2Summon pet = _pet; if (pet != null) { rc.addRelation(pet, relation, isAutoAttackable(player)); @@ -2086,7 +2086,7 @@ public final class L2PcInstance extends L2Playable weaponPenalty = weaponPenalty - expertiseLevel - bonus; weaponPenalty = Math.min(Math.max(weaponPenalty, 0), 4); - if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) + if ((_expertiseWeaponPenalty != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) { _expertiseWeaponPenalty = weaponPenalty; if (_expertiseWeaponPenalty > 0) @@ -2104,7 +2104,7 @@ public final class L2PcInstance extends L2Playable armorPenalty = armorPenalty - expertiseLevel - bonus; armorPenalty = Math.min(Math.max(armorPenalty, 0), 4); - if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) + if ((_expertiseArmorPenalty != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) { _expertiseArmorPenalty = armorPenalty; if (_expertiseArmorPenalty > 0) @@ -2147,20 +2147,20 @@ public final class L2PcInstance extends L2Playable } sendPacket(sm); - final int slot = getInventory().getSlotFromItem(item); + final int slot = _inventory.getSlotFromItem(item); // we can't unequip talisman by body slot if ((slot == L2Item.SLOT_DECO) || (slot == L2Item.SLOT_BROOCH_JEWEL)) { - items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); + items = _inventory.unEquipItemInSlotAndRecord(item.getLocationSlot()); } else { - items = getInventory().unEquipItemInBodySlotAndRecord(slot); + items = _inventory.unEquipItemInBodySlotAndRecord(slot); } } else { - items = getInventory().equipItemAndRecord(item); + items = _inventory.equipItemAndRecord(item); if (item.isEquipped()) { @@ -2272,7 +2272,7 @@ public final class L2PcInstance extends L2Playable */ public void increaseRaidbossPoints(int increasePoints) { - setRaidbossPoints(getRaidbossPoints() + increasePoints); + setRaidbossPoints(_raidbossPoints + increasePoints); } /** @@ -2298,17 +2298,17 @@ public final class L2PcInstance extends L2Playable { if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.THIRD)) { - if (getLvlJoinedAcademy() <= 16) + if (_lvlJoinedAcademy <= 16) { _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE, true); } - else if (getLvlJoinedAcademy() >= 39) + else if (_lvlJoinedAcademy >= 39) { _clan.addReputationScore(Config.JOIN_ACADEMY_MIN_REP_SCORE, true); } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((_lvlJoinedAcademy - 16) * 20)), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -2320,7 +2320,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES); // receive graduation gift - getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet + _inventory.addItem("Gift", 8181, 1, this, null); // give academy circlet } if (isSubClassActive()) { @@ -2341,12 +2341,12 @@ public final class L2PcInstance extends L2Playable // Update class icon in party and clan if (isInParty()) { - getParty().broadcastPacket(new PartySmallWindowUpdate(this, true)); + _party.broadcastPacket(new PartySmallWindowUpdate(this, true)); } - if (getClan() != null) + if (_clan != null) { - getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); + _clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this)); } sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED)); @@ -2495,33 +2495,32 @@ public final class L2PcInstance extends L2Playable } // Add Hero skills if hero - if (isHero()) + if (_hero) { setHero(true); } // Add clan skills - if (getClan() != null) + if (_clan != null) { - final L2Clan clan = getClan(); - clan.addSkillEffects(this); + _clan.addSkillEffects(this); - if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) + if ((_clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) { SiegeManager.getInstance().addSiegeSkills(this); } - if (getClan().getCastleId() > 0) + if (_clan.getCastleId() > 0) { CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this); } - if (getClan().getFortId() > 0) + if (_clan.getFortId() > 0) { FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this); } } // Reload passive skills from armors / jewels / weapons - getInventory().reloadEquippedItems(); + _inventory.reloadEquippedItems(); } /** @@ -2668,13 +2667,12 @@ public final class L2PcInstance extends L2Playable */ public boolean isCastleLord(int castleId) { - final L2Clan clan = getClan(); // player has clan and is the clan leader, check the castle info - if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) + if ((_clan != null) && (_clan.getLeader().getPlayerInstance() == this)) { // if the clan has a castle and it is actually the queried castle, return true - final Castle castle = CastleManager.getInstance().getCastleByOwner(clan); + final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan); if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) { return true; @@ -2812,7 +2810,7 @@ public final class L2PcInstance extends L2Playable */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().isSitForced()) + if (L2Event.isParticipant(this) && eventStatus.isSitForced()) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -2966,7 +2964,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAdena()) + if (count > _inventory.getAdena()) { if (sendMessage) { @@ -3016,7 +3014,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceBeautyTickets(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getBeautyTickets()) + if (count > _inventory.getBeautyTickets()) { if (sendMessage) { @@ -3110,7 +3108,7 @@ public final class L2PcInstance extends L2Playable */ public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) { - if (count > getAncientAdena()) + if (count > _inventory.getAncientAdena()) { if (sendMessage) { @@ -3516,7 +3514,7 @@ public final class L2PcInstance extends L2Playable { return null; } - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, this, reference); if (newItem == null) { return null; @@ -3600,7 +3598,7 @@ public final class L2PcInstance extends L2Playable */ public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) { - final PcInventory inv = getInventory(); + final PcInventory inv = _inventory; if (!inv.validateCapacityByItemId(rewardId, count)) { if (sendMessage) @@ -3802,7 +3800,7 @@ public final class L2PcInstance extends L2Playable return null; } - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -3823,8 +3821,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return null; } @@ -4028,10 +4025,8 @@ public final class L2PcInstance extends L2Playable final boolean needHpUpdate = needHpUpdate(); final boolean needMpUpdate = needMpUpdate(); - final L2Party party = getParty(); - // Check if a party is in progress and party window update is usefull - if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) + if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate)) { final PartySmallWindowUpdate partyWindow = new PartySmallWindowUpdate(this, false); if (needCpUpdate) @@ -4049,10 +4044,10 @@ public final class L2PcInstance extends L2Playable partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP); partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP); } - party.broadcastToPartyMembers(this, partyWindow); + _party.broadcastToPartyMembers(this, partyWindow); } - if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) + if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate)) { final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId()); if ((game != null) && game.isBattleStarted()) @@ -4062,7 +4057,7 @@ public final class L2PcInstance extends L2Playable } // In duel MP updated only with CP or HP - if (isInDuel() && (needCpUpdate || needHpUpdate)) + if (_isInDuel && (needCpUpdate || needHpUpdate)) { DuelManager.getInstance().broadcastToOppositTeam(this, new ExDuelUpdateUserInfo(this)); } @@ -4149,10 +4144,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4190,10 +4184,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -4222,15 +4215,15 @@ public final class L2PcInstance extends L2Playable public int getAllyCrestId() { - if (getClanId() == 0) + if (_clanId == 0) { return 0; } - if (getClan().getAllyId() == 0) + if (_clan.getAllyId() == 0) { return 0; } - return getClan().getAllyCrestId(); + return _clan.getAllyCrestId(); } /** @@ -4269,22 +4262,21 @@ public final class L2PcInstance extends L2Playable { if (target instanceof L2PcInstance) { - final L2PcInstance temp = (L2PcInstance) target; + final L2PcInstance targetPlayer = (L2PcInstance) target; sendPacket(ActionFailed.STATIC_PACKET); - if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) + if ((targetPlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (targetPlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) { - sendPacket(new PrivateStoreListSell(this, temp)); + sendPacket(new PrivateStoreListSell(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.BUY) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.BUY) { - sendPacket(new PrivateStoreListBuy(this, temp)); + sendPacket(new PrivateStoreListBuy(this, targetPlayer)); } - else if (temp.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) + else if (targetPlayer.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) { - sendPacket(new RecipeShopSellList(this, temp)); + sendPacket(new RecipeShopSellList(this, targetPlayer)); } - } else if (target != null) // _interactTarget=null should never happen but one never knows ^^; { @@ -4309,7 +4301,7 @@ public final class L2PcInstance extends L2Playable { if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) { - getParty().distributeItem(this, itemId, itemCount, false, target); + _party.distributeItem(this, itemId, itemCount, false, target); } else if (itemId == Inventory.ADENA_ID) { @@ -4389,7 +4381,7 @@ public final class L2PcInstance extends L2Playable return; } - if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) + if (((isInParty() && (_party.getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); @@ -4498,9 +4490,9 @@ public final class L2PcInstance extends L2Playable // Check if a Party is in progress if (isInParty()) { - getParty().distributeItem(this, target); + _party.distributeItem(this, target); } - else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) + else if ((target.getId() == Inventory.ADENA_ID) && (_inventory.getAdenaInstance() != null)) { addAdena("Pickup", target.getCount(), null, true); ItemTable.getInstance().destroyItem("Pickup", target, this, null); @@ -4509,7 +4501,7 @@ public final class L2PcInstance extends L2Playable { addItem("Pickup", target, null, true); // Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts. - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { final L2EtcItem etcItem = target.getEtcItem(); @@ -4558,13 +4550,13 @@ public final class L2PcInstance extends L2Playable } } - return !isSellingBuffs() && !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); + return !_isSellingBuffs && !isAlikeDead() && !_inOlympiadMode && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow(); } @Override public int getMinShopDistance() { - return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return _waitTypeSitting ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4572,13 +4564,13 @@ public final class L2PcInstance extends L2Playable // Player shouldn't be able to set stores if he/she is alike dead (dead or fake death) if (canOpenPrivateStore()) { - if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) + if ((_privateStoreType == PrivateStoreType.BUY) || (_privateStoreType == PrivateStoreType.BUY_MANAGE)) { setPrivateStoreType(PrivateStoreType.NONE); } - if (getPrivateStoreType() == PrivateStoreType.NONE) + if (_privateStoreType == PrivateStoreType.NONE) { - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -4621,7 +4613,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer())); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -4706,7 +4698,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getActiveWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); } /** @@ -4718,7 +4710,7 @@ public final class L2PcInstance extends L2Playable final L2ItemInstance weapon = getActiveWeaponInstance(); if (weapon == null) { - return getFistsWeaponItem(); + return _fistsWeaponItem; } return (L2Weapon) weapon.getItem(); @@ -4726,12 +4718,12 @@ public final class L2PcInstance extends L2Playable public L2ItemInstance getChestArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); } public L2ItemInstance getLegsArmorInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LEGS); } public L2Armor getActiveChestArmorItem() @@ -4772,7 +4764,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) { return true; } @@ -4794,7 +4786,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) { return true; } @@ -4816,7 +4808,7 @@ public final class L2PcInstance extends L2Playable } if (armor != null) { - if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) + if (((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) { return true; } @@ -4830,7 +4822,7 @@ public final class L2PcInstance extends L2Playable @Override public L2ItemInstance getSecondaryWeaponInstance() { - return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + return _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); } /** @@ -4840,7 +4832,7 @@ public final class L2PcInstance extends L2Playable @Override public L2Item getSecondaryWeaponItem() { - final L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { return item.getItem(); @@ -4880,12 +4872,12 @@ public final class L2PcInstance extends L2Playable !(Config.DISABLE_REWARDS_IN_PVP_ZONES && isInsideZone(ZoneId.PVP))) { // pvp - if (Config.REWARD_PVP_ITEM && (getPvpFlag() != 0)) + if (Config.REWARD_PVP_ITEM && (_pvpFlag != 0)) { pk.addItem("PvP Item Reward", Config.REWARD_PVP_ITEM_ID, Config.REWARD_PVP_ITEM_AMOUNT, this, Config.REWARD_PVP_ITEM_MESSAGE); } // pk - if (Config.REWARD_PK_ITEM && (getPvpFlag() == 0)) + if (Config.REWARD_PK_ITEM && (_pvpFlag == 0)) { pk.addItem("PK Item Reward", Config.REWARD_PK_ITEM_ID, Config.REWARD_PK_ITEM_AMOUNT, this, Config.REWARD_PK_ITEM_MESSAGE); } @@ -4896,7 +4888,7 @@ public final class L2PcInstance extends L2Playable if (Config.ANNOUNCE_PK_PVP && (((pk != null) && !pk.isGM()) || fpcKill)) { String msg = ""; - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { msg = Config.ANNOUNCE_PK_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4910,7 +4902,7 @@ public final class L2PcInstance extends L2Playable Broadcast.toAllOnlinePlayers(msg, false); } } - else if (getPvpFlag() != 0) + else if (_pvpFlag != 0) { msg = Config.ANNOUNCE_PVP_MSG.replace("$killer", killer.getName()).replace("$target", getName()); if (Config.ANNOUNCE_PK_PVP_NORMAL_MESSAGE) @@ -4926,7 +4918,7 @@ public final class L2PcInstance extends L2Playable } } - if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (getPvpFlag() == 0) && (getReputation() >= 0)) + if (fpcKill && Config.FAKE_PLAYER_KILL_KARMA && (_pvpFlag == 0) && (getReputation() >= 0)) { killer.setReputation(killer.getReputation() - 150); } @@ -4947,7 +4939,7 @@ public final class L2PcInstance extends L2Playable { CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer); } - else if (isCombatFlagEquipped()) + else if (_combatFlagEquippedId) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -4956,9 +4948,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } else @@ -4971,7 +4963,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && (pk != null)) { final L2Clan pkClan = pk.getClan(); - if ((pkClan != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pkClan != null) && (_clan != null) && !isAcademyMember() && !(pk.isAcademyMember())) { final ClanWar clanWar = _clan.getWarWith(pkClan.getId()); if ((clanWar != null) && AntiFeedManager.getInstance().check(killer, this)) @@ -5013,7 +5005,7 @@ public final class L2PcInstance extends L2Playable getSkillChannelized().abortChannelization(); } - if (getAgathionId() != 0) + if (_agathionId != 0) { setAgathionId(0); } @@ -5041,8 +5033,8 @@ public final class L2PcInstance extends L2Playable } final L2PcInstance pk = killer.getActingPlayer(); - if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId()) - // || getClan().isAtWarWith(((L2PcInstance)killer).getClanId()) + if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) + // || _clan.isAtWarWith(((L2PcInstance)killer).getClanId()) )) { return; @@ -5058,7 +5050,7 @@ public final class L2PcInstance extends L2Playable int dropPercent = 0; // Classic calculation. - if (killer.isPlayable() && (getReputation() < 0) && (getPkKills() >= Config.KARMA_PK_LIMIT)) + if (killer.isPlayable() && (getReputation() < 0) && (_pkKills >= Config.KARMA_PK_LIMIT)) { isKarmaDrop = true; dropPercent = Config.KARMA_RATE_DROP; @@ -5080,16 +5072,15 @@ public final class L2PcInstance extends L2Playable { int dropCount = 0; int itemDropPercent = 0; - final L2Summon pet = getPet(); - for (L2ItemInstance itemDrop : getInventory().getItems()) + for (L2ItemInstance itemDrop : _inventory.getItems()) { // Don't drop if (itemDrop.isShadowItem() || // Dont drop Shadow Items itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items !itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena (itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST) || // Quest Items - ((pet != null) && (pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet + ((_pet != null) && (_pet.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list (Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list )) @@ -5101,7 +5092,7 @@ public final class L2PcInstance extends L2Playable { // Set proper chance according to Item type of equipped Item itemDropPercent = itemDrop.getItem().getType2() == L2Item.TYPE2_WEAPON ? dropEquipWeapon : dropEquip; - getInventory().unEquipItemInSlot(itemDrop.getLocationSlot()); + _inventory.unEquipItemInSlot(itemDrop.getLocationSlot()); } else { @@ -5134,80 +5125,78 @@ public final class L2PcInstance extends L2Playable public void onPlayerKill(L2Playable killedPlayable) { - final L2PcInstance player = getActingPlayer(); final L2PcInstance killedPlayer = killedPlayable.getActingPlayer(); // Avoid nulls && check if player != killedPlayer - if ((player == null) || (killedPlayer == null) || (player == killedPlayer)) + if ((killedPlayer == null) || (this == killedPlayer)) { return; } // Cursed weapons progress - if (player.isCursedWeaponEquipped() && killedPlayer.isPlayer()) + if (isCursedWeaponEquipped() && killedPlayer.isPlayer()) { CursedWeaponsManager.getInstance().increaseKills(getCursedWeaponEquippedId()); return; } // Duel support - if (player.isInDuel() && killedPlayer.getActingPlayer().isInDuel()) + if (isInDuel() && killedPlayer.isInDuel()) { return; } // Do nothing if both players are in PVP zone - if (player.isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) + if (isInsideZone(ZoneId.PVP) && killedPlayer.isInsideZone(ZoneId.PVP)) { return; } // If both players are in SIEGE zone just increase siege kills/deaths - if (player.isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) + if (isInsideZone(ZoneId.SIEGE) && killedPlayer.isInsideZone(ZoneId.SIEGE)) { - if ((player.getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (player.getSiegeState() != killedPlayer.getSiegeState())) + if ((getSiegeState() > 0) && (killedPlayer.getSiegeState() > 0) && (getSiegeState() != killedPlayer.getSiegeState())) { - final L2Clan killerClan = player.getClan(); final L2Clan targetClan = killedPlayer.getClan(); - if ((killerClan != null) && (targetClan != null)) + if ((_clan != null) && (targetClan != null)) { - killerClan.addSiegeKill(); + _clan.addSiegeKill(); targetClan.addSiegeDeath(); } } return; } - if (player.checkIfPvP(killedPlayer)) + if (checkIfPvP(killedPlayer)) { // Check if player should get + rep if (killedPlayer.getReputation() < 0) { - final int levelDiff = killedPlayer.getLevel() - player.getLevel(); - if ((player.getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours + final int levelDiff = killedPlayer.getLevel() - getLevel(); + if ((getReputation() >= 0) && (levelDiff < 11) && (levelDiff > -11)) // TODO: Time check, same player can't be killed again in 8 hours { - player.setReputation(player.getReputation() + Config.REPUTATION_INCREASE); + setReputation(getReputation() + Config.REPUTATION_INCREASE); } } - player.setPvpKills(player.getPvpKills() + 1); + setPvpKills(_pvpKills + 1); } - else if ((getReputation() > 0) && (getPkKills() == 0)) + else if ((getReputation() > 0) && (_pkKills == 0)) { - player.setReputation(0); - player.setPkKills(player.getPkKills() + 1); + setReputation(0); + setPkKills(getPkKills() + 1); } else { // Calculate new karma and increase pk count - player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killedPlayable.isSummon())); - player.setPkKills(player.getPkKills() + 1); + setReputation(getReputation() - Formulas.calculateKarmaGain(getPkKills(), killedPlayable.isSummon())); + setPkKills(getPkKills() + 1); } final UserInfo ui = new UserInfo(this, false); ui.addComponentType(UserInfoType.SOCIAL); - player.sendPacket(ui); - player.checkItemRestriction(); + sendPacket(ui); + checkItemRestriction(); } public void updatePvPStatus() @@ -5218,7 +5207,7 @@ public final class L2PcInstance extends L2Playable } setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5242,7 +5231,7 @@ public final class L2PcInstance extends L2Playable return; } - if (isInDuel() && (player_target.getDuelId() == getDuelId())) + if (_isInDuel && (player_target.getDuelId() == getDuelId())) { return; } @@ -5256,7 +5245,7 @@ public final class L2PcInstance extends L2Playable { setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } - if (getPvpFlag() == 0) + if (_pvpFlag == 0) { startPvPFlag(); } @@ -5277,10 +5266,10 @@ public final class L2PcInstance extends L2Playable */ public void restoreExp(double restorePercent) { - if (getExpBeforeDeath() > 0) + if (_expBeforeDeath > 0) { // Restore the specified % of lost experience. - getStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100)); + getStat().addExp(Math.round(((_expBeforeDeath - getExp()) * restorePercent) / 100)); setExpBeforeDeath(0); } } @@ -5398,10 +5387,9 @@ public final class L2PcInstance extends L2Playable final List summons = new ArrayList<>(); summons.addAll(getServitors().values()); - final L2PetInstance pet = getPet(); - if (pet != null) + if (_pet != null) { - summons.add(pet); + summons.add(_pet); } return summons; @@ -5799,11 +5787,11 @@ public final class L2PcInstance extends L2Playable */ public boolean isClanLeader() { - if (getClan() == null) + if (_clan == null) { return false; } - return getObjectId() == getClan().getLeaderId(); + return getObjectId() == _clan.getLeaderId(); } /** @@ -5813,22 +5801,22 @@ public final class L2PcInstance extends L2Playable @Override protected boolean checkAndEquipAmmunition(EtcItemType type) { - L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + L2ItemInstance arrows = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (arrows == null) { final L2Weapon weapon = getActiveWeaponItem(); if (type == EtcItemType.ARROW) { - arrows = getInventory().findArrowForBow(weapon); + arrows = _inventory.findArrowForBow(weapon); } else if (type == EtcItemType.BOLT) { - arrows = getInventory().findBoltForCrossBow(weapon); + arrows = _inventory.findBoltForCrossBow(weapon); } if (arrows != null) { // Equip arrows needed in left hand - getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); + _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); sendItemList(false); return true; } @@ -5847,7 +5835,7 @@ public final class L2PcInstance extends L2Playable public boolean disarmWeapons() { // If there is no weapon to disarm then return true. - final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance wpn = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (wpn == null) { return true; @@ -5860,7 +5848,7 @@ public final class L2PcInstance extends L2Playable } // Don't allow disarming a Combat Flag or Territory Ward. - if (isCombatFlagEquipped()) + if (_combatFlagEquippedId) { return false; } @@ -5871,7 +5859,7 @@ public final class L2PcInstance extends L2Playable return false; } - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -5908,10 +5896,10 @@ public final class L2PcInstance extends L2Playable */ public boolean disarmShield() { - final L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND); + final L2ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final L2ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (L2ItemInstance itm : unequiped) { @@ -6019,7 +6007,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE); return false; } - else if (isSitting()) + else if (_waitTypeSitting) { // A strider can be ridden only when standing sendPacket(ActionFailed.STATIC_PACKET); @@ -6039,7 +6027,7 @@ public final class L2PcInstance extends L2Playable sendPacket(ActionFailed.STATIC_PACKET); return false; } - else if (getInventory().getItemByItemId(9819) != null) + else if (_inventory.getItemByItemId(9819) != null) { sendPacket(ActionFailed.STATIC_PACKET); // FIXME: Wrong Message @@ -6069,7 +6057,7 @@ public final class L2PcInstance extends L2Playable } else if (isMounted()) { - if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) + if ((_mountType == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) { sendPacket(ActionFailed.STATIC_PACKET); sendPacket(SystemMessageId.YOU_ARE_NOT_ALLOWED_TO_DISMOUNT_IN_THIS_LOCATION); @@ -6218,12 +6206,12 @@ public final class L2PcInstance extends L2Playable public boolean isInCommandChannel() { - return isInParty() && getParty().isInCommandChannel(); + return isInParty() && _party.isInCommandChannel(); } public L2CommandChannel getCommandChannel() { - return (isInCommandChannel()) ? getParty().getCommandChannel() : null; + return (isInCommandChannel()) ? _party.getCommandChannel() : null; } /** @@ -6232,7 +6220,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isGM() { - return getAccessLevel().isGm(); + return _accessLevel.isGm(); } /** @@ -6263,8 +6251,8 @@ public final class L2PcInstance extends L2Playable _accessLevel = accessLevel; - getAppearance().setNameColor(_accessLevel.getNameColor()); - getAppearance().setTitleColor(_accessLevel.getTitleColor()); + _appearance.setNameColor(_accessLevel.getNameColor()); + _appearance.setTitleColor(_accessLevel.getTitleColor()); if (broadcast) { broadcastUserInfo(); @@ -6352,10 +6340,9 @@ public final class L2PcInstance extends L2Playable rc.addRelation(this, relation, isAutoAttackable(player)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc.addRelation(pet, relation, isAutoAttackable(player)); + rc.addRelation(_pet, relation, isAutoAttackable(player)); } if (hasServitors()) { @@ -6425,32 +6412,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(8, getCurrentCp()); statement.setInt(9, getMaxMp()); statement.setDouble(10, getCurrentMp()); - statement.setInt(11, getAppearance().getFace()); - statement.setInt(12, getAppearance().getHairStyle()); - statement.setInt(13, getAppearance().getHairColor()); - statement.setInt(14, getAppearance().getSex() ? 1 : 0); + statement.setInt(11, _appearance.getFace()); + statement.setInt(12, _appearance.getHairStyle()); + statement.setInt(13, _appearance.getHairColor()); + statement.setInt(14, _appearance.getSex() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); - statement.setInt(18, getFame()); - statement.setInt(19, getRaidbossPoints()); - statement.setInt(20, getPvpKills()); - statement.setInt(21, getPkKills()); - statement.setInt(22, getClanId()); + statement.setInt(18, _fame); + statement.setInt(19, _raidbossPoints); + statement.setInt(20, _pvpKills); + statement.setInt(21, _pkKills); + statement.setInt(22, _clanId); statement.setInt(23, getRace().ordinal()); statement.setInt(24, getClassId().getId()); - statement.setLong(25, getDeleteTimer()); + statement.setLong(25, _deleteTimer); statement.setInt(26, hasDwarvenCraft() ? 1 : 0); statement.setString(27, getTitle()); - statement.setInt(28, getAppearance().getTitleColor()); + statement.setInt(28, _appearance.getTitleColor()); statement.setInt(29, isOnlineInt()); - statement.setInt(30, getClanPrivileges().getBitmask()); - statement.setInt(31, getWantsPeace()); - statement.setInt(32, getBaseClass()); + statement.setInt(30, _clanPrivileges.getBitmask()); + statement.setInt(31, _wantsPeace); + statement.setInt(32, _baseClass); statement.setInt(33, isNoble() ? 1 : 0); statement.setLong(34, 0); statement.setInt(35, PcStat.MIN_VITALITY_POINTS); - statement.setDate(36, new Date(getCreateDate().getTimeInMillis())); + statement.setDate(36, new Date(_createDate.getTimeInMillis())); statement.executeUpdate(); } catch (Exception e) @@ -7084,32 +7071,32 @@ public final class L2PcInstance extends L2Playable statement.setDouble(5, getCurrentCp()); statement.setInt(6, getMaxMp()); statement.setDouble(7, getCurrentMp()); - statement.setInt(8, getAppearance().getFace()); - statement.setInt(9, getAppearance().getHairStyle()); - statement.setInt(10, getAppearance().getHairColor()); - statement.setInt(11, getAppearance().getSex() ? 1 : 0); + statement.setInt(8, _appearance.getFace()); + statement.setInt(9, _appearance.getHairStyle()); + statement.setInt(10, _appearance.getHairColor()); + statement.setInt(11, _appearance.getSex() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); statement.setInt(15, _lastLoc != null ? _lastLoc.getZ() : getZ()); statement.setLong(16, exp); - statement.setLong(17, getExpBeforeDeath()); + statement.setLong(17, _expBeforeDeath); statement.setLong(18, sp); statement.setInt(19, getReputation()); - statement.setInt(20, getFame()); - statement.setInt(21, getRaidbossPoints()); - statement.setInt(22, getPvpKills()); - statement.setInt(23, getPkKills()); - statement.setInt(24, getClanId()); + statement.setInt(20, _fame); + statement.setInt(21, _raidbossPoints); + statement.setInt(22, _pvpKills); + statement.setInt(23, _pkKills); + statement.setInt(24, _clanId); statement.setInt(25, getRace().ordinal()); statement.setInt(26, getClassId().getId()); - statement.setLong(27, getDeleteTimer()); + statement.setLong(27, _deleteTimer); statement.setString(28, getTitle()); - statement.setInt(29, getAppearance().getTitleColor()); + statement.setInt(29, _appearance.getTitleColor()); statement.setInt(30, isOnlineInt()); - statement.setInt(31, getClanPrivileges().getBitmask()); - statement.setInt(32, getWantsPeace()); - statement.setInt(33, getBaseClass()); + statement.setInt(31, _clanPrivileges.getBitmask()); + statement.setInt(32, _wantsPeace); + statement.setInt(33, _baseClass); long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) @@ -7119,29 +7106,29 @@ public final class L2PcInstance extends L2Playable statement.setLong(34, totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); - statement.setInt(36, getPowerGrade()); - statement.setInt(37, getPledgeType()); - statement.setInt(38, getLvlJoinedAcademy()); - statement.setLong(39, getApprentice()); - statement.setLong(40, getSponsor()); - statement.setLong(41, getClanJoinExpiryTime()); - statement.setLong(42, getClanCreateExpiryTime()); + statement.setInt(36, _powerGrade); + statement.setInt(37, _pledgeType); + statement.setInt(38, _lvlJoinedAcademy); + statement.setLong(39, _apprentice); + statement.setLong(40, _sponsor); + statement.setLong(41, _clanJoinExpiryTime); + statement.setLong(42, _clanCreateExpiryTime); statement.setString(43, getName()); - statement.setInt(44, getBookMarkSlot()); + statement.setInt(44, _bookmarkslot); statement.setInt(45, getStat().getBaseVitalityPoints()); - statement.setString(46, getLang()); + statement.setString(46, _lang); int factionId = 0; - if (isGood()) + if (_isGood) { factionId = 1; } - if (isEvil()) + if (_isEvil) { factionId = 2; } statement.setInt(47, factionId); - statement.setInt(48, getPcCafePoints()); + statement.setInt(48, _pcCafePoints); statement.setInt(49, getObjectId()); statement.execute(); @@ -7196,7 +7183,7 @@ public final class L2PcInstance extends L2Playable { // Delete all current stored effects for char to avoid dupe delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.execute(); int buff_index = 0; @@ -7262,7 +7249,7 @@ public final class L2PcInstance extends L2Playable statement.setDouble(7, (t != null) && t.hasNotPassed() ? t.getStamp() : 0); statement.setInt(8, 0); // Store type 0, active buffs/debuffs. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7294,7 +7281,7 @@ public final class L2PcInstance extends L2Playable statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); statement.setInt(8, 1); // Restore type 1, skill reuse. - statement.setInt(9, getClassIndex()); + statement.setInt(9, _classIndex); statement.setInt(10, ++buff_index); statement.addBatch(); } @@ -7433,7 +7420,7 @@ public final class L2PcInstance extends L2Playable // Remove or update a L2PcInstance skill from the character_skills table of the database statement.setInt(1, oldSkill.getId()); statement.setInt(2, getObjectId()); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7449,7 +7436,7 @@ public final class L2PcInstance extends L2Playable if (skill != null) { - for (Shortcut sc : getAllShortCuts()) + for (Shortcut sc : _shortCuts.getAllShortCuts()) { if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) { @@ -7552,7 +7539,7 @@ public final class L2PcInstance extends L2Playable { // Retrieve all skills of this L2PcInstance from the database statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7603,7 +7590,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_SKILL_SAVE)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -7641,7 +7628,7 @@ public final class L2PcInstance extends L2Playable try (PreparedStatement delete = con.prepareStatement(DELETE_SKILL_SAVE)) { delete.setInt(1, getObjectId()); - delete.setInt(2, getClassIndex()); + delete.setInt(2, _classIndex); delete.executeUpdate(); } } @@ -7679,7 +7666,7 @@ public final class L2PcInstance extends L2Playable isInInventory = true; // Using item Id - L2ItemInstance item = getInventory().getItemByItemId(itemId); + L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { item = getWarehouse().getItemByItemId(itemId); @@ -7731,7 +7718,7 @@ public final class L2PcInstance extends L2Playable PreparedStatement statement = con.prepareStatement(RESTORE_CHAR_HENNAS)) { statement.setInt(1, getObjectId()); - statement.setInt(2, getClassIndex()); + statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { int slot; @@ -7839,7 +7826,7 @@ public final class L2PcInstance extends L2Playable { statement.setInt(1, getObjectId()); statement.setInt(2, slot); - statement.setInt(3, getClassIndex()); + statement.setInt(3, _classIndex); statement.execute(); } catch (Exception e) @@ -7868,7 +7855,7 @@ public final class L2PcInstance extends L2Playable } if (henna.getCancelCount() > 0) { - getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); + _inventory.addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); sm.addItemName(henna.getDyeItemId()); sm.addLong(henna.getCancelCount()); @@ -7921,7 +7908,7 @@ public final class L2PcInstance extends L2Playable statement.setInt(1, getObjectId()); statement.setInt(2, henna.getDyeId()); statement.setInt(3, i); - statement.setInt(4, getClassIndex()); + statement.setInt(4, _classIndex); statement.execute(); } catch (Exception e) @@ -8065,7 +8052,7 @@ public final class L2PcInstance extends L2Playable if (Config.UPDATE_ITEMS_ON_CHAR_STORE) { - getInventory().updateDatabase(); + _inventory.updateDatabase(); getWarehouse().updateDatabase(); } } @@ -8116,7 +8103,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker isn't the L2PcInstance Pet - if ((attacker == this) || (attacker == getPet()) || attacker.hasServitor(attacker.getObjectId())) + if ((attacker == this) || (attacker == _pet) || attacker.hasServitor(attacker.getObjectId())) { return false; } @@ -8134,13 +8121,13 @@ public final class L2PcInstance extends L2Playable } // is AutoAttackable if both players are in the same duel and the duel is still going on - if (attacker.isPlayable() && (getDuelState() == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) + if (attacker.isPlayable() && (_duelState == Duel.DUELSTATE_DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) { return true; } // Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly. - if (isInParty() && getParty().getMembers().contains(attacker)) + if (isInParty() && _party.getMembers().contains(attacker)) { return false; } @@ -8148,14 +8135,14 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) + if (_inOlympiadMode && _OlympiadStart && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) { return true; } return false; } - if (isOnCustomEvent() && (getTeam() == attacker.getTeam())) + if (_isOnCustomEvent && (getTeam() == attacker.getTeam())) { return false; } @@ -8177,7 +8164,7 @@ public final class L2PcInstance extends L2Playable // Get L2PcInstance final L2PcInstance attackerPlayer = attacker.getActingPlayer(); - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ()); if (siege != null) @@ -8210,7 +8197,7 @@ public final class L2PcInstance extends L2Playable } // Check if the attacker is not in the same clan - if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) + if ((_clan != null) && _clan.isMember(attacker.getObjectId())) { return false; } @@ -8235,10 +8222,10 @@ public final class L2PcInstance extends L2Playable if (attacker instanceof L2DefenderInstance) { - if (getClan() != null) + if (_clan != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return ((siege != null) && siege.checkIsAttacker(_clan)); } } @@ -8248,7 +8235,7 @@ public final class L2PcInstance extends L2Playable } // Check if the L2PcInstance has Karma - if ((getReputation() < 0) || (getPvpFlag() > 0)) + if ((getReputation() < 0) || (_pvpFlag > 0)) { return true; } @@ -8335,7 +8322,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (inObserverMode()) + if (_observerMode) { sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE); sendPacket(ActionFailed.STATIC_PACKET); @@ -8383,7 +8370,7 @@ public final class L2PcInstance extends L2Playable } // Check if the caster is sitting - if (isSitting()) + if (_waitTypeSitting) { sendPacket(SystemMessageId.YOU_CANNOT_USE_ACTIONS_AND_SKILLS_WHILE_THE_CHARACTER_IS_SITTING); sendPacket(ActionFailed.STATIC_PACKET); @@ -8419,7 +8406,7 @@ public final class L2PcInstance extends L2Playable // ************************************* Check Target ******************************************* // Create and set a L2Object containing the target of the skill final L2Object target = skill.getTarget(this, forceUse, dontMove, true); - final Location worldPosition = getCurrentSkillWorldPosition(); + final Location worldPosition = _currentSkillWorldPosition; if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null)) { @@ -8475,7 +8462,7 @@ public final class L2PcInstance extends L2Playable return false; } - if (getQueuedSkill() != null) + if (_queuedSkill != null) { setQueuedSkill(null, null, false, false); } @@ -8490,14 +8477,14 @@ public final class L2PcInstance extends L2Playable final L2PcInstance looter = L2World.getInstance().getPlayer(LooterId); // if L2PcInstance is in a CommandChannel - if (isInParty() && getParty().isInCommandChannel() && (looter != null)) + if (isInParty() && _party.isInCommandChannel() && (looter != null)) { - return getParty().getCommandChannel().getMembers().contains(looter); + return _party.getCommandChannel().getMembers().contains(looter); } if (isInParty() && (looter != null)) { - return getParty().getMembers().contains(looter); + return _party.getMembers().contains(looter); } return false; @@ -8740,7 +8727,7 @@ public final class L2PcInstance extends L2Playable { for (int itemId : _activeSoulShots) { - final L2ItemInstance item = getInventory().getItemByItemId(itemId); + final L2ItemInstance item = _inventory.getItemByItemId(itemId); if (item == null) { removeAutoSoulShot(itemId); @@ -8834,23 +8821,23 @@ public final class L2PcInstance extends L2Playable public void updateActiveBroochJewel() { // Update active Ruby jewel. - if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped())) { setActiveRubyJewel(BroochJewel.RUBY_LV1); } @@ -8859,23 +8846,23 @@ public final class L2PcInstance extends L2Playable setActiveRubyJewel(null); } // Update active Sapphire jewel. - if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2); } - else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) + else if ((_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (_inventory.getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped())) { setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1); } @@ -9002,10 +8989,9 @@ public final class L2PcInstance extends L2Playable public void enterOlympiadObserverMode(Location loc, int id) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.unSummon(this); + _pet.unSummon(this); } if (hasServitors()) @@ -9023,13 +9009,13 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoCubic(this)); } - if (getParty() != null) + if (_party != null) { - getParty().removePartyMember(this, MessageType.EXPELLED); + _party.removePartyMember(this, MessageType.EXPELLED); } _olympiadGameId = id; - if (isSitting()) + if (_waitTypeSitting) { standUp(); } @@ -9351,12 +9337,12 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; return false; } - if (isInDuel()) + if (_isInDuel) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL; return false; } - if (isInOlympiadMode() || isOnEvent(CeremonyOfChaosEvent.class)) + if (_inOlympiadMode || isOnEvent(CeremonyOfChaosEvent.class)) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_OR_THE_CEREMONY_OF_CHAOS; return false; @@ -9371,7 +9357,7 @@ public final class L2PcInstance extends L2Playable _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_OR_PURPLE_STATE; return false; } - if (getPrivateStoreType() != PrivateStoreType.NONE) + if (_privateStoreType != PrivateStoreType.NONE) { _noDuelReason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE; return false; @@ -9434,10 +9420,9 @@ public final class L2PcInstance extends L2Playable { super.setTeam(team); broadcastUserInfo(); - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.broadcastStatusUpdate(); + _pet.broadcastStatusUpdate(); } if (hasServitors()) { @@ -9474,9 +9459,9 @@ public final class L2PcInstance extends L2Playable for (Skill s : getSkillList()) { - if (getClan() != null) + if (_clan != null) { - isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0); + isDisabled = s.isClanSkill() && (_clan.getReputationScore() < 0); } sl.addSkill(s.getDisplayId(), s.getReuseDelayGroup(), s.getDisplayLevel(), s.getSubLevel(), s.isPassive(), isDisabled, s.isEnchantable()); @@ -9787,7 +9772,7 @@ public final class L2PcInstance extends L2Playable // Remove active item skills before saving char to database // because next time when choosing this class, weared items can // be different - for (L2ItemInstance item : getInventory().getPaperdollItems(L2ItemInstance::isAugmented)) + for (L2ItemInstance item : _inventory.getPaperdollItems(L2ItemInstance::isAugmented)) { if ((item != null) && item.isEquipped()) { @@ -9825,7 +9810,7 @@ public final class L2PcInstance extends L2Playable if (classIndex == 0) { - setClassTemplate(getBaseClass()); + setClassTemplate(_baseClass); } else { @@ -9843,7 +9828,7 @@ public final class L2PcInstance extends L2Playable if (isInParty()) { - getParty().recalculatePartyLevel(); + _party.recalculatePartyLevel(); } // Update the character's change in class status. @@ -9878,7 +9863,7 @@ public final class L2PcInstance extends L2Playable sendPacket(new EtcStatusUpdate(this)); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 4; i++) { _henna[i] = null; } @@ -9949,7 +9934,7 @@ public final class L2PcInstance extends L2Playable if (_taskRentPet != null) { // if the rent of a wyvern expires while over a flying zone, tp to down before unmounting - if (checkLandingState() && (getMountType() == MountType.WYVERN)) + if (checkLandingState() && (_mountType == MountType.WYVERN)) { teleToLocation(TeleportWhereType.TOWN); } @@ -10038,7 +10023,7 @@ public final class L2PcInstance extends L2Playable { sendMessage("Entering world in Invisible mode."); } - if (isSilenceMode()) + if (_silenceMode) { sendMessage("Entering world in Silence mode."); } @@ -10144,7 +10129,7 @@ public final class L2PcInstance extends L2Playable restoreExp(revivePower); } - public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int power) + public void reviveRequest(L2PcInstance reviver, Skill skill, boolean isPet, int power) { if (isResurrectionBlocked()) { @@ -10153,11 +10138,11 @@ public final class L2PcInstance extends L2Playable if (_reviveRequested == 1) { - if (_revivePet == Pet) + if (_revivePet == isPet) { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } - else if (Pet) + else if (isPet) { reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. } @@ -10167,12 +10152,11 @@ public final class L2PcInstance extends L2Playable } return; } - final L2Summon pet = getPet(); - if ((Pet && (pet != null) && pet.isDead()) || (!Pet && isDead())) + if ((isPet && (_pet != null) && _pet.isDead()) || (!isPet && isDead())) { _reviveRequested = 1; _revivePower = Formulas.calculateSkillResurrectRestorePercent(power, reviver); - _revivePet = Pet; + _revivePet = isPet; if (hasCharmOfCourage()) { @@ -10182,7 +10166,7 @@ public final class L2PcInstance extends L2Playable return; } - final long restoreExp = Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100); + final long restoreExp = Math.round(((_expBeforeDeath - getExp()) * _revivePower) / 100); final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); dlg.addPcName(reviver); dlg.addLong(restoreExp); @@ -10193,8 +10177,7 @@ public final class L2PcInstance extends L2Playable public void reviveAnswer(int answer) { - final L2Summon pet = getPet(); - if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (pet != null) && !pet.isDead())) + if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && (_pet != null) && !_pet.isDead())) { return; } @@ -10212,15 +10195,15 @@ public final class L2PcInstance extends L2Playable doRevive(); } } - else if (pet != null) + else if (_pet != null) { if (_revivePower != 0) { - pet.doRevive(_revivePower); + _pet.doRevive(_revivePower); } else { - pet.doRevive(); + _pet.doRevive(); } } } @@ -10289,7 +10272,7 @@ public final class L2PcInstance extends L2Playable @Override public void teleToLocation(ILocational loc, boolean allowRandomOffset) { - if ((getVehicle() != null) && !getVehicle().isTeleporting()) + if ((_vehicle != null) && !_vehicle.isTeleporting()) { setVehicle(null); } @@ -10320,31 +10303,30 @@ public final class L2PcInstance extends L2Playable checkItemRestriction(); - if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !isInOlympiadMode()) + if ((Config.PLAYER_TELEPORT_PROTECTION > 0) && !_inOlympiadMode) { setTeleportProtection(true); } // Trained beast is lost after teleport - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.deleteMe(); } - getTrainedBeasts().clear(); + _tamedBeast.clear(); } // Modify the position of the pet if necessary - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - pet.setFollowStatus(false); - pet.teleToLocation(getLocation(), false); - ((L2SummonAI) pet.getAI()).setStartFollowController(true); - pet.setFollowStatus(true); - pet.setInstance(getInstanceWorld()); - pet.updateAndBroadcastStatus(0); + _pet.setFollowStatus(false); + _pet.teleToLocation(getLocation(), false); + ((L2SummonAI) _pet.getAI()).setStartFollowController(true); + _pet.setFollowStatus(true); + _pet.setInstance(getInstanceWorld()); + _pet.updateAndBroadcastStatus(0); } getServitors().values().forEach(s -> @@ -10434,9 +10416,9 @@ public final class L2PcInstance extends L2Playable super.reduceCurrentHp(value, attacker, skill, isDOT, directlyToHp, critical, reflect); // notify the tamed beast of attacks - if (getTrainedBeasts() != null) + if (_tamedBeast != null) { - for (L2TamedBeastInstance tamedBeast : getTrainedBeasts()) + for (L2TamedBeastInstance tamedBeast : _tamedBeast) { tamedBeast.onOwnerGotAttacked(attacker); } @@ -10569,7 +10551,7 @@ public final class L2PcInstance extends L2Playable */ public boolean validateItemManipulation(int objectId, String action) { - final L2ItemInstance item = getInventory().getItemByObjectId(objectId); + final L2ItemInstance item = _inventory.getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { @@ -10578,8 +10560,7 @@ public final class L2PcInstance extends L2Playable } // Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting - final L2Summon pet = getPet(); - if (((pet != null) && (pet.getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) + if (((_pet != null) && (_pet.getControlObjectId() == objectId)) || (_mountObjectID == objectId)) { return false; } @@ -10721,7 +10702,7 @@ public final class L2PcInstance extends L2Playable // Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout) try { - if (!isOnline()) + if (!_isOnline) { LOGGER.log(Level.SEVERE, "deleteMe() called on offline character " + this, new RuntimeException()); } @@ -10734,7 +10715,7 @@ public final class L2PcInstance extends L2Playable try { - if (Config.ENABLE_BLOCK_CHECKER_EVENT && (getBlockCheckerArena() != -1)) + if (Config.ENABLE_BLOCK_CHECKER_EVENT && (_handysBlockCheckerEventArena != -1)) { HandysBlockCheckerManager.getInstance().onDisconnect(this); } @@ -10759,7 +10740,7 @@ public final class L2PcInstance extends L2Playable // remove combat flag try { - if (getInventory().getItemByItemId(9819) != null) + if (_inventory.getItemByItemId(9819) != null) { final Fort fort = FortManager.getInstance().getFort(this); if (fort != null) @@ -10768,9 +10749,9 @@ public final class L2PcInstance extends L2Playable } else { - final int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819)); - getInventory().unEquipItemInBodySlot(slot); - destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true); + final int slot = _inventory.getSlotFromItem(_inventory.getItemByItemId(9819)); + _inventory.unEquipItemInBodySlot(slot); + destroyItem("CombatFlag", _inventory.getItemByItemId(9819), null, true); } } } @@ -10896,13 +10877,13 @@ public final class L2PcInstance extends L2Playable { try { - L2Summon pet = getPet(); + L2Summon pet = _pet; if (pet != null) { pet.setRestoreSummon(true); pet.unSummon(this); // Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline) - pet = getPet(); + pet = _pet; if (pet != null) { pet.broadcastNpcInfo(0); @@ -10921,12 +10902,12 @@ public final class L2PcInstance extends L2Playable } // returns pet to control item } - if (getClan() != null) + if (_clan != null) { // set the status for pledge member list to OFFLINE try { - final L2ClanMember clanMember = getClan().getClanMember(getObjectId()); + final L2ClanMember clanMember = _clan.getClanMember(getObjectId()); if (clanMember != null) { clanMember.setPlayerInstance(null); @@ -10963,14 +10944,14 @@ public final class L2PcInstance extends L2Playable { // Check if the L2PcInstance is in observer mode to set its position to its position // before entering in observer mode - if (inObserverMode()) + if (_observerMode) { setLocationInvisible(_lastLoc); } - if (getVehicle() != null) + if (_vehicle != null) { - getVehicle().oustPlayer(this); + _vehicle.oustPlayer(this); } } catch (Exception e) @@ -11004,7 +10985,7 @@ public final class L2PcInstance extends L2Playable // Update database with items in its inventory and remove them from the world try { - getInventory().deleteMe(); + _inventory.deleteMe(); } catch (Exception e) { @@ -11027,7 +11008,7 @@ public final class L2PcInstance extends L2Playable try { - getFreight().deleteMe(); + _freight.deleteMe(); } catch (Exception e) { @@ -11055,10 +11036,10 @@ public final class L2PcInstance extends L2Playable } } - if (getClanId() > 0) + if (_clanId > 0) { - getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); - getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan())); + _clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); + _clan.broadcastToOnlineMembers(new ExPledgeCount(_clan)); // ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); } @@ -11092,7 +11073,7 @@ public final class L2PcInstance extends L2Playable try { notifyFriends(L2FriendStatus.MODE_OFFLINE); - getBlockList().playerLogout(); + _blockList.playerLogout(); } catch (Exception e) { @@ -11348,12 +11329,12 @@ public final class L2PcInstance extends L2Playable { _souls -= count; - if (getChargedSouls() < 0) + if (_souls < 0) { _souls = 0; } - if (getChargedSouls() == 0) + if (_souls == 0) { stopSoulTask(); } @@ -11516,10 +11497,10 @@ public final class L2PcInstance extends L2Playable { for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) { - final L2ItemInstance equippedItem = getInventory().getPaperdollItem(i); + final L2ItemInstance equippedItem = _inventory.getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) { - getInventory().unEquipItemInSlot(i); + _inventory.unEquipItemInSlot(i); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(equippedItem); @@ -11669,10 +11650,9 @@ public final class L2PcInstance extends L2Playable } if (hasPet()) { - final L2Summon pet = getPet(); - setCurrentFeed(((L2PetInstance) pet).getCurrentFed()); - _controlItemId = pet.getControlObjectId(); - sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); + setCurrentFeed(_pet.getCurrentFed()); + _controlItemId = _pet.getControlObjectId(); + sendPacket(new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume())); if (!isDead()) { _mountFeedTask = ThreadPool.scheduleAtFixedRate(new PetFeedTask(this), 10000, 10000); @@ -11681,7 +11661,7 @@ public final class L2PcInstance extends L2Playable else if (_canFeed) { setCurrentFeed(getMaxFeed()); - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); if (!isDead()) { @@ -11741,7 +11721,7 @@ public final class L2PcInstance extends L2Playable { final boolean lastHungryState = isHungry(); _curFeed = num > getMaxFeed() ? getMaxFeed() : num; - final SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); + final SetupGauge sg = new SetupGauge(3, (_curFeed * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()); sendPacket(sg); // broadcast move speed change when strider becomes hungry / full if (lastHungryState != isHungry()) @@ -11757,7 +11737,7 @@ public final class L2PcInstance extends L2Playable public boolean isHungry() { - return hasPet() && _canFeed && (getCurrentFeed() < ((getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())); + return hasPet() && _canFeed && (_curFeed < ((getPetData(_mountNpcId).getHungryLimit() / 100f) * getPetLevelData(_mountNpcId).getPetMaxFeed())); } public void enteredNoLanding(int delay) @@ -11783,7 +11763,7 @@ public final class L2PcInstance extends L2Playable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(req)) { - statement.setInt(1, getCurrentFeed()); + statement.setInt(1, _curFeed); statement.setInt(2, _controlItemId); statement.executeUpdate(); _controlItemId = 0; @@ -11952,7 +11932,7 @@ public final class L2PcInstance extends L2Playable { return; } - if (getInventory().getInventoryItemCount(13016, 0) == 0) + if (_inventory.getInventoryItemCount(13016, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM); return; @@ -11964,7 +11944,7 @@ public final class L2PcInstance extends L2Playable final TeleportBookmark bookmark = _tpbookmarks.get(id); if (bookmark != null) { - destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(13016).getObjectId(), 1, null, false); teleToLocation(bookmark, false); } sendPacket(new ExGetBookMarkInfoPacket(this)); @@ -11977,12 +11957,12 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE); return false; } - else if (isInSiege() || (getSiegeState() != 0)) + else if (_isInSiege || (_siegeState != 0)) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_A_LARGE_SCALE_BATTLE_SUCH_AS_A_CASTLE_SIEGE_FORTRESS_SIEGE_OR_CLAN_HALL_SIEGE); return false; } - else if (isInDuel()) + else if (_isInDuel) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL); return false; @@ -11992,7 +11972,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING); return false; } - else if (isInOlympiadMode()) + else if (_inOlympiadMode) { sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH); return false; @@ -12051,7 +12031,7 @@ public final class L2PcInstance extends L2Playable return; } - if (getInventory().getInventoryItemCount(20033, 0) == 0) + if (_inventory.getInventoryItemCount(20033, 0) == 0) { sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG); return; @@ -12067,7 +12047,7 @@ public final class L2PcInstance extends L2Playable } _tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name)); - destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false); + destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); sm.addItemName(20033); @@ -12121,7 +12101,7 @@ public final class L2PcInstance extends L2Playable setXYZ(getBoat().getLocation()); activeChar.sendPacket(new CharInfo(this, isInvisible() && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS))); - activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition())); + activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), _inVehiclePosition)); } else if (isInAirShip()) { @@ -12139,10 +12119,9 @@ public final class L2PcInstance extends L2Playable rc1.addRelation(this, relation1, isAutoAttackable(activeChar)); if (hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc1.addRelation(pet, relation1, isAutoAttackable(activeChar)); + rc1.addRelation(_pet, relation1, isAutoAttackable(activeChar)); } if (hasServitors()) { @@ -12156,10 +12135,9 @@ public final class L2PcInstance extends L2Playable rc2.addRelation(activeChar, relation2, activeChar.isAutoAttackable(this)); if (activeChar.hasSummon()) { - final L2Summon pet = getPet(); - if (pet != null) + if (_pet != null) { - rc2.addRelation(pet, relation2, activeChar.isAutoAttackable(this)); + rc2.addRelation(_pet, relation2, activeChar.isAutoAttackable(this)); } if (hasServitors()) { @@ -12168,7 +12146,7 @@ public final class L2PcInstance extends L2Playable } sendPacket(rc2); - switch (getPrivateStoreType()) + switch (_privateStoreType) { case SELL: { @@ -12195,7 +12173,7 @@ public final class L2PcInstance extends L2Playable public void playMovie(MovieHolder holder) { - if (getMovieHolder() != null) + if (_movieHolder != null) { return; } @@ -12211,7 +12189,7 @@ public final class L2PcInstance extends L2Playable public void stopMovie() { - sendPacket(new ExStopScenePlayer(getMovieHolder().getMovie())); + sendPacket(new ExStopScenePlayer(_movieHolder.getMovie())); setMovieHolder(null); } @@ -12289,7 +12267,7 @@ public final class L2PcInstance extends L2Playable public int getBirthdays() { - long time = (System.currentTimeMillis() - getCreateDate().getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12458,24 +12436,24 @@ public final class L2PcInstance extends L2Playable @Override public double getCollisionRadius() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override public double getCollisionHeight() { - if (isMounted() && (getMountNpcId() > 0)) + if (isMounted() && (_mountNpcId > 0)) { return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } @@ -12617,7 +12595,7 @@ public final class L2PcInstance extends L2Playable @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || (getMovieHolder() != null) || _fishing.isFishing(); + return super.isMovementDisabled() || (_movieHolder != null) || _fishing.isFishing(); } public String getHtmlPrefix() @@ -12727,7 +12705,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return ((_privateStoreType == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); } public void setMultiSocialAction(int id, int targetId) @@ -12827,7 +12805,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.9)); } /** @@ -12837,7 +12815,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder80(boolean includeQuestInv) { - return (getInventory().getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); + return (_inventory.getSize(item -> !item.isQuestItem() || includeQuestInv) <= (getInventoryLimit() * 0.8)); } public boolean havePetInvItems() @@ -12923,8 +12901,8 @@ public final class L2PcInstance extends L2Playable PreparedStatement ps = con.prepareStatement("REPLACE INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?)")) { ps.setInt(1, getObjectId()); - ps.setInt(2, getRecomHave()); - ps.setInt(3, getRecomLeft()); + ps.setInt(2, _recomHave); + ps.setInt(3, _recomLeft); ps.setLong(4, 0); ps.execute(); } @@ -13351,7 +13329,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHair() { - return getVariables().getInt("visualHairId", getAppearance().getHairStyle()); + return getVariables().getInt("visualHairId", _appearance.getHairStyle()); } /** @@ -13359,7 +13337,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualHairColor() { - return getVariables().getInt("visualHairColorId", getAppearance().getHairColor()); + return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); } /** @@ -13367,7 +13345,7 @@ public final class L2PcInstance extends L2Playable */ public int getVisualFace() { - return getVariables().getInt("visualFaceId", getAppearance().getFace()); + return getVariables().getInt("visualFaceId", _appearance.getFace()); } /** @@ -13466,7 +13444,7 @@ public final class L2PcInstance extends L2Playable */ public CastleSide getPlayerSide() { - if ((getClan() == null) || (getClan().getCastleId() == 0)) + if ((_clan == null) || (_clan.getCastleId() == 0)) { return CastleSide.NEUTRAL; } @@ -13813,7 +13791,7 @@ public final class L2PcInstance extends L2Playable @Override public MoveType getMoveType() { - if (isSitting()) + if (_waitTypeSitting) { return MoveType.SITTING; } @@ -13832,10 +13810,9 @@ public final class L2PcInstance extends L2Playable private void updateOnlineTime() { - final L2Clan clan = getClan(); - if (clan != null) + if (_clan != null) { - clan.addMemberOnlineTime(this); + _clan.addMemberOnlineTime(this); } } @@ -13850,7 +13827,7 @@ public final class L2PcInstance extends L2Playable public GroupType getGroupType() { - return isInParty() ? (getParty().isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; + return isInParty() ? (_party.isInCommandChannel() ? GroupType.COMMAND_CHANNEL : GroupType.PARTY) : GroupType.NONE; } public boolean isTrueHero() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 10429b5b5b..f1112eee76 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -83,8 +83,8 @@ public class L2PetInstance extends L2Summon private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,skill_sub_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index ASC"; private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?"; - private int _curFed; - private final PetInventory _inventory; + int _curFed; + final PetInventory _inventory; private final int _controlObjectId; private boolean _respawned; private final boolean _mountable; @@ -140,9 +140,9 @@ public class L2PetInstance extends L2Summon stopFeed(); return; } - else if (getCurrentFed() > getFeedConsume()) + else if (_curFed > getFeedConsume()) { - setCurrentFed(getCurrentFed() - getFeedConsume()); + setCurrentFed(_curFed - getFeedConsume()); } else { @@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon L2ItemInstance food = null; for (int id : foodIds) { - food = getInventory().getItemByItemId(id); + food = _inventory.getItemByItemId(id); if (food != null) { break; @@ -333,9 +333,9 @@ public class L2PetInstance extends L2Summon @Override public L2ItemInstance getActiveWeaponInstance() { - if (getInventory() != null) + if (_inventory != null) { - return getInventory().getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); + return _inventory.getItems(item -> (item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)).stream().findAny().orElse(null); } return null; } @@ -622,8 +622,8 @@ public class L2PetInstance extends L2Summon } else { - final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this); - // sendPacket(new PetItemList(getInventory().getItems())); + final L2ItemInstance item = _inventory.addItem("Pickup", target, getOwner(), this); + // sendPacket(new PetItemList(_inventory.getItems())); sendPacket(new PetInventoryUpdate(item)); } } @@ -639,7 +639,7 @@ public class L2PetInstance extends L2Summon @Override public void deleteMe(L2PcInstance owner) { - getInventory().transferItemsToOwner(); + _inventory.transferItemsToOwner(); super.deleteMe(owner); destroyControlItem(owner, false); // this should also delete the pet from the db CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId()); @@ -702,9 +702,9 @@ public class L2PetInstance extends L2Summon */ public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) { - final L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId); + final L2ItemInstance oldItem = _inventory.getItemByObjectId(objectId); final L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId()); - final L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference); + final L2ItemInstance newItem = _inventory.transferItem(process, objectId, count, target, actor, reference); if (newItem == null) { @@ -756,11 +756,11 @@ public class L2PetInstance extends L2Summon L2ItemInstance removedItem; if (evolve) { - removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("Evolve", _controlObjectId, 1, getOwner(), this); } else { - removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this); + removedItem = owner.getInventory().destroyItem("PetDestroy", _controlObjectId, 1, getOwner(), this); if (removedItem != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED); @@ -791,7 +791,7 @@ public class L2PetInstance extends L2Summon try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id = ?")) { - statement.setInt(1, getControlObjectId()); + statement.setInt(1, _controlObjectId); statement.execute(); } catch (Exception e) @@ -804,7 +804,7 @@ public class L2PetInstance extends L2Summon { try { - for (L2ItemInstance item : getInventory().getItems()) + for (L2ItemInstance item : _inventory.getItems()) { dropItemHere(item); } @@ -817,7 +817,7 @@ public class L2PetInstance extends L2Summon public void dropItemHere(L2ItemInstance dropit, boolean protect) { - dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); + dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this); if (dropit != null) { @@ -921,7 +921,7 @@ public class L2PetInstance extends L2Summon @Override public void storeMe() { - if (getControlObjectId() == 0) + if (_controlObjectId == 0) { // this is a summon, not a pet, don't store anything return; @@ -933,7 +933,7 @@ public class L2PetInstance extends L2Summon } String req; - if (!isRespawned()) + if (!_respawned) { req = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)"; } @@ -951,10 +951,10 @@ public class L2PetInstance extends L2Summon statement.setDouble(4, getStatus().getCurrentMp()); statement.setLong(5, getStat().getExp()); statement.setLong(6, getStat().getSp()); - statement.setInt(7, getCurrentFed()); + statement.setInt(7, _curFed); statement.setInt(8, getOwner().getObjectId()); statement.setString(9, String.valueOf(_restoreSummon)); // True restores pet on login - statement.setInt(10, getControlObjectId()); + statement.setInt(10, _controlObjectId); statement.executeUpdate(); _respawned = true; @@ -997,7 +997,7 @@ public class L2PetInstance extends L2Summon PreparedStatement ps2 = con.prepareStatement(ADD_SKILL_SAVE)) { // Delete all current stored effects for summon to avoid dupe - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); ps1.execute(); int buff_index = 0; @@ -1045,7 +1045,7 @@ public class L2PetInstance extends L2Summon continue; } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.setInt(2, skill.getId()); ps2.setInt(3, skill.getLevel()); ps2.setInt(4, skill.getSubLevel()); @@ -1073,7 +1073,7 @@ public class L2PetInstance extends L2Summon { if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId())) { - ps1.setInt(1, getControlObjectId()); + ps1.setInt(1, _controlObjectId); try (ResultSet rset = ps1.executeQuery()) { while (rset.next()) @@ -1094,7 +1094,7 @@ public class L2PetInstance extends L2Summon } } - ps2.setInt(1, getControlObjectId()); + ps2.setInt(1, _controlObjectId); ps2.executeUpdate(); } catch (Exception e) @@ -1147,9 +1147,9 @@ public class L2PetInstance extends L2Summon if (!isDead()) { - if (getInventory() != null) + if (_inventory != null) { - getInventory().deleteMe(); + _inventory.deleteMe(); } L2World.getInstance().removePet(owner.getObjectId()); } @@ -1330,7 +1330,7 @@ public class L2PetInstance extends L2Summon @Override public final boolean isHungry() { - return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); + return _curFed < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed()); } /** @@ -1340,13 +1340,13 @@ public class L2PetInstance extends L2Summon */ public boolean isUncontrollable() { - return getCurrentFed() <= 0; + return _curFed <= 0; } @Override public final int getWeapon() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (weapon != null) { return weapon.getId(); @@ -1357,7 +1357,7 @@ public class L2PetInstance extends L2Summon @Override public final int getArmor() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (weapon != null) { return weapon.getId(); @@ -1367,7 +1367,7 @@ public class L2PetInstance extends L2Summon public final int getJewel() { - final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK); + final L2ItemInstance weapon = _inventory.getPaperdollItem(Inventory.PAPERDOLL_NECK); if (weapon != null) { return weapon.getId(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 42bd49e7f9..8ed3a9f1d3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -240,7 +240,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable final Map> servitorEffects = SummonEffectsTable.getInstance().getServitorEffects(getOwner()); if (servitorEffects != null) { - final List effects = servitorEffects.get(getReferenceSkill()); + final List effects = servitorEffects.get(_referenceSkill); if ((effects != null) && !effects.isEmpty()) { for (SummonEffect effect : effects) @@ -294,7 +294,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable // Delete all current stored effects for summon to avoid dupe statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.execute(); int buff_index = 0; @@ -348,7 +348,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable ps2.setInt(1, getOwner().getObjectId()); ps2.setInt(2, getOwner().getClassIndex()); - ps2.setInt(3, getReferenceSkill()); + ps2.setInt(3, _referenceSkill); ps2.setInt(4, skill.getId()); ps2.setInt(5, skill.getLevel()); ps2.setInt(6, info.getTime()); @@ -397,7 +397,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); try (ResultSet rset = statement.executeQuery()) { while (rset.next()) @@ -437,7 +437,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable { statement.setInt(1, getOwner().getObjectId()); statement.setInt(2, getOwner().getClassIndex()); - statement.setInt(3, getReferenceSkill()); + statement.setInt(3, _referenceSkill); statement.executeUpdate(); } } @@ -554,12 +554,12 @@ public class L2ServitorInstance extends L2Summon implements Runnable _consumeItemIntervalRemaining -= usedtime; // check if it is time to consume another item - if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) + if ((_consumeItemIntervalRemaining <= 0) && (_itemConsume.getCount() > 0) && (_itemConsume.getId() > 0) && !isDead()) { - if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) + if (destroyItemByItemId("Consume", _itemConsume.getId(), _itemConsume.getCount(), this, false)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.A_SUMMONED_MONSTER_USES_S1); - msg.addItemName(getItemConsume().getId()); + msg.addItemName(_itemConsume.getId()); sendPacket(msg); // Reset @@ -573,7 +573,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable } } - sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining)); + sendPacket(new SetSummonRemainTime(_lifeTime, _lifeTimeRemaining)); // Using same task to check if owner is in visible range if (calculateDistance(getOwner(), true, false) > 2000) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java index 285b9af507..aa681dd5f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2ShuttleInstance.java @@ -51,7 +51,7 @@ public class L2ShuttleInstance extends L2Vehicle public void closeDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { @@ -63,7 +63,7 @@ public class L2ShuttleInstance extends L2Vehicle public void openDoor(int id) { - for (L2ShuttleStop stop : getStops()) + for (L2ShuttleStop stop : _shuttleData.getStops()) { if (stop.getId() == id) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java index e5e5d055c4..32f94719bb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/poly/ObjectPoly.java @@ -42,7 +42,7 @@ public class ObjectPoly public final boolean isMorphed() { - return getPolyType() != null; + return _polyType != null; } public final int getPolyId() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index a7276d30f8..f1d5b120e9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -72,7 +72,7 @@ public class CharStatus */ public final void addStatusListener(L2Character object) { - if (object == getActiveChar()) + if (object == _activeChar) { return; } @@ -136,7 +136,7 @@ public class CharStatus public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) { - final L2Character activeChar = getActiveChar(); + final L2Character activeChar = _activeChar; if (activeChar.isDead()) { return; @@ -169,14 +169,14 @@ public class CharStatus } if (Formulas.calcRealTargetBreak()) { - getActiveChar().getEffectList().stopEffects(AbnormalType.REAL_TARGET); + _activeChar.getEffectList().stopEffects(AbnormalType.REAL_TARGET); } } if (value > 0) { - final double oldHp = getCurrentHp(); - final double newHp = Math.max(getCurrentHp() - value, activeChar.isUndying() ? 1 : 0); + final double oldHp = _currentHp; + final double newHp = Math.max(_currentHp - value, activeChar.isUndying() ? 1 : 0); setCurrentHp(newHp); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureHpChange(activeChar, oldHp, newHp), activeChar); } @@ -189,7 +189,7 @@ public class CharStatus public void reduceMp(double value) { - setCurrentMp(Math.max(getCurrentMp() - value, 0)); + setCurrentMp(Math.max(_currentMp - value, 0)); } /** @@ -202,10 +202,10 @@ public class CharStatus */ public final synchronized void startHpMpRegeneration() { - if ((_regTask == null) && !getActiveChar().isDead()) + if ((_regTask == null) && !_activeChar.isDead()) { // Get the Regeneration period - final int period = Formulas.getRegeneratePeriod(getActiveChar()); + final int period = Formulas.getRegeneratePeriod(_activeChar); // Create the HP/MP/CP Regeneration task _regTask = ThreadPool.scheduleAtFixedRate(this::doRegeneration, period, period); @@ -269,12 +269,12 @@ public class CharStatus public boolean setCurrentHp(double newHp, boolean broadcastPacket) { // Get the Max HP of the L2Character - final int currentHp = (int) getCurrentHp(); - final double maxHp = getActiveChar().getStat().getMaxHp(); + final int currentHp = (int) _currentHp; + final double maxHp = _activeChar.getStat().getMaxHp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -324,7 +324,7 @@ public class CharStatus if (broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -337,7 +337,7 @@ public class CharStatus hpOrMpWasChanged |= setCurrentMp(newMp, false); if (hpOrMpWasChanged) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } } @@ -360,12 +360,12 @@ public class CharStatus public final boolean setCurrentMp(double newMp, boolean broadcastPacket) { // Get the Max MP of the L2Character - final int currentMp = (int) getCurrentMp(); - final int maxMp = getActiveChar().getStat().getMaxMp(); + final int currentMp = (int) _currentMp; + final int maxMp = _activeChar.getStat().getMaxMp(); synchronized (this) { - if (getActiveChar().isDead()) + if (_activeChar.isDead()) { return false; } @@ -398,7 +398,7 @@ public class CharStatus // Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform if (mpWasChanged && broadcastPacket) { - getActiveChar().broadcastStatusUpdate(); + _activeChar.broadcastStatusUpdate(); } return mpWasChanged; @@ -407,10 +407,10 @@ public class CharStatus protected void doRegeneration() { // Modify the current HP/MP of the L2Character and broadcast Server->Client packet StatusUpdate - if (!getActiveChar().isDead() && ((getCurrentHp() < getActiveChar().getMaxRecoverableHp()) || (getCurrentMp() < getActiveChar().getMaxRecoverableMp()))) + if (!_activeChar.isDead() && ((_currentHp < _activeChar.getMaxRecoverableHp()) || (_currentMp < _activeChar.getMaxRecoverableMp()))) { - final double newHp = getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE); - final double newMp = getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE); + final double newHp = _currentHp + _activeChar.getStat().getValue(Stats.REGENERATE_HP_RATE); + final double newMp = _currentMp + _activeChar.getStat().getValue(Stats.REGENERATE_MP_RATE); setCurrentHpMp(newHp, newMp); } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 4d221ab370..813634b659 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -48,9 +48,9 @@ public class PcStatus extends PlayableStatus @Override public final void reduceCp(int value) { - if (getCurrentCp() > value) + if (_currentCp > value) { - setCurrentCp(getCurrentCp() - value); + setCurrentCp(_currentCp - value); } else { @@ -78,7 +78,7 @@ public class PcStatus extends PlayableStatus } // If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken. - if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) + if (Config.OFFLINE_MODE_NO_DAMAGE && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached() && ((Config.OFFLINE_TRADE_ENABLE && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY))) || (Config.OFFLINE_CRAFT_ENABLE && (getActiveChar().isCrafting() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) { return; } @@ -100,7 +100,7 @@ public class PcStatus extends PlayableStatus getActiveChar().stopEffectsOnDamage(); } // Attacked players in craft/shops stand up. - if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) + if (getActiveChar().isCrafting() || getActiveChar().isInStoreMode()) { getActiveChar().setPrivateStoreType(PrivateStoreType.NONE); getActiveChar().standUp(); @@ -238,14 +238,14 @@ public class PcStatus extends PlayableStatus if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer())) { - if (getCurrentCp() >= value) + if (_currentCp >= value) { - setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value + setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value value = 0; // No need to subtract anything from Hp } else { - value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp + value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp setCurrentCp(0, false); // Set Cp to 0 } } @@ -337,7 +337,7 @@ public class PcStatus extends PlayableStatus public final void setCurrentCp(double newCp, boolean broadcastPacket) { // Get the Max CP of the L2Character - final int currentCp = (int) getCurrentCp(); + final int currentCp = (int) _currentCp; final int maxCp = getActiveChar().getStat().getMaxCp(); synchronized (this) @@ -388,9 +388,9 @@ public class PcStatus extends PlayableStatus final PcStat charstat = getActiveChar().getStat(); // Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate - if (getCurrentCp() < charstat.getMaxRecoverableCp()) + if (_currentCp < charstat.getMaxRecoverableCp()) { - setCurrentCp(getCurrentCp() + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); + setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false); } // Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 8287b081c4..f9e325c275 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -279,7 +279,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable public boolean isType(String type) { - return getType().equalsIgnoreCase(type); + return _type.equalsIgnoreCase(type); } public String getName() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java index 1ce3ab05ca..6ee4d7e704 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -262,13 +262,13 @@ public final class Transform implements IIdentifiable if (creature.isPlayer()) { - if (getName() != null) + if (_name != null) { - player.getAppearance().setVisibleName(getName()); + player.getAppearance().setVisibleName(_name); } - if (getTitle() != null) + if (_title != null) { - player.getAppearance().setVisibleTitle(getTitle()); + player.getAppearance().setVisibleTitle(_title); } if (addSkills) @@ -374,11 +374,11 @@ public final class Transform implements IIdentifiable final L2PcInstance player = creature.getActingPlayer(); final boolean hasTransformSkills = player.hasTransformSkills(); - if (getName() != null) + if (_name != null) { player.getAppearance().setVisibleName(null); } - if (getTitle() != null) + if (_title != null) { player.getAppearance().setVisibleTitle(null); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index ebee3cd82c..1adc7b039f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -100,9 +100,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setInt(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setInt(6, _repeat); st.execute(); try (ResultSet rset = st.getGeneratedKeys()) { @@ -129,9 +129,9 @@ public final class AutoAnnouncement extends Announcement implements Runnable st.setInt(1, getType().ordinal()); st.setString(2, getContent()); st.setString(3, getAuthor()); - st.setLong(4, getInitial()); - st.setLong(5, getDelay()); - st.setLong(6, getRepeat()); + st.setLong(4, _initial); + st.setLong(5, _delay); + st.setLong(6, _repeat); st.setLong(7, getId()); st.execute(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/base/SubClass.java index 0e65764560..e318f331ee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/base/SubClass.java @@ -140,7 +140,7 @@ public final class SubClass public void incLevel() { - if (!_dualClass && (getLevel() == _maxLevel)) + if (!_dualClass && (_level == _maxLevel)) { return; } @@ -151,7 +151,7 @@ public final class SubClass public void decLevel() { - if (getLevel() == Config.BASE_SUBCLASS_LEVEL) + if (_level == Config.BASE_SUBCLASS_LEVEL) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/buylist/Product.java index 03b1a51b6b..8360f7712c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/buylist/Product.java @@ -69,7 +69,7 @@ public final class Product public int getItemId() { - return getItem().getId(); + return _item.getId(); } public long getPrice() @@ -124,7 +124,7 @@ public final class Product } if ((_restockTask == null) || _restockTask.isDone()) { - _restockTask = ThreadPool.schedule(this::restock, getRestockDelay()); + _restockTask = ThreadPool.schedule(this::restock, _restockDelay); } final boolean result = _count.addAndGet(-val) >= 0; save(); @@ -133,7 +133,7 @@ public final class Product public boolean hasLimitedStock() { - return getMaxCount() > -1; + return _maxCount > -1; } public void restartRestockTask(long nextRestockTime) @@ -151,7 +151,7 @@ public final class Product public void restock() { - setCount(getMaxCount()); + setCount(_maxCount); save(); } @@ -161,7 +161,7 @@ public final class Product PreparedStatement statement = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) { statement.setInt(1, _buyListId); - statement.setInt(2, getItemId()); + statement.setInt(2, _item.getId()); statement.setLong(3, getCount()); statement.setLong(5, getCount()); if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) @@ -179,7 +179,7 @@ public final class Product } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + getItemId(), e); + LOGGER.log(Level.WARNING, "Failed to save Product buylist_id:" + _buyListId + " item_id:" + _item.getId(), e); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index ce7a68dcc7..4e95946a36 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -538,9 +538,9 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - getHolder().broadCastPacketToTeam(changePoints); + _holder.broadCastPacketToTeam(changePoints); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java index 4fa38d85d4..9b249a9069 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -72,7 +72,7 @@ public final class Castle extends AbstractResidence private final List _doors = new ArrayList<>(); private final List _sideNpcs = new ArrayList<>(); - private int _ownerId = 0; + int _ownerId = 0; private Siege _siege = null; private Calendar _siegeDate; private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege @@ -96,12 +96,12 @@ public final class Castle extends AbstractResidence public class CastleFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -158,7 +158,7 @@ public final class Castle extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -185,29 +185,29 @@ public final class Castle extends AbstractResidence { try { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { int fee = _fee; - if (getEndTime() == -1) + if (_endDate == -1) { fee = _tempFee; } - setEndTime(System.currentTimeMillis() + getRate()); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Exception e) @@ -223,11 +223,11 @@ public final class Castle extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -244,7 +244,7 @@ public final class Castle extends AbstractResidence initResidenceZone(); initFunctions(); spawnSideNpcs(); - if (getOwnerId() != 0) + if (_ownerId != 0) { loadFunctions(); loadDoorUpgrade(); @@ -287,7 +287,7 @@ public final class Castle extends AbstractResidence public void addToTreasury(long amount) { // check if owned - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return; } @@ -338,7 +338,7 @@ public final class Castle extends AbstractResidence */ public boolean addToTreasuryNoTax(long amount) { - if (getOwnerId() <= 0) + if (_ownerId <= 0) { return false; } @@ -364,7 +364,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) { - ps.setLong(1, getTreasury()); + ps.setLong(1, _treasury); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -380,7 +380,7 @@ public final class Castle extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerId()); + getResidenceZone().banishForeigners(_ownerId); } /** @@ -460,7 +460,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -481,7 +481,7 @@ public final class Castle extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, String doorName, boolean open) { - if ((activeChar.getClanId() != getOwnerId()) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) + if ((activeChar.getClanId() != _ownerId) && !activeChar.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS)) { return; } @@ -516,7 +516,7 @@ public final class Castle extends AbstractResidence public void setOwner(L2Clan clan) { // Remove old owner - if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) + if ((_ownerId > 0) && ((clan == null) || (clan.getId() != _ownerId))) { final L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance if (oldOwner != null) @@ -877,7 +877,7 @@ public final class Castle extends AbstractResidence try (PreparedStatement ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getOwnerId()); + ps.setInt(2, _ownerId); ps.execute(); } @@ -897,12 +897,12 @@ public final class Castle extends AbstractResidence public final L2DoorInstance getDoor(int doorId) { - return getDoors().stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getId() == doorId).findFirst().orElse(null); } public final L2DoorInstance getDoor(String doorName) { - return getDoors().stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); + return _doors.stream().filter(d -> d.getTemplate().getName().equals(doorName)).findFirst().orElse(null); } public final List getDoors() @@ -957,7 +957,7 @@ public final class Castle extends AbstractResidence public final int getTaxPercent(TaxType type) { final int taxPercent; - switch (getSide()) + switch (_castleSide) { case LIGHT: { @@ -1036,7 +1036,7 @@ public final class Castle extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) { - ps.setString(1, String.valueOf(getShowNpcCrest())); + ps.setString(1, String.valueOf(_showNpcCrest)); ps.setInt(2, getResidenceId()); ps.execute(); } @@ -1156,7 +1156,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); + final Skill skill = _castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill(); player.addSkill(skill); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index d41afdb68a..6fc9b45046 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -58,7 +58,7 @@ public final class ClanHall extends AbstractResidence private final ClanHallGrade _grade; private final ClanHallType _type; private final int _minBid; - private final int _lease; + final int _lease; private final int _deposit; private final List _npcs; private final List _doors; @@ -66,8 +66,8 @@ public final class ClanHall extends AbstractResidence private final Location _ownerLocation; private final Location _banishLocation; // Dynamic parameters - private L2Clan _owner = null; - private long _paidUntil = 0; + L2Clan _owner = null; + long _paidUntil = 0; protected ScheduledFuture _checkPaymentTask = null; // Other private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; @@ -137,7 +137,7 @@ public final class ClanHall extends AbstractResidence PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) { statement.setInt(1, getOwnerId()); - statement.setLong(2, getPaidUntil()); + statement.setLong(2, _paidUntil); statement.setInt(3, getResidenceId()); statement.execute(); } @@ -159,7 +159,7 @@ public final class ClanHall extends AbstractResidence public int getCostFailDay() { - final Duration failDay = Duration.between(Instant.ofEpochMilli(getPaidUntil()), Instant.now()); + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); return failDay.isNegative() ? 0 : (int) failDay.toDays(); } @@ -256,13 +256,13 @@ public final class ClanHall extends AbstractResidence _owner = clan; clan.setHideoutId(getResidenceId()); clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (getPaidUntil() == 0) + if (_paidUntil == 0) { setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); } final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : getPaidUntil(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else @@ -351,29 +351,28 @@ public final class ClanHall extends AbstractResidence @Override public void run() { - final L2Clan clan = getOwner(); - if (clan != null) + if (_owner != null) { - if (clan.getWarehouse().getAdena() < getLease()) + if (_owner.getWarehouse().getAdena() < _lease) { if (getCostFailDay() > 8) { setOwner(null); - clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + _owner.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); } else { _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(getLease()); - clan.broadcastToOnlineMembers(sm); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); } } else { - clan.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, getLease(), null, null); - setPaidUntil(Instant.ofEpochMilli(getPaidUntil()).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), getPaidUntil() - System.currentTimeMillis()); + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Duel.java index 826a7beece..a4b57818fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -75,7 +75,7 @@ public class Duel private boolean _finished = false; private final Map _playerConditions = new ConcurrentHashMap<>(); - private Instance _duelInstance; + Instance _duelInstance; public Duel(L2PcInstance playerA, L2PcInstance playerB, int partyDuel, int duelId) { @@ -213,9 +213,9 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPool.schedule(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - if (getDueldInstance() != null) + if (_duelInstance != null) { - getDueldInstance().destroy(); + _duelInstance.destroy(); } break; } @@ -674,7 +674,7 @@ public class Duel */ public L2PcInstance getWinner() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } @@ -695,7 +695,7 @@ public class Duel */ public L2PcInstance getLooser() { - if (!getFinished() || (_playerA == null) || (_playerB == null)) + if (!_finished || (_playerA == null) || (_playerB == null)) { return null; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java index 3d030d3183..2433d41209 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -71,7 +71,7 @@ public final class Fort extends AbstractResidence private Calendar _siegeDate; private Calendar _lastOwnedTime; private L2SiegeZone _zone; - private L2Clan _fortOwner = null; + L2Clan _fortOwner = null; private int _fortType = 0; private int _state = 0; private int _castleId = 0; @@ -97,12 +97,12 @@ public final class Fort extends AbstractResidence public class FortFunction { - private final int _type; + final int _type; private int _lvl; protected int _fee; protected int _tempFee; - private final long _rate; - private long _endDate; + final long _rate; + long _endDate; protected boolean _inDebt; public boolean _cwh; @@ -159,7 +159,7 @@ public final class Fort extends AbstractResidence private void initializeTask(boolean cwh) { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } @@ -186,24 +186,24 @@ public final class Fort extends AbstractResidence { try { - if (getOwnerClan() == null) + if (_fortOwner == null) { return; } - if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) + if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { - final int fee = getEndTime() == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + getRate()); + final int fee = _endDate == -1 ? _tempFee : _fee; + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { - getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); + _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); } - ThreadPool.schedule(new FunctionTask(true), getRate()); + ThreadPool.schedule(new FunctionTask(true), _rate); } else { - removeFunction(getType()); + removeFunction(_type); } } catch (Throwable t) @@ -218,11 +218,11 @@ public final class Fort extends AbstractResidence PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) { ps.setInt(1, getResidenceId()); - ps.setInt(2, getType()); - ps.setInt(3, getLvl()); - ps.setInt(4, getLease()); - ps.setLong(5, getRate()); - ps.setLong(6, getEndTime()); + ps.setInt(2, _type); + ps.setInt(3, _lvl); + ps.setInt(4, _fee); + ps.setLong(5, _rate); + ps.setLong(6, _endDate); ps.execute(); } catch (Exception e) @@ -237,7 +237,7 @@ public final class Fort extends AbstractResidence super(fortId); load(); loadFlagPoles(); - if (getOwnerClan() != null) + if (_fortOwner != null) { setVisibleFlag(true); loadFunctions(); @@ -250,7 +250,7 @@ public final class Fort extends AbstractResidence initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) spawnNpcCommanders(); // spawn npc Commanders initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((getOwnerClan() != null) && (getFortState() == 0)) + if ((_fortOwner != null) && (_state == 0)) { spawnSpecialEnvoys(); } @@ -277,7 +277,7 @@ public final class Fort extends AbstractResidence */ public void banishForeigners() { - getResidenceZone().banishForeigners(getOwnerClan().getId()); + getResidenceZone().banishForeigners(_fortOwner.getId()); } /** @@ -335,7 +335,7 @@ public final class Fort extends AbstractResidence public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) { - if (activeChar.getClan() != getOwnerClan()) + if (activeChar.getClan() != _fortOwner) { return; } @@ -378,7 +378,7 @@ public final class Fort extends AbstractResidence sm.addCastleId(getResidenceId()); getSiege().announceToPlayer(sm); - final L2Clan oldowner = getOwnerClan(); + final L2Clan oldowner = _fortOwner; if ((oldowner != null) && (clan != oldowner)) { // Remove points from old owner @@ -442,7 +442,7 @@ public final class Fort extends AbstractResidence public void removeOwner(boolean updateDB) { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; if (clan != null) { for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -506,7 +506,7 @@ public final class Fort extends AbstractResidence */ public void setVisibleFlag(boolean val) { - final L2StaticObjectInstance flagPole = getFlagPole(); + final L2StaticObjectInstance flagPole = _flagPole; if (flagPole != null) { flagPole.setMeshIndex(val ? 1 : 0); @@ -781,7 +781,7 @@ public final class Fort extends AbstractResidence private void updateOwnerInDB() { - final L2Clan clan = getOwnerClan(); + final L2Clan clan = _fortOwner; int clanId = 0; if (clan != null) { @@ -873,7 +873,7 @@ public final class Fort extends AbstractResidence return null; } - for (L2DoorInstance door : getDoors()) + for (L2DoorInstance door : _doors) { if (door.getId() == doorId) { @@ -1001,8 +1001,8 @@ public final class Fort extends AbstractResidence try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) { - ps.setInt(1, getFortState()); - ps.setInt(2, getContractedCastleId()); + ps.setInt(1, _state); + ps.setInt(2, _castleId); ps.setInt(3, getResidenceId()); ps.execute(); } @@ -1068,7 +1068,7 @@ public final class Fort extends AbstractResidence */ public final int getFortSize() { - return getFortType() == 0 ? 3 : 5; + return _fortType == 0 ? 3 : 5; } public void spawnSuspiciousMerchant() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 75de2719fc..c7a8bd6dfa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -70,7 +70,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -101,7 +101,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -115,7 +115,7 @@ public class FortSiege implements Siegable } else if (_time == 600) // 10min remains { - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTE_S_UNTIL_THE_FORTRESS_BATTLE_STARTS); sm.addInt(10); announceToPlayer(sm); @@ -184,7 +184,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (isInProgress()) + if (_isInProgress) { return; } @@ -205,7 +205,7 @@ public class FortSiege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -228,7 +228,7 @@ public class FortSiege implements Siegable // Fort setting protected Set _commanders = ConcurrentHashMap.newKeySet(); protected final Fort _fort; - private boolean _isInProgress = false; + boolean _isInProgress = false; private final Collection _siegeGuards = new LinkedList<>(); ScheduledFuture _siegeEnd = null; ScheduledFuture _siegeRestore = null; @@ -248,7 +248,7 @@ public class FortSiege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { _isInProgress = false; // Flag so that siege instance can be started removeFlags(); // Removes all flags. Note: Remove flag before teleporting players @@ -257,22 +257,22 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(true); int ownerId = -1; - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - ownerId = getFort().getOwnerClan().getId(); + ownerId = _fort.getOwnerClan().getId(); } - getFort().getZone().banishForeigners(ownerId); - getFort().getZone().setIsActive(false); - getFort().getZone().updateZoneStatusForCharactersInside(); - getFort().getZone().setSiegeInstance(null); + _fort.getZone().banishForeigners(ownerId); + _fort.getZone().setIsActive(false); + _fort.getZone().updateZoneStatusForCharactersInside(); + _fort.getZone().setSiegeInstance(null); saveFortSiege(); // Save fort specific data clearSiegeClan(); // Clear siege clan from db removeCommanders(); // Remove commander from this fort - getFort().spawnNpcCommanders(); // Spawn NPC commanders + _fort.spawnNpcCommanders(); // Spawn NPC commanders unspawnSiegeGuard(); // Remove all spawned siege guard from this fort - getFort().resetDoors(); // Respawn door to fort + _fort.resetDoors(); // Respawn door to fort ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000); // Prepare 3hr task for suspicious merchant respawn setSiegeDateTime(true); // store suspicious merchant spawn in DB @@ -288,12 +288,12 @@ public class FortSiege implements Siegable _siegeRestore = null; } - if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) + if ((_fort.getOwnerClan() != null) && (_fort.getFlagPole().getMeshIndex() == 0)) { - getFort().setVisibleFlag(true); + _fort.setVisibleFlag(true); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort finished."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort finished."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeFinish(this), getFort()); @@ -306,16 +306,16 @@ public class FortSiege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { if (_siegeStartTask != null) // used admin command "admin_startfortsiege" { _siegeStartTask.cancel(true); - getFort().despawnSuspiciousMerchant(); + _fort.despawnSuspiciousMerchant(); } _siegeStartTask = null; - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { return; } @@ -326,24 +326,24 @@ public class FortSiege implements Siegable updatePlayerSiegeStateFlags(false); teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town - getFort().despawnNpcCommanders(); // Despawn NPC commanders + _fort.despawnNpcCommanders(); // Despawn NPC commanders spawnCommanders(); // Spawn commanders - getFort().resetDoors(); // Spawn door + _fort.resetDoors(); // Spawn door spawnSiegeGuard(); // Spawn siege guard - getFort().setVisibleFlag(false); - getFort().getZone().setSiegeInstance(this); - getFort().getZone().setIsActive(true); - getFort().getZone().updateZoneStatusForCharactersInside(); + _fort.setVisibleFlag(false); + _fort.getZone().setSiegeInstance(this); + _fort.getZone().setIsActive(true); + _fort.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEnd = ThreadPool.schedule(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN); - sm.addCastleId(getFort().getResidenceId()); + sm.addCastleId(_fort.getResidenceId()); announceToPlayer(sm); saveFortSiege(); - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort started."); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort started."); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnFortSiegeStart(this), getFort()); @@ -358,7 +358,7 @@ public class FortSiege implements Siegable { // announce messages only for participants L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -369,7 +369,7 @@ public class FortSiege implements Siegable } } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -391,7 +391,7 @@ public class FortSiege implements Siegable public void updatePlayerSiegeStateFlags(boolean clear) { L2Clan clan; - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -411,7 +411,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -421,7 +421,7 @@ public class FortSiege implements Siegable member.broadcastUserInfo(); } } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); for (L2PcInstance member : clan.getOnlineMembers(0)) @@ -441,7 +441,7 @@ public class FortSiege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getFort().getResidenceId()); + member.setSiegeSide(_fort.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -470,7 +470,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return (_isInProgress && (_fort.checkIfInZone(x, y, z))); // Fort zone during siege } /** @@ -490,7 +490,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - if ((clan != null) && (getFort().getOwnerClan() == clan)) + if ((clan != null) && (_fort.getOwnerClan() == clan)) { return true; } @@ -504,22 +504,22 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); ps.execute(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) { - delete.setInt(1, getFort().getOwnerClan().getId()); + delete.setInt(1, _fort.getOwnerClan().getId()); delete.execute(); } } - getAttackerClans().clear(); + _attackerClans.clear(); // if siege is in progress, end siege - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -540,7 +540,7 @@ public class FortSiege implements Siegable /** Set the date for the next siege. */ private void clearSiegeDate() { - getFort().getSiegeDate().setTimeInMillis(0); + _fort.getSiegeDate().setTimeInMillis(0); } /** @@ -550,7 +550,7 @@ public class FortSiege implements Siegable public List getAttackersInZone() { final List players = new LinkedList<>(); - for (L2SiegeClan siegeclan : getAttackerClans()) + for (L2SiegeClan siegeclan : _attackerClans) { final L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId()); for (L2PcInstance player : clan.getOnlineMembers(0)) @@ -574,7 +574,7 @@ public class FortSiege implements Siegable */ public List getPlayersInZone() { - return getFort().getZone().getPlayersInside(); + return _fort.getZone().getPlayersInside(); } /** @@ -583,10 +583,10 @@ public class FortSiege implements Siegable public List getOwnersInZone() { final List players = new LinkedList<>(); - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { final L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId()); - if (clan != getFort().getOwnerClan()) + if (clan != _fort.getOwnerClan()) { return null; } @@ -614,7 +614,7 @@ public class FortSiege implements Siegable */ public void killedCommander(L2FortCommanderInstance instance) { - if ((getFort() != null) && (!_commanders.isEmpty())) + if ((_fort != null) && (!_commanders.isEmpty())) { final L2Spawn spawn = instance.getSpawn(); if (spawn != null) @@ -657,14 +657,14 @@ public class FortSiege implements Siegable if (_commanders.isEmpty()) { // spawn fort flags - spawnFlag(getFort().getResidenceId()); + spawnFlag(_fort.getResidenceId()); // cancel door/commanders respawn if (_siegeRestore != null) { _siegeRestore.cancel(true); } // open doors in main building - for (L2DoorInstance door : getFort().getDoors()) + for (L2DoorInstance door : _fort.getDoors()) { if (door.getIsShowHp()) { @@ -674,22 +674,22 @@ public class FortSiege implements Siegable // TODO this also opens control room door at big fort door.openMe(); } - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_ARE_OCCUPIED)); } // schedule restoring doors/commanders respawn else if (_siegeRestore == null) { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); _siegeRestore = ThreadPool.schedule(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000); } else { - getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); + _fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.THE_BARRACKS_HAVE_BEEN_SEIZED)); } } else { - LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + getFort().getResidenceId()); + LOGGER.warning(getClass().getSimpleName() + ": FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: " + instance.getId() + " FortId: " + _fort.getResidenceId()); } } } @@ -705,7 +705,7 @@ public class FortSiege implements Siegable return; } - for (L2SiegeClan clan : getAttackerClans()) + for (L2SiegeClan clan : _attackerClans) { if (clan.removeFlag(flag)) { @@ -734,7 +734,7 @@ public class FortSiege implements Siegable if (checkConditions) { - if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) + if (_fort.getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) { return 1; // Player don't have enough adena to register } @@ -754,7 +754,7 @@ public class FortSiege implements Siegable } saveSiegeClan(player.getClan()); - if (getAttackerClans().size() == 1) + if (_attackerClans.size() == 1) { if (checkConditions) { @@ -788,7 +788,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement(query)) { - statement.setInt(1, getFort().getResidenceId()); + statement.setInt(1, _fort.getResidenceId()); if (clanId != 0) { statement.setInt(2, clanId); @@ -796,9 +796,9 @@ public class FortSiege implements Siegable statement.execute(); loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { - if (isInProgress()) + if (_isInProgress) { endSiege(); } @@ -843,7 +843,7 @@ public class FortSiege implements Siegable else { loadSiegeClan(); - if (getAttackerClans().isEmpty()) + if (_attackerClans.isEmpty()) { // no attackers - waiting for suspicious merchant spawn ThreadPool.schedule(new ScheduleSuspiciousMerchantSpawn(), delay); @@ -875,7 +875,7 @@ public class FortSiege implements Siegable _siegeStartTask = ThreadPool.schedule(new ScheduleStartSiegeTask(60), 0); } - LOGGER.info(getClass().getSimpleName() + ": Siege of " + getFort().getName() + " fort: " + getFort().getSiegeDate().getTime()); + LOGGER.info(getClass().getSimpleName() + ": Siege of " + _fort.getName() + " fort: " + _fort.getSiegeDate().getTime()); } } } @@ -896,9 +896,9 @@ public class FortSiege implements Siegable setSiegeDateTime(false); } - if (getFort().getOwnerClan() != null) + if (_fort.getOwnerClan() != null) { - getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); + _fort.getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK)); } // Execute siege auto start @@ -927,7 +927,7 @@ public class FortSiege implements Siegable } default: { - players = getPlayersInZone(); + players = _fort.getZone().getPlayersInside(); } } @@ -948,7 +948,7 @@ public class FortSiege implements Siegable */ private void addAttacker(int clanId) { - getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list + _attackerClans.add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list } /** @@ -991,18 +991,18 @@ public class FortSiege implements Siegable { newDate.add(Calendar.MINUTE, 60); } - getFort().setSiegeDate(newDate); + _fort.setSiegeDate(newDate); saveSiegeDate(); } /** Load siege clans. */ private void loadSiegeClan() { - getAttackerClans().clear(); + _attackerClans.clear(); try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) { - ps.setInt(1, getFort().getResidenceId()); + ps.setInt(1, _fort.getResidenceId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -1038,7 +1038,7 @@ public class FortSiege implements Siegable /** Remove all flags. */ private void removeFlags() { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if (sc != null) { @@ -1060,8 +1060,8 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) { - ps.setLong(1, getSiegeDate().getTimeInMillis()); - ps.setInt(2, getFort().getResidenceId()); + ps.setLong(1, _fort.getSiegeDate().getTimeInMillis()); + ps.setInt(2, _fort.getResidenceId()); ps.execute(); } catch (Exception e) @@ -1085,7 +1085,7 @@ public class FortSiege implements Siegable PreparedStatement statement = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getFort().getResidenceId()); + statement.setInt(2, _fort.getResidenceId()); statement.execute(); addAttacker(clan.getId()); @@ -1151,7 +1151,7 @@ public class FortSiege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) { - final int fortId = getFort().getResidenceId(); + final int fortId = _fort.getResidenceId(); ps.setInt(1, fortId); try (ResultSet rs = ps.executeQuery()) { @@ -1172,7 +1172,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + getFort().getName() + ": " + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error loading siege guard for fort " + _fort.getName() + ": " + e.getMessage(), e); } } @@ -1198,7 +1198,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error spawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1217,7 +1217,7 @@ public class FortSiege implements Siegable } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + getFort().getName() + ":" + e.getMessage(), e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error unspawning siege guards for fort " + _fort.getName() + ":" + e.getMessage(), e); } } @@ -1235,7 +1235,7 @@ public class FortSiege implements Siegable @Override public final L2SiegeClan getAttackerClan(int clanId) { - for (L2SiegeClan sc : getAttackerClans()) + for (L2SiegeClan sc : _attackerClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1265,7 +1265,7 @@ public class FortSiege implements Siegable @Override public final Calendar getSiegeDate() { - return getFort().getSiegeDate(); + return _fort.getSiegeDate(); } @Override @@ -1288,7 +1288,7 @@ public class FortSiege implements Siegable // reload commanders and repair doors removeCommanders(); spawnCommanders(); - getFort().resetDoors(); + _fort.resetDoors(); } public Set getCommanders() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Siege.java index 54018274e5..00ecbc50fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -92,7 +92,7 @@ public class Siege implements Siegable @Override public void run() { - if (!isInProgress()) + if (!_isInProgress) { return; } @@ -160,14 +160,14 @@ public class Siege implements Siegable public void run() { _scheduledStartSiegeTask.cancel(false); - if (isInProgress()) + if (_isInProgress) { return; } try { - if (!getIsTimeRegistrationOver()) + if (!_castle.getIsTimeRegistrationOver()) { final long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); if (regTimeRemaining > 0) @@ -186,7 +186,7 @@ public class Siege implements Siegable else if ((timeRemaining <= 86400000) && (timeRemaining > 13600000)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_REGISTRATION_TERM_FOR_S1_HAS_ENDED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = true; clearSiegeWaitingClan(); @@ -228,8 +228,8 @@ public class Siege implements Siegable // Castle setting private final List _controlTowers = new ArrayList<>(); private final List _flameTowers = new ArrayList<>(); - private final Castle _castle; - private boolean _isInProgress = false; + final Castle _castle; + boolean _isInProgress = false; private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def protected boolean _isRegistrationOver = false; protected Calendar _siegeEndDate; @@ -246,18 +246,18 @@ public class Siege implements Siegable @Override public void endSiege() { - if (isInProgress()) + if (_isInProgress) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_FINISHED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId()); sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_IS_VICTORIOUS_OVER_S2_S_CASTLE_SIEGE); sm.addString(clan.getName()); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); if (clan.getId() == _firstOwnerClanId) @@ -267,7 +267,7 @@ public class Siege implements Siegable } else { - getCastle().setTicketBuyCount(0); + _castle.setTicketBuyCount(0); for (L2ClanMember member : clan.getMembers()) { if (member != null) @@ -284,7 +284,7 @@ public class Siege implements Siegable else { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_SIEGE_OF_S1_HAS_ENDED_IN_A_DRAW); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); } @@ -322,7 +322,7 @@ public class Siege implements Siegable clan.clearSiegeDeaths(); } - getCastle().updateClansReputation(); + _castle.updateClansReputation(); removeFlags(); // Removes all flags. Note: Remove flag before teleporting players teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town _isInProgress = false; // Flag so that siege instance can be started @@ -331,14 +331,14 @@ public class Siege implements Siegable clearSiegeClan(); // Clear siege clan from db removeTowers(); // Remove all towers from this castle SiegeGuardManager.getInstance().unspawnSiegeGuard(getCastle()); // Remove all spawned siege guard from this castle - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); } - getCastle().spawnDoor(); // Respawn door to castle - getCastle().getZone().setIsActive(false); - getCastle().getZone().updateZoneStatusForCharactersInside(); - getCastle().getZone().setSiegeInstance(null); + _castle.spawnDoor(); // Respawn door to castle + _castle.getZone().setIsActive(false); + _castle.getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(null); // Notify to scripts. EventDispatcher.getInstance().notifyEventAsync(new OnCastleSiegeFinish(this), getCastle()); @@ -387,9 +387,9 @@ public class Siege implements Siegable */ public void midVictory() { - if (isInProgress()) // Siege still in progress + if (_isInProgress) // Siege still in progress { - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { SiegeGuardManager.getInstance().removeSiegeGuards(getCastle()); // Remove all merc entry from db } @@ -398,13 +398,13 @@ public class Siege implements Siegable (getAttackerClans().size() == 1 // Only 1 attacker )) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); return; } - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { final int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc) @@ -426,7 +426,7 @@ public class Siege implements Siegable } if (allinsamealliance) { - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); endSiege(); @@ -444,7 +444,7 @@ public class Siege implements Siegable } } - final L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId()); + final L2SiegeClan sc_newowner = getAttackerClan(_castle.getOwnerId()); removeAttacker(sc_newowner); addDefender(sc_newowner, SiegeClanType.OWNER); @@ -462,8 +462,8 @@ public class Siege implements Siegable teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town removeDefenderFlags(); // Removes defenders' flags - getCastle().removeUpgrade(); // Remove all castle upgrade - getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) + _castle.removeUpgrade(); // Remove all castle upgrade + _castle.spawnDoor(true); // Respawn door to castle but make them weaker (50% hp) removeTowers(); // Remove all towers from this castle _controlTowerCount = 0; // Each new siege midvictory CT are completely respawned. spawnControlTower(); @@ -483,9 +483,9 @@ public class Siege implements Siegable @Override public void startSiege() { - if (!isInProgress()) + if (!_isInProgress) { - _firstOwnerClanId = getCastle().getOwnerId(); + _firstOwnerClanId = _castle.getOwnerId(); if (getAttackerClans().isEmpty()) { @@ -500,7 +500,7 @@ public class Siege implements Siegable final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId); ownerClan.increaseBloodAllianceCount(); } - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); saveCastleSiege(); return; @@ -515,20 +515,20 @@ public class Siege implements Siegable _controlTowerCount = 0; spawnControlTower(); // Spawn control tower spawnFlameTower(); // Spawn control tower - getCastle().spawnDoor(); // Spawn door + _castle.spawnDoor(); // Spawn door spawnSiegeGuard(); // Spawn siege guard SiegeGuardManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground - getCastle().getZone().setSiegeInstance(this); - getCastle().getZone().setIsActive(true); - getCastle().getZone().updateZoneStatusForCharactersInside(); + _castle.getZone().setSiegeInstance(this); + _castle.getZone().setIsActive(true); + _castle.getZone().updateZoneStatusForCharactersInside(); // Schedule a task to prepare auto siege end _siegeEndDate = Calendar.getInstance(); _siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength()); - ThreadPool.schedule(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task + ThreadPool.schedule(new ScheduleEndSiegeTask(_castle), 1000); // Prepare auto end task final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_SIEGE_HAS_STARTED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); // Notify to scripts. @@ -589,7 +589,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 1); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -649,7 +649,7 @@ public class Siege implements Siegable else { member.setSiegeState((byte) 2); - member.setSiegeSide(getCastle().getResidenceId()); + member.setSiegeSide(_castle.getResidenceId()); if (checkIfInZone(member)) { member.setIsInSiege(true); @@ -723,7 +723,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return (_isInProgress && (_castle.checkIfInZone(x, y, z))); // Castle zone during siege } /** @@ -763,21 +763,21 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { try (PreparedStatement delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) { - delete.setInt(1, getCastle().getOwnerId()); + delete.setInt(1, _castle.getOwnerId()); delete.execute(); } } getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -791,10 +791,10 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.execute(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); } catch (Exception e) { @@ -821,7 +821,7 @@ public class Siege implements Siegable */ public List getPlayersInZone() { - return getCastle().getZone().getPlayersInside(); + return _castle.getZone().getPlayersInside(); } /** @@ -845,7 +845,7 @@ public class Siege implements Siegable */ public List getSpectatorsInZone() { - return getCastle().getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); + return _castle.getZone().getPlayersInside().stream().filter(p -> !p.isInSiege()).collect(Collectors.toList()); } /** @@ -872,7 +872,7 @@ public class Siege implements Siegable */ public void listRegisterClan(L2PcInstance player) { - player.sendPacket(new SiegeInfo(getCastle(), player)); + player.sendPacket(new SiegeInfo(_castle, player)); } /** @@ -892,7 +892,7 @@ public class Siege implements Siegable return; } int allyId = 0; - if (getCastle().getOwnerId() != 0) + if (_castle.getOwnerId() != 0) { allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId(); } @@ -935,9 +935,9 @@ public class Siege implements Siegable public void registerDefender(L2PcInstance player, boolean force) { - if (getCastle().getOwnerId() <= 0) + if (_castle.getOwnerId() <= 0) { - player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC."); + player.sendMessage("You cannot register as a defender because " + _castle.getName() + " is owned by NPC."); return; } @@ -975,7 +975,7 @@ public class Siege implements Siegable try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) { - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); statement.setInt(2, clanId); statement.execute(); @@ -1019,7 +1019,7 @@ public class Siege implements Siegable { correctSiegeDateTime(); - LOGGER.info("Siege of " + getCastle().getName() + ": " + getCastle().getSiegeDate().getTime()); + LOGGER.info("Siege of " + _castle.getName() + ": " + _castle.getSiegeDate().getTime()); loadSiegeClan(); @@ -1028,7 +1028,7 @@ public class Siege implements Siegable { _scheduledStartSiegeTask.cancel(false); } - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } /** @@ -1048,12 +1048,12 @@ public class Siege implements Siegable } case NotOwner: { - players = getPlayersInZone(); + players = _castle.getZone().getPlayersInside(); final Iterator it = players.iterator(); while (it.hasNext()) { final L2PcInstance player = it.next(); - if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId()))) + if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == _castle.getOwnerId()))) { it.remove(); } @@ -1125,7 +1125,7 @@ public class Siege implements Siegable */ private void addDefenderWaiting(int clanId) { - getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list + _defenderWaitingClans.add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list } /** @@ -1135,13 +1135,13 @@ public class Siege implements Siegable */ private boolean checkIfCanRegister(L2PcInstance player, byte typeId) { - if (getIsRegistrationOver()) + if (_isRegistrationOver) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DEADLINE_TO_REGISTER_FOR_THE_SIEGE_OF_S1_HAS_PASSED); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); player.sendPacket(sm); } - else if (isInProgress()) + else if (_isInProgress) { player.sendPacket(SystemMessageId.THIS_IS_NOT_THE_TIME_FOR_SIEGE_REGISTRATION_AND_SO_REGISTRATION_AND_CANCELLATION_CANNOT_BE_DONE); } @@ -1149,7 +1149,7 @@ public class Siege implements Siegable { player.sendPacket(SystemMessageId.ONLY_CLANS_OF_LEVEL_3_OR_ABOVE_MAY_REGISTER_FOR_A_CASTLE_SIEGE); } - else if (player.getClan().getId() == getCastle().getOwnerId()) + else if (player.getClan().getId() == _castle.getOwnerId()) { player.sendPacket(SystemMessageId.CASTLE_OWNING_CLANS_ARE_AUTOMATICALLY_REGISTERED_ON_THE_DEFENDING_SIDE); } @@ -1243,15 +1243,15 @@ public class Siege implements Siegable { getAttackerClans().clear(); getDefenderClans().clear(); - getDefenderWaitingClans().clear(); + _defenderWaitingClans.clear(); // Add castle owner as defender (add owner first so that they are on the top of the defender list) - if (getCastle().getOwnerId() > 0) + if (_castle.getOwnerId() > 0) { - addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER); + addDefender(_castle.getOwnerId(), SiegeClanType.OWNER); } - statement.setInt(1, getCastle().getResidenceId()); + statement.setInt(1, _castle.getResidenceId()); try (ResultSet rs = statement.executeQuery()) { int typeId; @@ -1333,8 +1333,8 @@ public class Siege implements Siegable setNextSiegeDate(); // Set the next set date for 2 weeks from now // Schedule Time registration end getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); - getCastle().setIsTimeRegistrationOver(false); + _castle.getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1); + _castle.setIsTimeRegistrationOver(false); saveSiegeDate(); // Save the new date startAutoTask(); // Prepare auto start siege and end registration @@ -1346,16 +1346,16 @@ public class Siege implements Siegable if (_scheduledStartSiegeTask != null) { _scheduledStartSiegeTask.cancel(true); - _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000); + _scheduledStartSiegeTask = ThreadPool.schedule(new ScheduleStartSiegeTask(_castle), 1000); } try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ? WHERE id = ?")) { - statement.setLong(1, getSiegeDate().getTimeInMillis()); - statement.setLong(2, getTimeRegistrationOverDate().getTimeInMillis()); - statement.setString(3, String.valueOf(getIsTimeRegistrationOver())); - statement.setInt(4, getCastle().getResidenceId()); + statement.setLong(1, _castle.getSiegeDate().getTimeInMillis()); + statement.setLong(2, _castle.getTimeRegistrationOverDate().getTimeInMillis()); + statement.setString(3, String.valueOf(_castle.getIsTimeRegistrationOver())); + statement.setInt(4, _castle.getResidenceId()); statement.execute(); } catch (Exception e) @@ -1397,7 +1397,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) { statement.setInt(1, clan.getId()); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, typeId); statement.execute(); } @@ -1407,7 +1407,7 @@ public class Siege implements Siegable try (PreparedStatement statement = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) { statement.setInt(1, typeId); - statement.setInt(2, getCastle().getResidenceId()); + statement.setInt(2, _castle.getResidenceId()); statement.setInt(3, clan.getId()); statement.execute(); } @@ -1435,7 +1435,7 @@ public class Siege implements Siegable /** Set the date for the next siege. */ private void setNextSiegeDate() { - final Calendar cal = getCastle().getSiegeDate(); + final Calendar cal = _castle.getSiegeDate(); if (cal.getTimeInMillis() < System.currentTimeMillis()) { cal.setTimeInMillis(System.currentTimeMillis()); @@ -1460,7 +1460,7 @@ public class Siege implements Siegable } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ANNOUNCED_THE_NEXT_CASTLE_SIEGE_TIME); - sm.addCastleId(getCastle().getResidenceId()); + sm.addCastleId(_castle.getResidenceId()); Broadcast.toAllOnlinePlayers(sm); _isRegistrationOver = false; // Allow registration for next siege @@ -1645,7 +1645,7 @@ public class Siege implements Siegable public final L2SiegeClan getDefenderWaitingClan(int clanId) { - for (L2SiegeClan sc : getDefenderWaitingClans()) + for (L2SiegeClan sc : _defenderWaitingClans) { if ((sc != null) && (sc.getClanId() == clanId)) { @@ -1672,23 +1672,23 @@ public class Siege implements Siegable public final boolean getIsTimeRegistrationOver() { - return getCastle().getIsTimeRegistrationOver(); + return _castle.getIsTimeRegistrationOver(); } @Override public final Calendar getSiegeDate() { - return getCastle().getSiegeDate(); + return _castle.getSiegeDate(); } public final Calendar getTimeRegistrationOverDate() { - return getCastle().getTimeRegistrationOverDate(); + return _castle.getTimeRegistrationOverDate(); } public void endTimeRegistration(boolean automatic) { - getCastle().setIsTimeRegistrationOver(true); + _castle.setIsTimeRegistrationOver(true); if (!automatic) { saveSiegeDate(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java index f09be6765f..ac490ba86d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -129,7 +129,7 @@ public class EventScheduler run(); updateLastRun(); - if (isRepeating()) + if (_repeat) { ThreadPool.schedule(this::startScheduler, 1000); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java index eae25b08f7..1d42731b7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/events/listeners/AbstractEventListener.java @@ -93,7 +93,7 @@ public abstract class AbstractEventListener implements Comparable p.playMovie(this)); + _players.forEach(p -> p.playMovie(this)); } public Movie getMovie() @@ -46,16 +46,16 @@ public final class MovieHolder public void playerEscapeVote(L2PcInstance player) { - if (getVotedPlayers().contains(player) || !getPlayers().contains(player) || !getMovie().isEscapable()) + if (_votedPlayers.contains(player) || !_players.contains(player) || !_movie.isEscapable()) { return; } - getVotedPlayers().add(player); + _votedPlayers.add(player); - if (((getVotedPlayers().size() * 100) / getPlayers().size()) >= 50) + if (((_votedPlayers.size() * 100) / _players.size()) >= 50) { - getPlayers().forEach(L2PcInstance::stopMovie); + _players.forEach(L2PcInstance::stopMovie); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index a4fde8355e..4bc6353cfa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -487,7 +487,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return Collections.emptyList(); } @@ -502,7 +502,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } return npcs; } @@ -516,7 +516,7 @@ public final class Instance implements IIdentifiable, INamable final List spawns = getSpawnGroup(name); if (spawns == null) { - LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + getName() + " (" + _id + ")!"); + LOGGER.warning("Spawn group " + name + " doesn't exist for instance " + _template.getName() + " (" + _id + ")!"); return; } @@ -526,7 +526,7 @@ public final class Instance implements IIdentifiable, INamable } catch (Exception e) { - LOGGER.warning("Unable to spawn group " + name + " inside instance " + getName() + " (" + _id + ")"); + LOGGER.warning("Unable to spawn group " + name + " inside instance " + _template.getName() + " (" + _id + ")"); } } @@ -810,7 +810,7 @@ public final class Instance implements IIdentifiable, INamable public void setReenterTime(long time) { // Cannot store reenter data for instance without template id. - if ((getTemplateId() == -1) && (time > 0)) + if ((_template.getId() == -1) && (time > 0)) { return; } @@ -824,7 +824,7 @@ public final class Instance implements IIdentifiable, INamable if (player != null) { ps.setInt(1, player.getObjectId()); - ps.setInt(2, getTemplateId()); + ps.setInt(2, _template.getId()); ps.setLong(3, time); ps.addBatch(); } @@ -835,11 +835,11 @@ public final class Instance implements IIdentifiable, INamable final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); if (InstanceManager.getInstance().getInstanceName(getTemplateId()) != null) { - msg.addInstanceName(getTemplateId()); + msg.addInstanceName(_template.getId()); } else { - msg.addString(getName()); + msg.addString(_template.getName()); } _allowed.forEach(player -> { @@ -995,7 +995,7 @@ public final class Instance implements IIdentifiable, INamable removePlayer(player); if (Config.RESTORE_PLAYER_INSTANCE) { - player.getVariables().set("INSTANCE_RESTORE", getId()); + player.getVariables().set("INSTANCE_RESTORE", _id); } else { @@ -1161,6 +1161,6 @@ public final class Instance implements IIdentifiable, INamable @Override public String toString() { - return getName() + "(" + getId() + ")"; + return _template.getName() + "(" + _id + ")"; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 409678ea5a..ba6f5482ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -788,6 +788,6 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl @Override public String toString() { - return "ID: " + getId() + " Name: " + getName(); + return "ID: " + _templateId + " Name: " + _name; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 74090bd4ac..8a3ac20ed4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -181,12 +181,12 @@ public final class ItemAuction public final long getStartingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final long getFinishingTimeRemaining() { - return Math.max(getEndingTime() - System.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public final void storeMe() @@ -250,7 +250,7 @@ public final class ItemAuction throw new NullPointerException(); } - if (newBid < getAuctionInitBid()) + if (newBid < _auctionItem.getAuctionInitBid()) { player.sendPacket(SystemMessageId.YOUR_BID_PRICE_MUST_BE_HIGHER_THAN_THE_MINIMUM_PRICE_CURRENTLY_BEING_BID); return; @@ -340,7 +340,7 @@ public final class ItemAuction _highestBid = bid; } - if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5bb5770412..9e94b591e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -115,9 +115,9 @@ public class Mail extends ItemContainer try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) { - statement.setInt(1, getOwnerId()); + statement.setInt(1, _ownerId); statement.setString(2, getBaseLocation().name()); - statement.setInt(3, getMessageId()); + statement.setInt(3, _messageId); try (ResultSet inv = statement.executeQuery()) { while (inv.next()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index c7a3128aa9..9228d151c2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -150,7 +150,7 @@ public class PcInventory extends Inventory break; } } - if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) + if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(_owner, false, false)))) { list.add(item); } @@ -211,7 +211,7 @@ public class PcInventory extends Inventory { return getItems(i -> { - if (!i.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) + if (!i.isAvailable(_owner, allowAdena, allowNonTradeable) || !canManipulateWithItemId(i.getId())) { return false; } @@ -232,7 +232,7 @@ public class PcInventory extends Inventory { //@formatter:off return _items.values().stream() - .filter(i -> i.isAvailable(getOwner(), false, false)) + .filter(i -> i.isAvailable(_owner, false, false)) .map(tradeList::adjustAvailableItem) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedList::new)); @@ -689,12 +689,12 @@ public class PcInventory extends Inventory protected boolean removeItem(L2ItemInstance item) { // Removes any reference to the item from Shortcut bar - getOwner().removeItemFromShortCut(item.getObjectId()); + _owner.removeItemFromShortCut(item.getObjectId()); // Removes active Enchant Scroll - if (getOwner().isProcessingItem(item.getObjectId())) + if (_owner.isProcessingItem(item.getObjectId())) { - getOwner().removeRequestsThatProcessesItem(item.getObjectId()); + _owner.removeRequestsThatProcessesItem(item.getObjectId()); } if (item.getId() == ADENA_ID) @@ -720,7 +720,7 @@ public class PcInventory extends Inventory public void refreshWeight() { super.refreshWeight(); - getOwner().refreshOverloaded(true); + _owner.refreshOverloaded(true); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 87c35d5d82..fa6332fb1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -60,7 +60,7 @@ public class PetInventory extends Inventory protected void refreshWeight() { super.refreshWeight(); - getOwner().updateAndBroadcastStatus(1); + _owner.updateAndBroadcastStatus(1); } public boolean validateCapacity(L2ItemInstance item) @@ -120,7 +120,7 @@ public class PetInventory extends Inventory { if (item.isEquipped()) { - if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) + if (!item.getItem().checkCondition(_owner, _owner, false)) { unEquipItemInSlot(item.getLocationSlot()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Armor.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Armor.java index 4c8db6b288..dbba43acd0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Armor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Armor.java @@ -73,6 +73,6 @@ public final class L2Armor extends L2Item @Override public final int getItemMask() { - return getItemType().mask(); + return _type.mask(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java index a04975542f..8d988d61be 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2EtcItem.java @@ -89,7 +89,7 @@ public final class L2EtcItem extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java index 2f590854f8..26e11555ac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -415,11 +415,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); } default: { @@ -434,11 +434,11 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable case TYPE2_SHIELD_ARMOR: case TYPE2_ACCESSORY: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); } case TYPE2_WEAPON: { - return _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel); + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); } default: { @@ -532,7 +532,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public boolean isEquipable() { - return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType); + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); } /** @@ -589,7 +589,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable */ public final int isEnchantable() { - return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, getId()) < 0 ? _enchantable : 0; + return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0; } /** @@ -780,7 +780,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || _heroItem) && (activeChar.isPlayer() && activeChar.getActingPlayer().isInOlympiadMode())) { if (isEquipable()) { @@ -793,7 +793,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return false; } - if (isCocRestrictedItem() && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) + if (_is_coc_restricted && (activeChar.isPlayer() && (activeChar.getActingPlayer().isOnEvent(CeremonyOfChaosEvent.class)))) { activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ITEM_IN_THE_TOURNAMENT); return false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 1db19c172a..a0ee0a7895 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -119,7 +119,7 @@ public final class L2Weapon extends L2Item @Override public int getItemMask() { - return getItemType().mask(); + return _type.mask(); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 0f9a69fec3..d9baca8329 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -274,7 +274,7 @@ public class AppearanceStone return false; } - switch (getType()) + switch (_type) { case RESTORE: { @@ -383,15 +383,15 @@ public class AppearanceStone return false; } - if (getWeaponType() != WeaponType.NONE) + if (_weaponType != WeaponType.NONE) { - if (!targetItem.isWeapon() || (targetItem.getItemType() != getWeaponType())) + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); return false; } - switch (getHandType()) + switch (_handType) { case ONE_HANDED: { @@ -413,7 +413,7 @@ public class AppearanceStone } } - switch (getMagicType()) + switch (_magicType) { case MAGICAL: { @@ -435,9 +435,9 @@ public class AppearanceStone } } - if (getArmorType() != ArmorType.NONE) + if (_armorType != ArmorType.NONE) { - switch (getArmorType()) + switch (_armorType) { case SHIELD: { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 851ee0b06b..9cd7f326c0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -328,14 +328,14 @@ public final class L2ItemInstance extends L2Object if (Config.LOG_ITEMS) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) + if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -344,7 +344,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), " // + String.valueOf(creator) + ", " // in case of null + String.valueOf(reference)); // in case of null @@ -366,7 +366,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -482,7 +482,7 @@ public final class L2ItemInstance extends L2Object return; } final long old = _count; - final long max = getId() == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; + final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE; if ((count > 0) && (_count > (max - count))) { @@ -504,12 +504,12 @@ public final class L2ItemInstance extends L2Object { if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) { - if (getEnchantLevel() > 0) + if (_enchantLevel > 0) { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":+" + getEnchantLevel() // - + " " + getItem().getName() // + + ":+" + _enchantLevel // + + " " + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -519,7 +519,7 @@ public final class L2ItemInstance extends L2Object { LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null + ", item " + getObjectId() // - + ":" + getItem().getName() // + + ":" + _item.getName() // + "(" + _count + "), PrevCount(" // + String.valueOf(old) + "), " // in case of null + String.valueOf(creator) + ", " // in case of null @@ -542,7 +542,7 @@ public final class L2ItemInstance extends L2Object final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); } } } @@ -559,9 +559,9 @@ public final class L2ItemInstance extends L2Object */ public int isEnchantable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isEnchantable(); + return _item.isEnchantable(); } return 0; } @@ -656,7 +656,7 @@ public final class L2ItemInstance extends L2Object */ public int getDisplayId() { - return getItem().getDisplayId(); + return _item.getDisplayId(); } /** @@ -730,7 +730,7 @@ public final class L2ItemInstance extends L2Object /** * @return the reference price of the item. */ - public int getReferencePrice() + public long getReferencePrice() { return _item.getReferencePrice(); } @@ -880,7 +880,7 @@ public final class L2ItemInstance extends L2Object public boolean isOlyRestrictedItem() { - return getItem().isOlyRestrictedItem(); + return _item.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public final class L2ItemInstance extends L2Object final L2Summon pet = player.getPet(); return ((!isEquipped()) // Not equipped - && (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item - && ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield + && (_item.getType2() != L2Item.TYPE2_QUEST) // Not Quest Item + && ((_item.getType2() != L2Item.TYPE2_MONEY) || (_item.getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll - && (allowAdena || (getId() != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (allowAdena || (_itemId != ADENA_ID)) // Not Adena + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -963,7 +963,7 @@ public final class L2ItemInstance extends L2Object // there shall be no previous augmentation.. if (_augmentation != null) { - LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + getOwnerId()); + LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId); return false; } @@ -1139,9 +1139,9 @@ public final class L2ItemInstance extends L2Object { if (isWeapon()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - return getItem().getAttributes().stream().findFirst().orElse(null); + return _item.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1167,9 +1167,9 @@ public final class L2ItemInstance extends L2Object { if (isArmor()) { - if (getItem().getAttributes() != null) + if (_item.getAttributes() != null) { - final AttributeHolder attribute = getItem().getAttribute(element); + final AttributeHolder attribute = _item.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1411,7 +1411,7 @@ public final class L2ItemInstance extends L2Object player.broadcastUserInfo(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1433,7 +1433,7 @@ public final class L2ItemInstance extends L2Object { scheduleConsumeManaTask(); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(this); @@ -1615,11 +1615,11 @@ public final class L2ItemInstance extends L2Object ps.setLong(2, _count); ps.setString(3, _loc.name()); ps.setInt(4, _locData); - ps.setInt(5, getEnchantLevel()); - ps.setInt(6, getCustomType1()); - ps.setInt(7, getCustomType2()); - ps.setInt(8, getMana()); - ps.setLong(9, getTime()); + ps.setInt(5, _enchantLevel); + ps.setInt(6, _type1); + ps.setInt(7, _type2); + ps.setInt(8, _mana); + ps.setLong(9, _time); ps.setInt(10, getObjectId()); ps.executeUpdate(); _existsInDb = true; @@ -1651,12 +1651,12 @@ public final class L2ItemInstance extends L2Object ps.setLong(3, _count); ps.setString(4, _loc.name()); ps.setInt(5, _locData); - ps.setInt(6, getEnchantLevel()); + ps.setInt(6, _enchantLevel); ps.setInt(7, getObjectId()); ps.setInt(8, _type1); ps.setInt(9, _type2); - ps.setInt(10, getMana()); - ps.setLong(11, getTime()); + ps.setInt(10, _mana); + ps.setLong(11, _time); ps.executeUpdate(); _existsInDb = true; @@ -1838,7 +1838,7 @@ public final class L2ItemInstance extends L2Object player.sendInventoryUpdate(iu); } - if (getItemLocation() != ItemLocation.WAREHOUSE) + if (_loc != ItemLocation.WAREHOUSE) { // destroy player.getInventory().destroyItem("L2ItemInstance", this, player, null); @@ -1852,7 +1852,7 @@ public final class L2ItemInstance extends L2Object { player.getWarehouse().destroyItem("L2ItemInstance", this, player, null); } - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(getId())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_EXPIRED).addItemName(_itemId)); } } @@ -1949,32 +1949,32 @@ public final class L2ItemInstance extends L2Object public boolean isQuestItem() { - return getItem().isQuestItem(); + return _item.isQuestItem(); } public boolean isElementable() { - if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) + if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return getItem().isElementable(); + return _item.isElementable(); } return false; } public boolean isFreightable() { - return getItem().isFreightable(); + return _item.isFreightable(); } public int useSkillDisTime() { - return getItem().useSkillDisTime(); + return _item.useSkillDisTime(); } public int getOlyEnchantLevel() { final L2PcInstance player = getActingPlayer(); - int enchant = getEnchantLevel(); + int enchant = _enchantLevel; if (player == null) { @@ -1991,7 +1991,7 @@ public final class L2ItemInstance extends L2Object public boolean hasPassiveSkills() { - return (getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && (getItem().getSkills(ItemSkillType.NORMAL) != null); + return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2004,7 +2004,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2025,7 +2025,7 @@ public final class L2ItemInstance extends L2Object final L2PcInstance player = getActingPlayer(); if (player != null) { - getItem().forEachSkill(ItemSkillType.NORMAL, holder -> + _item.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2429,7 +2429,15 @@ public final class L2ItemInstance extends L2Object iu.addModifiedItem(this); player.broadcastUserInfo(UserInfoType.APPAREANCE); player.sendInventoryUpdate(iu); - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + + if (isEnchanted()) + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_S2_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addInt(_enchantLevel).addItemName(this)); + } + else + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_RESTORED_TO_ITS_PREVIOUS_APPEARANCE_AS_ITS_TEMPORARY_MODIFICATION_HAS_EXPIRED).addItemName(this)); + } } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 4858feb6a9..9a7dbcac0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -43,7 +43,7 @@ public final class Participant name = plr.getName(); side = olympiadSide; baseClass = plr.getBaseClass(); - stats = Olympiad.getNobleStats(getObjectId()); + stats = Olympiad.getNobleStats(objectId); clanName = plr.getClan() != null ? plr.getClan().getName() : ""; clanId = plr.getClanId(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/options/Options.java index 813ec8f6db..630038eb77 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/options/Options.java @@ -189,14 +189,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { addSkill(player, holder.getSkill()); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { addSkill(player, holder.getSkill()); } @@ -227,14 +227,14 @@ public class Options } if (hasActiveSkills()) { - for (SkillHolder holder : getActiveSkills()) + for (SkillHolder holder : _activeSkill) { player.removeSkill(holder.getSkill(), false, false); } } if (hasPassiveSkills()) { - for (SkillHolder holder : getPassiveSkills()) + for (SkillHolder holder : _passiveSkill) { player.removeSkill(holder.getSkill(), false, true); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java index 94d887ee5a..0cc8caca17 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -2698,7 +2698,6 @@ public class Quest extends AbstractScript implements IIdentifiable public String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) { final boolean questwindow = !filename.endsWith(".html"); - final int questId = getId(); // Create handler to file linked to the quest String content = getHtm(player, filename); @@ -2711,9 +2710,9 @@ public class Quest extends AbstractScript implements IIdentifiable content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); } - if (questwindow && (questId > 0) && (questId < 20000) && (questId != 999)) + if (questwindow && (_questId > 0) && (_questId < 20000) && (_questId != 999)) { - final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId); + final NpcQuestHtmlMessage npcReply = new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, _questId); npcReply.setHtml(content); npcReply.replace("%playername%", player.getName()); player.sendPacket(npcReply); @@ -2901,7 +2900,7 @@ public class Quest extends AbstractScript implements IIdentifiable { if (activeChar.getQuestState(getName()) != null) { - final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); + final ExQuestNpcLogList packet = new ExQuestNpcLogList(_questId); getNpcLogList(activeChar).forEach(packet::add); activeChar.sendPacket(packet); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestState.java index 40aa1878fd..5e0a66a375 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -277,7 +277,7 @@ public final class QuestState } catch (Exception e) { - LOGGER.log(Level.WARNING, _player.getName() + ", " + getQuestName() + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); + LOGGER.log(Level.WARNING, _player.getName() + ", " + _questName + " cond [" + val + "] is not an integer. Value stored, but no packet was sent: " + e.getMessage(), e); } } @@ -449,7 +449,7 @@ public final class QuestState } catch (NumberFormatException nfe) { - LOGGER.log(Level.INFO, "Quest " + getQuestName() + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); + LOGGER.log(Level.INFO, "Quest " + _questName + ", method getInt(" + var + "), tried to parse a non-integer value (" + variable + "). Char Id: " + _player.getObjectId(), nfe); } return varint; @@ -755,7 +755,7 @@ public final class QuestState Quest.deleteQuestInDb(this, repeatable); if (repeatable) { - _player.delQuestState(getQuestName()); + _player.delQuestState(_questName); _player.sendPacket(new QuestList(_player)); } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java index 4013de0733..1cf9e26073 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -33,18 +33,18 @@ public class QuestTimer @Override public void run() { - if (!getIsActive()) + if (!_isActive) { return; } try { - if (!getIsRepeating()) + if (!_isRepeating) { cancelAndRemove(); } - getQuest().notifyEvent(getName(), getNpc(), getPlayer()); + _quest.notifyEvent(_name, _npc, _player); } catch (Exception e) { @@ -53,13 +53,13 @@ public class QuestTimer } } - private boolean _isActive = true; - private final String _name; - private final Quest _quest; - private final L2Npc _npc; - private final L2PcInstance _player; - private final boolean _isRepeating; - private final ScheduledFuture _schedular; + boolean _isActive = true; + final String _name; + final Quest _quest; + final L2Npc _npc; + final L2PcInstance _player; + final boolean _isRepeating; + private final ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) { @@ -68,7 +68,7 @@ public class QuestTimer _player = player; _npc = npc; _isRepeating = repeating; - _schedular = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); + _scheduler = repeating ? ThreadPool.scheduleAtFixedRate(new ScheduleTimerTask(), time, time) : ThreadPool.schedule(new ScheduleTimerTask(), time); } public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) @@ -87,9 +87,9 @@ public class QuestTimer public void cancel() { _isActive = false; - if (_schedular != null) + if (_scheduler != null) { - _schedular.cancel(false); + _scheduler.cancel(false); } } @@ -116,7 +116,7 @@ public class QuestTimer { return false; } - if ((quest != _quest) || !name.equalsIgnoreCase(getName())) + if ((quest != _quest) || !name.equalsIgnoreCase(_name)) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java index 73f5ed97a8..81ec17cf73 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -132,7 +132,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) @@ -152,7 +152,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to initialize functions for residence: " + _residenceId, e); } } @@ -173,7 +173,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN ps.setInt(1, func.getId()); ps.setInt(2, func.getLevel()); ps.setLong(3, func.getExpiration()); - ps.setInt(4, getResidenceId()); + ps.setInt(4, _residenceId); ps.setInt(5, func.getLevel()); ps.setLong(6, func.getExpiration()); @@ -181,7 +181,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to add function: " + func.getId() + " for residence: " + _residenceId, e); } finally { @@ -202,13 +202,13 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ? and id = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.setInt(2, func.getId()); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove function: " + func.getId() + " residence: " + _residenceId, e); } finally { @@ -225,12 +225,12 @@ public abstract class AbstractResidence extends ListenersContainer implements IN try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM residence_functions WHERE residenceId = ?")) { - ps.setInt(1, getResidenceId()); + ps.setInt(1, _residenceId); ps.execute(); } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + getResidenceId(), e); + LOGGER.log(Level.WARNING, "Failed to remove functions for residence: " + _residenceId, e); } finally { @@ -313,6 +313,6 @@ public abstract class AbstractResidence extends ListenersContainer implements IN @Override public String toString() { - return getName() + " (" + getResidenceId() + ")"; + return _name + " (" + _residenceId + ")"; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index ab2394ed74..cac8ecf953 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -333,7 +333,7 @@ public final class BuffInfo } // Call on start. - effect.onStart(getEffector(), getEffected(), getSkill()); + effect.onStart(_effector, _effected, _skill); // If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it. if (effect.getTicks() > 0) @@ -360,7 +360,7 @@ public final class BuffInfo if (_isInUse) { // Callback for on action time event. - continueForever = effect.onActionTime(getEffector(), getEffected(), getSkill()); + continueForever = effect.onActionTime(_effector, _effected, _skill); } if (!continueForever && _skill.isToggle()) @@ -369,7 +369,7 @@ public final class BuffInfo if (task != null) { task.getScheduledFuture().cancel(true); // Don't allow to finish current run. - _effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list. + _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list. } } } @@ -391,7 +391,7 @@ public final class BuffInfo // Instant effects shouldn't call onExit(..). if (!effect.isInstant()) { - effect.onExit(getEffector(), getEffected(), getSkill()); + effect.onExit(_effector, _effected, _skill); } } @@ -403,7 +403,7 @@ public final class BuffInfo { smId = SystemMessageId.S1_HAS_BEEN_ABORTED; } - else if (isRemoved()) + else if (_isRemoved) { smId = SystemMessageId.THE_EFFECT_OF_S1_HAS_BEEN_REMOVED; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java index 19a1a61b20..1cea15b228 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -240,15 +240,15 @@ public final class Skill implements IIdentifiable _subordinationAbnormalType = set.getEnum("subordinationAbnormalType", AbnormalType.class, AbnormalType.NONE); int abnormalTime = set.getInt("abnormalTime", 0); - if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(getId())) + if (Config.ENABLE_MODIFY_SKILL_DURATION && Config.SKILL_DURATION_LIST.containsKey(_id)) { - if ((getLevel() < 100) || (getLevel() > 140)) + if ((_level < 100) || (_level > 140)) { - abnormalTime = Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime = Config.SKILL_DURATION_LIST.get(_id); } - else if ((getLevel() >= 100) && (getLevel() < 140)) + else if ((_level >= 100) && (_level < 140)) { - abnormalTime += Config.SKILL_DURATION_LIST.get(getId()); + abnormalTime += Config.SKILL_DURATION_LIST.get(_id); } } @@ -441,7 +441,7 @@ public final class Skill implements IIdentifiable } _magicCriticalRate = set.getDouble("magicCriticalRate", 0); - _buffType = isTriggeredSkill() ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : isDebuff() ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; + _buffType = _isTriggeredSkill ? SkillBuffType.TRIGGER : isToggle() ? SkillBuffType.TOGGLE : isDance() ? SkillBuffType.DANCE : _isDebuff ? SkillBuffType.DEBUFF : !isHealingPotionSkill() ? SkillBuffType.BUFF : SkillBuffType.NONE; _displayInList = set.getBoolean("displayInList", true); } @@ -1054,7 +1054,7 @@ public final class Skill implements IIdentifiable */ public boolean isHealingPotionSkill() { - return getAbnormalType() == AbnormalType.HP_RECOVER; + return _abnormalType == AbnormalType.HP_RECOVER; } public int getMaxSoulConsumeCount() @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable public boolean isStayAfterDeath() { - return _stayAfterDeath || isIrreplacableBuff() || isNecessaryToggle(); + return _stayAfterDeath || _irreplacableBuff || _isNecessaryToggle; } public boolean isBad() @@ -1333,7 +1333,7 @@ public final class Skill implements IIdentifiable return; } - if (effected.isIgnoringSkillEffects(getId(), getLevel())) + if (effected.isIgnoringSkillEffects(_id, _level)) { return; } @@ -1357,7 +1357,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effected.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1368,19 +1368,19 @@ public final class Skill implements IIdentifiable } // Check for mesmerizing debuffs and increase resist level. - if (isDebuff() && (getBasicProperty() != BasicProperty.NONE) && effected.hasBasicPropertyResist()) + if (_isDebuff && (_basicProperty != BasicProperty.NONE) && effected.hasBasicPropertyResist()) { - final BasicPropertyResist resist = effected.getBasicPropertyResist(getBasicProperty()); + final BasicPropertyResist resist = effected.getBasicPropertyResist(_basicProperty); resist.increaseResistLevel(); } } // Support for buff sharing feature including healing herbs. - if (isSharedWithSummon() && effected.isPlayer() && effected.hasServitors() && !isTransformation()) + if (_isSharedWithSummon && effected.isPlayer() && effected.hasServitors() && !isTransformation()) { - if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) + if ((addContinuousEffects && isContinuous() && !_isDebuff) || _isRecoveryHerb) { - effected.getServitors().values().forEach(s -> applyEffects(effector, s, isRecoveryHerb(), 0)); + effected.getServitors().values().forEach(s -> applyEffects(effector, s, _isRecoveryHerb, 0)); } } } @@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable if (addContinuousEffects) { // Aura skills reset the abnormal time. - final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(getId()) : null; + final BuffInfo existingInfo = _operateType.isAura() ? effector.getEffectList().getBuffInfoBySkillId(_id) : null; if (existingInfo != null) { existingInfo.resetAbnormalTime(info.getAbnormalTime()); @@ -1413,7 +1413,7 @@ public final class Skill implements IIdentifiable // Support for buff sharing feature. // Avoiding Servitor Share since it's implementation already "shares" the effect. - if (addContinuousEffects && isSharedWithSummon() && info.getEffected().isPlayer() && isContinuous() && !isDebuff() && info.getEffected().hasServitors()) + if (addContinuousEffects && _isSharedWithSummon && info.getEffected().isPlayer() && isContinuous() && !_isDebuff && info.getEffected().hasServitors()) { info.getEffected().getServitors().values().forEach(s -> applyEffects(effector, s, false, 0)); } @@ -1498,9 +1498,9 @@ public final class Skill implements IIdentifiable // Self Effect if (hasEffects(EffectScope.SELF)) { - if (caster.isAffectedBySkill(getId())) + if (caster.isAffectedBySkill(_id)) { - caster.stopSkillEffects(true, getId()); + caster.stopSkillEffects(true, _id); } applyEffects(caster, caster, true, false, true, 0, item); } @@ -1517,7 +1517,7 @@ public final class Skill implements IIdentifiable } } - if (isSuicideAttack()) + if (_isSuicideAttack) { caster.doDie(caster); } @@ -1571,7 +1571,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isIrreplacableBuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispelled(); + return !isPassive() && !isToggle() && !_isDebuff && !_irreplacableBuff && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && _canBeDispelled; } public boolean isClanSkill() @@ -1733,20 +1733,20 @@ public final class Skill implements IIdentifiable public Skill getAttachedSkill(L2Character activeChar) { // If character is double casting, return double cast skill. - if ((getDoubleCastSkill() > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) + if ((_doubleCastSkill > 0) && activeChar.isAffected(EffectFlag.DOUBLE_CAST)) { return SkillData.getInstance().getSkill(getDoubleCastSkill(), getLevel(), getSubLevel()); } // Default toggle group ID, assume nothing attached. - if ((getAttachToggleGroupId() <= 0) || (getAttachSkills() == null)) + if ((_attachToggleGroupId <= 0) || (_attachSkills == null)) { return null; } //@formatter:off final int toggleSkillId = activeChar.getEffectList().getEffects().stream() - .filter(info -> info.getSkill().getToggleGroupId() == getAttachToggleGroupId()) + .filter(info -> info.getSkill().getToggleGroupId() == _attachToggleGroupId) .mapToInt(info -> info.getSkill().getId()) .findAny().orElse(0); //@formatter:on @@ -1757,7 +1757,7 @@ public final class Skill implements IIdentifiable return null; } - final AttachSkillHolder attachedSkill = getAttachSkills().stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); + final AttachSkillHolder attachedSkill = _attachSkills.stream().filter(ash -> ash.getRequiredSkillId() == toggleSkillId).findAny().orElse(null); // No attached skills for this toggle found. if (attachedSkill == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 8e607be078..f5da8aed03 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -99,7 +99,7 @@ public class SkillChannelizer implements Runnable { for (L2Character chars : _channelized) { - chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), getChannelizer()); + chars.getSkillChannelized().removeChannelizer(_skill.getChannelingSkillId(), _channelizer); } _channelized = null; } @@ -160,7 +160,7 @@ public class SkillChannelizer implements Runnable if (o.isCharacter()) { targetList.add((L2Character) o); - ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer()); + ((L2Character) o).getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), _channelizer); } }); } @@ -198,13 +198,13 @@ public class SkillChannelizer implements Runnable } // Update PvP status - if (character.isPlayable() && getChannelizer().isPlayer()) + if (character.isPlayable() && _channelizer.isPlayer()) { - ((L2PcInstance) getChannelizer()).updatePvPStatus(character); + ((L2PcInstance) _channelizer).updatePvPStatus(character); } // Be warned, this method has the possibility to call doDie->abortCast->stopChanneling method. Variable cache above try"+ +" is used in this case to avoid NPEs. - channeledSkill.applyEffects(getChannelizer(), character); + channeledSkill.applyEffects(_channelizer, character); // Reduce shots. if (skill.useSpiritShot()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index f8dfd518a6..30203b6450 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -145,7 +145,7 @@ public final class TeleportHolder // Build html final StringBuilder sb = new StringBuilder(); final StringBuilder sb_f = new StringBuilder(); - for (TeleportLocation loc : getLocations()) + for (TeleportLocation loc : _teleportData) { String finalName = loc.getName(); String confirmDesc = loc.getName(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 66f0ce1b9f..69519245dc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -191,7 +191,7 @@ public abstract class L2ZoneType extends ListenersContainer } else { - LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + getId()); + LOGGER.info(getClass().getSimpleName() + ": Unknown parameter - " + name + " in zone: " + _id); } } @@ -205,7 +205,7 @@ public abstract class L2ZoneType extends ListenersContainer final Instance world = character.getInstanceWorld(); if (world != null) { - if (world.getTemplateId() != getInstanceTemplateId()) + if (world.getTemplateId() != _instanceTemplateId) { return false; } @@ -214,7 +214,7 @@ public abstract class L2ZoneType extends ListenersContainer return false; } } - else if (getInstanceTemplateId() > 0) + else if (_instanceTemplateId > 0) { return false; } @@ -402,12 +402,12 @@ public abstract class L2ZoneType extends ListenersContainer public double getDistanceToZone(int x, int y) { - return getZone().getDistanceToZone(x, y); + return _zone.getDistanceToZone(x, y); } public double getDistanceToZone(L2Object object) { - return getZone().getDistanceToZone(object.getX(), object.getY()); + return _zone.getDistanceToZone(object.getX(), object.getY()); } public void revalidateInZone(L2Character character) @@ -572,7 +572,7 @@ public abstract class L2ZoneType extends ListenersContainer public void visualizeZone(int z) { - getZone().visualizeZone(z); + _zone.visualizeZone(z); } public void setEnabled(boolean state) @@ -605,10 +605,10 @@ public abstract class L2ZoneType extends ListenersContainer { if (_enabledInInstance != null) { - return _enabledInInstance.getOrDefault(instanceId, isEnabled()); + return _enabledInInstance.getOrDefault(instanceId, _enabled); } - return isEnabled(); + return _enabled; } public void oustAllPlayers() @@ -633,7 +633,7 @@ public abstract class L2ZoneType extends ListenersContainer return; } - for (L2Character character : getCharactersInside()) + for (L2Character character : _characterList.values()) { if ((character != null) && character.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java index 52554565f4..323b65f2bc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/ZoneRegion.java @@ -63,7 +63,7 @@ public class ZoneRegion return; } - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.revalidateInZone(character); } @@ -71,7 +71,7 @@ public class ZoneRegion public void removeFromZones(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { z.removeCharacter(character); } @@ -85,7 +85,7 @@ public class ZoneRegion final int left = x + range; final int right = x - range; - for (L2ZoneType e : getZones().values()) + for (L2ZoneType e : _zones.values()) { if (e instanceof L2PeaceZone) { @@ -120,7 +120,7 @@ public class ZoneRegion public void onDeath(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { @@ -131,7 +131,7 @@ public class ZoneRegion public void onRevive(L2Character character) { - for (L2ZoneType z : getZones().values()) + for (L2ZoneType z : _zones.values()) { if (z.isInsideZone(character)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 33d3bb8723..6a7479f3af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; */ public final class L2EffectZone extends L2ZoneType { - private int _chance; + int _chance; private int _initialDelay; private int _reuse; protected boolean _bypassConditions; @@ -257,7 +257,7 @@ public final class L2EffectZone extends L2ZoneType { getCharactersInside().forEach(character -> { - if ((character != null) && !character.isDead() && (Rnd.get(100) < getChance())) + if ((character != null) && !character.isDead() && (Rnd.get(100) < _chance)) { for (Entry e : _skills.entrySet()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java index a1a99b7051..95223b63a9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/zone/type/L2NoRestartZone.java @@ -99,7 +99,7 @@ public class L2NoRestartZone extends L2ZoneType return; } - if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/L2GameClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/L2GameClient.java index 9b786f0b7d..f1e975876e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -252,7 +252,7 @@ public final class L2GameClient extends ChannelInboundHandler _channel.writeAndFlush(packet); // Run packet implementation. - packet.runImpl(getActiveChar()); + packet.runImpl(_activeChar); } /** @@ -533,7 +533,7 @@ public final class L2GameClient extends ChannelInboundHandler // exploit prevention, should not happens in normal way if (player.isOnlineInt() == 1) { - LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + getAccountName()); + LOGGER.severe("Attempt of double login: " + player.getName() + "(" + objectId + ") " + _accountName); } Disconnection.of(player).defaultSequence(false); return null; @@ -603,11 +603,11 @@ public final class L2GameClient extends ChannelInboundHandler } case AUTHENTICATED: { - return "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } case IN_GAME: { - return "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; + return "[Character: " + (_activeChar == null ? "disconnected" : _activeChar.getName() + "[" + _activeChar.getObjectId() + "]") + " - Account: " + _accountName + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]"; } default: { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 8aa642c02a..1c02d43810 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -56,7 +56,7 @@ public final class RequestRecipeItemMakeSelf implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode()) + if (activeChar.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index ba40366a3e..fda43da41c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -79,7 +79,7 @@ public final class RequestRecipeShopMakeItem implements IClientIncomingPacket return; } - if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) + if (activeChar.isCrafting() || manufacturer.isCrafting()) { activeChar.sendMessage("You are currently in Craft Mode."); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index b3f8a823c8..ad3f971eda 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -59,7 +59,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 4fe4ef7d8c..75c44c649d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -54,7 +54,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 97d035b0f3..1d6ef78348 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -62,7 +62,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket final ShapeShiftingItemRequest request = player.getRequest(ShapeShiftingItemRequest.class); - if (player.isInStoreMode() || player.isInCraftMode() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) + if (player.isInStoreMode() || player.isCrafting() || player.isProcessingRequest() || player.isProcessingTransaction() || (request == null)) { client.sendPacket(ExShapeShiftingResult.CLOSE); client.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_SYSTEM_DURING_TRADING_PRIVATE_STORE_AND_WORKSHOP_SETUP); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 10ce97b46c..2d55d432bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -438,7 +438,7 @@ public abstract class AbstractMessagePacket> { out.println(0x62); - out.println(getId()); + out.println(_smId.getId()); out.println(_params.length); for (SMParam param : _params) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/script/DateRange.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/script/DateRange.java index 1a16f0bd49..934a748fa3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/script/DateRange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/script/DateRange.java @@ -77,6 +77,6 @@ public class DateRange @Override public String toString() { - return "DateRange: From: " + getStartDate() + " To: " + getEndDate(); + return "DateRange: From: " + _startDate + " To: " + _endDate; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java index 17f3f7f21b..bda9f2f3e5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -68,7 +68,7 @@ public final class OfflineTradeUtil } default: { - canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isInCraftMode(); + canSetShop = Config.OFFLINE_CRAFT_ENABLE && player.isCrafting(); break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 4911f2826c..e5388f4596 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -240,7 +240,7 @@ public class TaskExecutor */ public void pause() throws UnsupportedOperationException { - if (!canBePaused()) + if (!task.canBePaused()) { throw new UnsupportedOperationException("Pause not supported"); } @@ -276,7 +276,7 @@ public class TaskExecutor */ public void stop() throws UnsupportedOperationException { - if (!canBeStopped()) + if (!task.canBeStopped()) { throw new UnsupportedOperationException("Stop not supported"); } @@ -346,7 +346,7 @@ public class TaskExecutor */ public String getStatusMessage() throws UnsupportedOperationException { - if (!supportsStatusTracking()) + if (!task.supportsStatusTracking()) { throw new UnsupportedOperationException("Status tracking not supported"); } @@ -360,7 +360,7 @@ public class TaskExecutor */ public double getCompleteness() throws UnsupportedOperationException { - if (!supportsCompletenessTracking()) + if (!task.supportsCompletenessTracking()) { throw new UnsupportedOperationException("Completeness tracking not supported"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerThread.java index 85dbd2a34a..7d9ec1824b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerThread.java @@ -291,11 +291,11 @@ public class GameServerThread extends Thread */ public boolean isAuthed() { - if (getGameServerInfo() == null) + if (_gsi == null) { return false; } - return getGameServerInfo().isAuthed(); + return _gsi.isAuthed(); } public void setGameServerInfo(GameServerInfo gsi) @@ -318,9 +318,9 @@ public class GameServerThread extends Thread public int getServerId() { - if (getGameServerInfo() != null) + if (_gsi != null) { - return getGameServerInfo().getId(); + return _gsi.getId(); } return -1; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/network/L2LoginClient.java index da20164f21..068a5f1773 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -90,7 +90,7 @@ public final class L2LoginClient extends ChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!hasJoinedGS() || ((getConnectionStartTime() + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java index 859128de7b..c90c8127a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java @@ -286,7 +286,7 @@ public abstract class BaseGameServerRegister */ protected static abstract class BaseTask implements Runnable { - private ResourceBundle _bundle; + protected ResourceBundle _bundle; /** * Sets the bundle. @@ -314,10 +314,10 @@ public abstract class BaseGameServerRegister public void showError(String msg, Throwable t) { String title; - if (getBundle() != null) + if (_bundle != null) { - title = getBundle().getString("error"); - msg += Config.EOL + getBundle().getString("reason") + ' ' + t.getLocalizedMessage(); + title = _bundle.getString("error"); + msg += Config.EOL + _bundle.getString("reason") + ' ' + t.getLocalizedMessage(); } else { @@ -376,59 +376,59 @@ public abstract class BaseGameServerRegister if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.printf(getBundle().getString("checkingIdInUse") + Config.EOL, _id); + System.out.printf(_bundle.getString("checkingIdInUse") + Config.EOL, _id); if (GameServerTable.getInstance().hasRegisteredGameServerOnId(_id)) { - System.out.println(getBundle().getString("yes")); + System.out.println(_bundle.getString("yes")); if (_force) { - System.out.printf(getBundle().getString("forcingRegistration") + Config.EOL, _id); + System.out.printf(_bundle.getString("forcingRegistration") + Config.EOL, _id); unregisterGameServer(_id); registerGameServer(_id, _outDir); - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, _id); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, _id); } else if (_fallback) { - System.out.println(getBundle().getString("fallingBack")); + System.out.println(_bundle.getString("fallingBack")); final int registeredId = registerFirstAvailable(_outDir); if (registeredId < 0) { - System.out.println(getBundle().getString("noFreeId")); + System.out.println(_bundle.getString("noFreeId")); } else { - System.out.printf(getBundle().getString("registrationOk") + Config.EOL, registeredId); + System.out.printf(_bundle.getString("registrationOk") + Config.EOL, registeredId); } } else { - System.out.println(getBundle().getString("noAction")); + System.out.println(_bundle.getString("noAction")); } } else { - System.out.println(getBundle().getString("no")); + System.out.println(_bundle.getString("no")); registerGameServer(_id, _outDir); } } } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } catch (IOException e) { - showError(getBundle().getString("ioErrorRegister"), e); + showError(_bundle.getString("ioErrorRegister"), e); } } } @@ -453,14 +453,14 @@ public abstract class BaseGameServerRegister @Override public void run() { - System.out.printf(getBundle().getString("removingGsId") + Config.EOL, _id); + System.out.printf(_bundle.getString("removingGsId") + Config.EOL, _id); try { unregisterGameServer(_id); } catch (SQLException e) { - showError(getBundle().getString("sqlErrorRegister"), e); + showError(_bundle.getString("sqlErrorRegister"), e); } } } @@ -479,7 +479,7 @@ public abstract class BaseGameServerRegister } catch (SQLException e) { - showError(getBundle().getString("sqlErrorUnregisterAll"), e); + showError(_bundle.getString("sqlErrorUnregisterAll"), e); } } }

There are no currently pending petitions.