diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 7476b0028f..aeec8b4806 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 49dfb3caff..5606f1d897 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1577,11 +1577,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7253,7 +7253,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 5b2098a884..48e1230e9f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -50,7 +50,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -62,12 +62,12 @@ public class RequestExEnchantSkill implements IClientIncomingPacket if (level < 100) { _skillLevel = level; - _skillSubLevel = 0; + _skillSubLevel = 0; } else { _skillLevel = client.getPlayer().getKnownSkill(_skillId).getLevel(); - _skillSubLevel = SkillEnchantConverter.levelToUnderground(level); + _skillSubLevel = SkillEnchantConverter.levelToUnderground(level); } return true; } @@ -75,7 +75,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -131,7 +131,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -139,14 +139,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((_type != SkillEnchantType.UNTRAIN) && ((skill.getSubLevel() + 1) != _skillSubLevel )) + else if ((_type != SkillEnchantType.UNTRAIN) && ((skill.getSubLevel() + 1) != _skillSubLevel)) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); if (_type != SkillEnchantType.UNTRAIN) // TODO: Fix properly { // Verify if player has all the ingredients @@ -185,7 +185,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -224,7 +224,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -256,14 +256,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket // TODO: Fix properly final Skill enchantedSkill; final SystemMessage sm; - if ((_skillSubLevel % 1000) < 1) + if ((_skillSubLevel % 1000) < 1) { enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel); sm = new SystemMessage(SystemMessageId.UNTRAIN_OF_ENCHANT_SKILL_WAS_SUCCESSFUL_CURRENT_LEVEL_OF_ENCHANT_SKILL_S1_BECAME_0_AND_ENCHANT_SKILL_WILL_BE_INITIALIZED); } else { - enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); sm = new SystemMessage(SystemMessageId.UNTRAIN_OF_ENCHANT_SKILL_WAS_SUCCESSFUL_CURRENT_LEVEL_OF_ENCHANT_SKILL_S1_HAS_BEEN_DECREASED_BY_1); } player.removeSkill(enchantedSkill); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index 34f058025f..e5fc7fbe84 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -36,7 +36,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -46,12 +46,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket if (level < 100) { _skillLevel = level; - _skillSubLevel = 0; + _skillSubLevel = 0; } else { _skillLevel = client.getPlayer().getKnownSkill(_skillId).getLevel(); - _skillSubLevel = SkillEnchantConverter.levelToUnderground(level); + _skillSubLevel = SkillEnchantConverter.levelToUnderground(level); } return true; } @@ -59,7 +59,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -75,7 +75,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -87,12 +87,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 9445cdd4bc..5355d00a0c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -31,7 +31,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -42,12 +42,12 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket if (level < 100) { _skillLevel = level; - _skillSubLevel = 0; + _skillSubLevel = 0; } else { _skillLevel = client.getPlayer().getKnownSkill(_skillId).getLevel(); - _skillSubLevel = SkillEnchantConverter.levelToUnderground(level); + _skillSubLevel = SkillEnchantConverter.levelToUnderground(level); } return true; } @@ -55,7 +55,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,6 +65,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index bdd4a4748c..42c5810736 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -29,14 +29,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -47,9 +47,9 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); - packet.writeD(_skillSubLevel > 1000 ? SkillEnchantConverter.levelToErtheia(_skillSubLevel ) : _skillLevel); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeD(_skillSubLevel > 1000 ? SkillEnchantConverter.levelToErtheia(_skillSubLevel) : _skillLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index cbf41b9811..ed214a9606 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,12 +34,12 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final int _skillLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; - _skillLevel = skillSubLevel > 1000 ? SkillEnchantConverter.levelToErtheia(skillSubLevel ) : skillLevel; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillLevel = skillSubLevel > 1000 ? SkillEnchantConverter.levelToErtheia(skillSubLevel) : skillLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 7476b0028f..aeec8b4806 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4852f0c3e0..2d940fefef 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1583,11 +1583,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7260,7 +7260,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 7476b0028f..aeec8b4806 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 07fe75fdd4..47312e978a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1585,11 +1585,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7262,7 +7262,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 7476b0028f..aeec8b4806 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a0658130a7..c47778797e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1595,11 +1595,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7257,7 +7257,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 7476b0028f..aeec8b4806 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 09552cbca2..018a6f9089 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1588,11 +1588,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7236,7 +7236,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 3c0eaddf2e..4d10c47182 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index fa378dbde0..fd7dba90f1 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1588,11 +1588,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7236,7 +7236,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 3c0eaddf2e..4d10c47182 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 91b2500bcc..51e7aff3f5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1588,11 +1588,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7237,7 +7237,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 3c0eaddf2e..4d10c47182 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -474,7 +474,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 970b430adb..1fef5c1d87 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1607,11 +1607,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7252,7 +7252,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2dad8efb2b..9951020fdb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1556,11 +1556,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7224,7 +7224,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 122b9fb211..4d53a0e436 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1556,11 +1556,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7224,7 +7224,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d247593e8f..d7bf140f25 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1554,11 +1554,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7210,7 +7210,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9aceae77aa..635ca58db8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1564,11 +1564,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7237,7 +7237,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4c981cb547..1729fa5931 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1564,11 +1564,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7237,7 +7237,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7dedcbc30b..08cea9635c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1584,11 +1584,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7187,7 +7187,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 12bc10230d..f02c008d3a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -48,7 +48,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -63,14 +63,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -125,7 +125,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -133,14 +133,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -177,7 +177,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -216,7 +216,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index 26ee67473f..cd29841f17 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -34,21 +34,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -64,7 +64,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket // return; // } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -76,12 +76,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index b38e102568..aeb3d1def4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -469,7 +469,7 @@ public class FeedableBeasts extends AbstractNpcAI { _feedInfo.remove(npc.getObjectId()); } - + // spawn the new mob final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index f26e001401..dabe2b2dbc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -59,7 +59,7 @@ public class CallSkill extends AbstractEffect final int knownLevel = effector.getSkillLevel(_skill.getSkillId()); if (knownLevel > 0) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel ()); + triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), knownLevel, _skill.getSkillSubLevel()); } else { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java index cea946aaf0..8cf01b5f4f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -219,16 +219,16 @@ public class ShortCuts implements IRestorable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public synchronized void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { // Update all the shortcuts for this skill for (Shortcut sc : _shortCuts.values()) { if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) { - final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel , 1); + final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1); _owner.sendPacket(new ShortCutRegister(newsc)); _owner.registerShortCut(newsc); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java index 594ed5d659..8c232969e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -121,7 +121,7 @@ public class TimeStamp * Gets the skill sub level. * @return the skill level */ - public int getSkillSubLevel () + public int getSkillSubLevel() { return _id3; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6e57943e39..c312e02ba2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1558,11 +1558,11 @@ public class PlayerInstance extends Playable * Updates the shortcut bars with the new skill. * @param skillId the skill Id to search and update. * @param skillLevel the skill level to update. - * @param skillSubLevel the skill sub level to update. + * @param skillSubLevel the skill sub level to update. */ - public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel ) + public void updateShortCuts(int skillId, int skillLevel, int skillSubLevel) { - _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel ); + _shortCuts.updateShortCuts(skillId, skillLevel, skillSubLevel); } /** @@ -7226,7 +7226,7 @@ public class PlayerInstance extends Playable statement.setInt(1, getObjectId()); statement.setInt(2, t.getSkillId()); statement.setInt(3, t.getSkillLevel()); - statement.setInt(4, t.getSkillSubLevel ()); + statement.setInt(4, t.getSkillSubLevel()); statement.setInt(5, -1); statement.setLong(6, t.getReuse()); statement.setDouble(7, t.getStamp()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java index 4b694d9cc1..a9c752fa96 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/announce/AnnouncementType.java @@ -29,6 +29,7 @@ public enum AnnouncementType EVENT, AUTO_NORMAL, AUTO_CRITICAL; + private static final Logger LOGGER = Logger.getLogger(AnnouncementType.class.getName()); public static AnnouncementType findById(int id) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java index 5fa05bfba7..99118cb6bf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillHolder.java @@ -27,22 +27,22 @@ public class SkillHolder { private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private Skill _skill; public SkillHolder(int skillId, int skillLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = 0; + _skillSubLevel = 0; _skill = null; } - public SkillHolder(int skillId, int skillLevel, int skillSubLevel ) + public SkillHolder(int skillId, int skillLevel, int skillSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _skill = null; } @@ -50,7 +50,7 @@ public class SkillHolder { _skillId = skill.getId(); _skillLevel = skill.getLevel(); - _skillSubLevel = skill.getSubLevel(); + _skillSubLevel = skill.getSubLevel(); _skill = skill; } @@ -64,16 +64,16 @@ public class SkillHolder return _skillLevel; } - public int getSkillSubLevel () + public int getSkillSubLevel() { - return _skillSubLevel ; + return _skillSubLevel; } public Skill getSkill() { if (_skill == null) { - _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel ); + _skill = SkillData.getInstance().getSkill(_skillId, Math.max(_skillLevel, 1), _skillSubLevel); } return _skill; } @@ -92,7 +92,7 @@ public class SkillHolder } final SkillHolder holder = (SkillHolder) obj; - return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel () == _skillSubLevel ); + return (holder.getSkillId() == _skillId) && (holder.getSkillLevel() == _skillLevel) && (holder.getSkillSubLevel() == _skillSubLevel); } @Override @@ -102,7 +102,7 @@ public class SkillHolder int result = 1; result = (prime * result) + _skillId; result = (prime * result) + _skillLevel; - result = (prime * result) + _skillSubLevel ; + result = (prime * result) + _skillSubLevel; return result; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java index dfb28e9c9f..de1c3cbf58 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDispel.java @@ -33,7 +33,7 @@ public class RequestDispel implements IClientIncomingPacket private int _objectId; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -41,7 +41,7 @@ public class RequestDispel implements IClientIncomingPacket _objectId = packet.readD(); _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @@ -57,7 +57,7 @@ public class RequestDispel implements IClientIncomingPacket { return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (skill == null) { return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 8475c20e4e..83f87c6a40 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -49,7 +49,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -64,14 +64,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket _type = SkillEnchantType.values()[type]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -127,7 +127,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (_type == SkillEnchantType.CHANGE) { - final int group1 = (_skillSubLevel % 1000); + final int group1 = (_skillSubLevel % 1000); final int group2 = (skill.getSubLevel() % 1000); if (group1 != group2) { @@ -135,14 +135,14 @@ public class RequestExEnchantSkill implements IClientIncomingPacket return; } } - else if ((skill.getSubLevel() + 1) != _skillSubLevel ) + else if ((skill.getSubLevel() + 1) != _skillSubLevel) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Client: " + client + " send incorrect sub level: " + _skillSubLevel + " expected: " + (skill.getSubLevel() + 1)); return; } } - final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); + final EnchantSkillHolder enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(_skillSubLevel % 1000); // Verify if player has all the ingredients for (ItemHolder holder : enchantSkillHolder.getRequiredItems(_type)) @@ -179,7 +179,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.log(Level.INFO, "Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); @@ -218,7 +218,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket { if (Rnd.get(100) <= enchantSkillHolder.getChance(_type)) { - final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill enchantedSkill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if (Config.LOG_SKILL_ENCHANTS) { LOGGER_ENCHANT.info("Success, Character:" + player.getName() + " [" + player.getObjectId() + "] Account:" + player.getAccountName() + " IP:" + player.getIPAddress() + ", +" + enchantedSkill.getLevel() + " " + enchantedSkill.getSubLevel() + " - " + enchantedSkill.getName() + " (" + enchantedSkill.getId() + "), " + enchantSkillHolder.getChance(_type)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index a43465ad85..0dc78ed1a8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -35,21 +35,21 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket { private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) { _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -65,7 +65,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket return; } - final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel ); + final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel); if ((skill == null) || (skill.getId() != _skillId)) { return; @@ -77,12 +77,12 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket } final Skill playerSkill = player.getKnownSkill(_skillId); - if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel )) + if ((playerSkill.getLevel() != _skillLevel) || (playerSkill.getSubLevel() != _skillSubLevel)) { return; } - client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel , playerSkill.getSubLevel())); + client.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLevel, _skillSubLevel, playerSkill.getSubLevel())); // ExEnchantSkillInfoDetail - not really necessary I think // client.sendPacket(new ExEnchantSkillInfoDetail(SkillEnchantType.NORMAL, _skillId, _skillLevel, _skillSubLevel , activeChar)); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java index 4bd4f598ff..758b6406d6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java @@ -30,7 +30,7 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket private SkillEnchantType _type; private int _skillId; private int _skillLevel; - private int _skillSubLevel ; + private int _skillSubLevel; @Override public boolean read(GameClient client, PacketReader packet) @@ -38,14 +38,14 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket _type = SkillEnchantType.values()[packet.readD()]; _skillId = packet.readD(); _skillLevel = packet.readH(); - _skillSubLevel = packet.readH(); + _skillSubLevel = packet.readH(); return true; } @Override public void run(GameClient client) { - if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) + if ((_skillId <= 0) || (_skillLevel <= 0) || (_skillSubLevel < 0)) { return; } @@ -55,6 +55,6 @@ public class RequestExEnchantSkillInfoDetail implements IClientIncomingPacket { return; } - player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel , player)); + player.sendPacket(new ExEnchantSkillInfoDetail(_type, _skillId, _skillLevel, _skillSubLevel, player)); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 92bbedbb39..376f98aa0e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,14 +28,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _currentSubLevel; - public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel , int currentSubLevel) + public ExEnchantSkillInfo(int skillId, int skillLevel, int skillSubLevel, int currentSubLevel) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _currentSubLevel = currentSubLevel; _routes = EnchantSkillGroupsData.getInstance().getRouteForSkill(_skillId, _skillLevel); } @@ -46,14 +46,14 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); - packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); - packet.writeD(_skillSubLevel > 1000 ? 1 : 0); + packet.writeH(_skillSubLevel); + packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); + packet.writeD(_skillSubLevel > 1000 ? 1 : 0); packet.writeD(_routes.size()); _routes.forEach(route -> { final int routeId = route / 1000; - final int currentRouteId = _skillSubLevel / 1000; + final int currentRouteId = _skillSubLevel / 1000; final int subLevel = _currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route; packet.writeH(_skillLevel); packet.writeH(currentRouteId != routeId ? subLevel : Math.min(subLevel + 1, route + (EnchantSkillGroupsData.MAX_ENCHANT_LEVEL - 1))); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 69109ff793..2f008f4d22 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -34,16 +34,16 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket private final SkillEnchantType _type; private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final EnchantSkillHolder _enchantSkillHolder; - public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel , PlayerInstance player) + public ExEnchantSkillInfoDetail(SkillEnchantType type, int skillId, int skillLevel, int skillSubLevel, PlayerInstance player) { _type = type; _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; - _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); + _skillSubLevel = skillSubLevel; + _enchantSkillHolder = EnchantSkillGroupsData.getInstance().getEnchantSkillHolder(skillSubLevel % 1000); } @Override @@ -54,7 +54,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); if (_enchantSkillHolder != null) { packet.writeQ(_enchantSkillHolder.getSp(_type)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 5de9a08b7b..298301ed0d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -25,14 +25,14 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket private final int _skillId; private final int _skillLevel; - private final int _skillSubLevel ; + private final int _skillSubLevel; private final int _duration; - public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel , int duration) + public ShortBuffStatusUpdate(int skillId, int skillLevel, int skillSubLevel, int duration) { _skillId = skillId; _skillLevel = skillLevel; - _skillSubLevel = skillSubLevel ; + _skillSubLevel = skillSubLevel; _duration = duration; } @@ -43,7 +43,7 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket packet.writeD(_skillId); packet.writeH(_skillLevel); - packet.writeH(_skillSubLevel ); + packet.writeH(_skillSubLevel); packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 90c564259c..675c2ec681 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -39,7 +39,7 @@ public class SkillCoolTime implements IClientOutgoingPacket _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { - if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel ()).isNotBroadcastable()) + if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) { _skillReuseTimeStamps.add(ts); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index 8750f2e4ad..fb735b8925 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -43,6 +43,7 @@ public class ExBRBuyProduct implements IClientOutgoingPacket NOT_DAY_OF_WEEK(-12), NOT_TIME_OF_DAY(-13), SOLD_OUT(-14); + private final int _id; ExBrProductReplyType(int id)