Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P Lisvus_GameServer
- Index: java/net/sf/l2j/gameserver/model/L2Object.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2Object.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2Object.java (copia de trabajo)
- @@ -334,7 +334,8 @@
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- return "" + getObjectId();
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2CabaleBufferInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2CabaleBufferInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2CabaleBufferInstance.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- */
- public class L2CabaleBufferInstance extends L2NpcInstance
- {
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- return;
- @@ -83,7 +84,8 @@
- _caster = caster;
- }
- - public void run()
- + @Override
- + public void run()
- {
- boolean isBuffAWinner = false;
- boolean isBuffALoser = false;
- @@ -194,7 +196,8 @@
- aiTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new CabalaAI(this), 3000, 3000);
- }
- - public void deleteMe()
- + @Override
- + public void deleteMe()
- {
- if (aiTask != null)
- {
- @@ -205,12 +208,14 @@
- super.deleteMe();
- }
- - public int getDistanceToWatchObject(L2Object object)
- + @Override
- + public int getDistanceToWatchObject(L2Object object)
- {
- return 900;
- }
- - public boolean isAutoAttackable(L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(L2Character attacker)
- {
- return false;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTarget.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTarget.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTarget.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- private static String[] _adminCommands = {"admin_target"};
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -47,7 +48,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/instancemanager/DimensionalRiftManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/instancemanager/DimensionalRiftManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/instancemanager/DimensionalRiftManager.java (copia de trabajo)
- @@ -21,7 +21,6 @@
- import java.awt.Polygon;
- import java.awt.Shape;
- import java.io.File;
- -import java.io.IOException;
- import java.sql.Connection;
- import java.sql.PreparedStatement;
- import java.sql.ResultSet;
- @@ -43,7 +42,6 @@
- import net.sf.l2j.gameserver.model.L2Spawn;
- import net.sf.l2j.gameserver.model.actor.instance.L2NpcInstance;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- -import net.sf.l2j.gameserver.model.actor.instance.L2RiftInvaderInstance;
- import net.sf.l2j.gameserver.model.entity.DimensionalRift;
- import net.sf.l2j.gameserver.model.entity.TvTEvent;
- import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectMute.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectMute.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectMute.java (copia de trabajo)
- @@ -28,14 +28,17 @@
- }
- + @Override
- public EffectType getEffectType() {
- return L2Effect.EffectType.MUTE;
- }
- + @Override
- public void onStart() {
- getEffected().startMuted();
- }
- + @Override
- public boolean onActionTime() {
- // Simply stop the effect
- getEffected().stopMuted(this);
- @@ -43,6 +46,7 @@
- }
- + @Override
- public void onExit() {
- getEffected().stopMuted(this);
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBanChat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBanChat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBanChat.java (copia de trabajo)
- @@ -45,6 +45,7 @@
- private static String[] _adminCommands = {"admin_banchat", "admin_unbanchat"};
- private static final int REQUIRED_LEVEL = Config.GM_BAN_CHAT;
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -110,6 +111,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- @@ -131,6 +133,7 @@
- _banner = banner;
- }
- + @Override
- public void run()
- {
- _player.setChatBanned(false);
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectCombatPointHealOverTime.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectCombatPointHealOverTime.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectCombatPointHealOverTime.java (copia de trabajo)
- @@ -29,12 +29,14 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.COMBAT_POINT_HEAL_OVER_TIME;
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- if(getEffected().isDead())
- return false;
- Index: java/net/sf/l2j/gameserver/script/ScriptPackage.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/ScriptPackage.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/ScriptPackage.java (copia de trabajo)
- @@ -95,7 +95,8 @@
- return name;
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- if (getScriptFiles().isEmpty() && getOtherFiles().isEmpty())
- return "Empty Package.";
- Index: java/net/sf/l2j/gameserver/taskmanager/AutoAnnounceTaskManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/AutoAnnounceTaskManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/AutoAnnounceTaskManager.java (copia de trabajo)
- @@ -123,7 +123,8 @@
- _stopped = true;
- }
- - public void run()
- + @Override
- + public void run()
- {
- for (String text : _memo)
- announce(text);
- Index: java/net/sf/l2j/gameserver/ai/L2SiegeGuardAI.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/ai/L2SiegeGuardAI.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/ai/L2SiegeGuardAI.java (copia de trabajo)
- @@ -86,7 +86,8 @@
- attackRange = ((L2Attackable) _actor).getPhysicalAttackRange();
- }
- - public void run()
- + @Override
- + public void run()
- {
- // Launch actions corresponding to the Event Think
- onEvtThink();
- @@ -172,7 +173,8 @@
- * @param arg1 The second parameter of the Intention
- *
- */
- - synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
- + @Override
- + synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
- {
- if (Config.DEBUG)
- _log.info("L2SiegeAI.changeIntention(" + intention + ", " + arg0 + ", " + arg1 + ")");
- @@ -223,7 +225,8 @@
- * @param target The L2Character to attack
- *
- */
- - protected void onIntentionAttack(L2Character target)
- + @Override
- + protected void onIntentionAttack(L2Character target)
- {
- // Calculate the attack timeout
- _attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getGameTicks();
- @@ -687,7 +690,8 @@
- /**
- * Manage AI thinking actions of a L2Attackable.<BR><BR>
- */
- - protected void onEvtThink()
- + @Override
- + protected void onEvtThink()
- {
- // Check if the actor can't use skills and if a thinking action isn't already in progress
- if (thinking || _actor.isAllSkillsDisabled()) return;
- @@ -719,7 +723,8 @@
- * @param attacker The L2Character that attacks the actor
- *
- */
- - protected void onEvtAttacked(L2Character attacker)
- + @Override
- + protected void onEvtAttacked(L2Character attacker)
- {
- if (attacker == null)
- return;
- @@ -756,7 +761,8 @@
- * @param aggro The value of hate to add to the actor against the target
- *
- */
- - protected void onEvtAggression(L2Character target, int aggro)
- + @Override
- + protected void onEvtAggression(L2Character target, int aggro)
- {
- if (_actor == null)
- return;
- @@ -824,7 +830,8 @@
- }
- }
- - protected void onEvtDead()
- + @Override
- + protected void onEvtDead()
- {
- stopAITask();
- super.onEvtDead();
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java (copia de trabajo)
- @@ -73,6 +73,7 @@
- private static L2Skill[] adminSkills;
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -214,7 +215,8 @@
- }
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/templates/L2Item.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/templates/L2Item.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/templates/L2Item.java (copia de trabajo)
- @@ -561,6 +561,7 @@
- * Returns the name of the item
- * @return String
- */
- + @Override
- public String toString()
- {
- return _name;
- Index: java/net/sf/l2j/gameserver/skills/funcs/FuncSub.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/FuncSub.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/FuncSub.java (copia de trabajo)
- @@ -29,6 +29,7 @@
- super(stat, order, owner);
- _lambda = lambda;
- }
- + @Override
- public void calc(Env env)
- {
- if (_cond == null || _cond.test(env))
- Index: java/net/sf/l2j/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/SetPrivateStoreListBuy.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/SetPrivateStoreListBuy.java (copia de trabajo)
- @@ -19,6 +19,7 @@
- package net.sf.l2j.gameserver.network.clientpackets;
- import net.sf.l2j.Config;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.TradeList;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
- @@ -87,7 +88,7 @@
- return;
- }
- - if (player.isInsideZone(L2PcInstance.ZONE_NOSTORE))
- + if (player.isInsideZone(L2Character.ZONE_NOSTORE))
- {
- player.sendPacket(new PrivateStoreManageListBuy(player));
- player.sendPacket(new SystemMessage(SystemMessage.NO_PRIVATE_STORE_HERE));
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java (copia de trabajo)
- @@ -31,7 +31,8 @@
- private static String[] _adminCommands = {"admin_kick" ,"admin_kick_non_gm"};
- private static final int REQUIRED_LEVEL = Config.GM_KICK;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -74,7 +75,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectMpConsumePerLevel.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectMpConsumePerLevel.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectMpConsumePerLevel.java (copia de trabajo)
- @@ -29,11 +29,13 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.MP_CONSUME_PER_LEVEL;
- }
- + @Override
- public boolean onActionTime()
- {
- if (getEffected().isDead())
- Index: java/net/sf/l2j/ItemLogFormatter.java
- ===================================================================
- --- java/net/sf/l2j/ItemLogFormatter.java (revisión: 598)
- +++ java/net/sf/l2j/ItemLogFormatter.java (copia de trabajo)
- @@ -36,6 +36,7 @@
- private static final String CRLF = "\r\n";
- private SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
- + @Override
- public String format(LogRecord record)
- {
- TextBuilder output = new TextBuilder();
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectBluff.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectBluff.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectBluff.java (copia de trabajo)
- @@ -40,12 +40,14 @@
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.BLUFF;
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- if (getEffected() instanceof L2FolkInstance)
- return;
- @@ -73,7 +75,8 @@
- * @see net.sf.l2j.gameserver.model.L2Effect#onActionTime()
- */
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- return false;
- }
- Index: java/net/sf/l2j/gameserver/model/AutoChatHandler.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/AutoChatHandler.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/AutoChatHandler.java (copia de trabajo)
- @@ -234,7 +234,8 @@
- * If an auto chat instance is set to be "global", all instances matching the registered
- * NPC ID will be added to that chat instance.
- */
- - public void npcSpawned(L2NpcInstance npc)
- + @Override
- + public void npcSpawned(L2NpcInstance npc)
- {
- synchronized (_registeredChats)
- {
- @@ -653,7 +654,8 @@
- objectId = pObjectId;
- }
- - public synchronized void run()
- + @Override
- + public synchronized void run()
- {
- AutoChatInstance chatInst = _registeredChats.get(npcId);
- Index: java/net/sf/l2j/ErrorFilter.java
- ===================================================================
- --- java/net/sf/l2j/ErrorFilter.java (revisión: 598)
- +++ java/net/sf/l2j/ErrorFilter.java (copia de trabajo)
- @@ -23,6 +23,7 @@
- public class ErrorFilter implements Filter
- {
- + @Override
- public boolean isLoggable(LogRecord record)
- {
- return record.getThrown() != null;
- Index: java/net/sf/l2j/gameserver/communitybbs/Manager/ClanBBSManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/communitybbs/Manager/ClanBBSManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/communitybbs/Manager/ClanBBSManager.java (copia de trabajo)
- @@ -43,6 +43,7 @@
- * @param command
- * @param activeChar
- */
- + @Override
- public void parsecmd(String command, L2PcInstance activeChar)
- {
- if (command.equals("_bbsclan"))
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetAggro.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetAggro.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetAggro.java (copia de trabajo)
- @@ -38,6 +38,7 @@
- _isAggro = isAggro;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- L2Character target = env.target;
- Index: java/net/sf/l2j/gameserver/model/L2Clan.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2Clan.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2Clan.java (copia de trabajo)
- @@ -670,6 +670,7 @@
- }
- }
- + @Override
- public String toString()
- {
- return getName();
- @@ -907,7 +908,7 @@
- return;
- }
- - if (player.isInsideZone(L2PcInstance.ZONE_SIEGE))
- + if (player.isInsideZone(L2Character.ZONE_SIEGE))
- {
- player.sendPacket(new SystemMessage(SystemMessage.CANNOT_DISSOLVE_ALLY_WHILE_IN_SIEGE));
- return;
- @@ -1106,7 +1107,7 @@
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_SIEGE) && target.isInsideZone(L2PcInstance.ZONE_SIEGE))
- + if (activeChar.isInsideZone(L2Character.ZONE_SIEGE) && target.isInsideZone(L2Character.ZONE_SIEGE))
- {
- activeChar.sendPacket(new SystemMessage(SystemMessage.OPPOSING_CLAN_IS_PARTICIPATING_IN_SIEGE));
- return false;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminUnblockIp.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminUnblockIp.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminUnblockIp.java (copia de trabajo)
- @@ -23,7 +23,6 @@
- import net.sf.l2j.Config;
- import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- -import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
- /**
- * This class handles following admin commands:
- @@ -47,7 +46,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -71,7 +71,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/script/faenor/FaenorQuestParser.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/faenor/FaenorQuestParser.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/faenor/FaenorQuestParser.java (copia de trabajo)
- @@ -32,7 +32,8 @@
- */
- public class FaenorQuestParser extends FaenorParser
- {
- - public void parseScript(Node questNode, ScriptContext context)
- + @Override
- + public void parseScript(Node questNode, ScriptContext context)
- {
- if (DEBUG) System.out.println("Parsing Quest.");
- @@ -101,7 +102,8 @@
- static class FaenorQuestParserFactory extends ParserFactory
- {
- - public Parser create()
- + @Override
- + public Parser create()
- {
- return(new FaenorQuestParser());
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShutdown.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShutdown.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShutdown.java (copia de trabajo)
- @@ -45,6 +45,7 @@
- private static String[] _adminCommands = {"admin_server_shutdown", "admin_server_restart", "admin_server_abort"};
- private static final int REQUIRED_LEVEL = Config.GM_RESTART;
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -83,6 +84,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/SummonItems.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/SummonItems.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/SummonItems.java (copia de trabajo)
- @@ -48,7 +48,8 @@
- */
- public class SummonItems implements IItemHandler
- {
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -165,7 +166,8 @@
- _petSummon = petSummon;
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -191,7 +193,8 @@
- _item = item;
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -281,7 +284,8 @@
- }
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return SummonItemsData.getInstance().itemIDs();
- }
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionSlotItemType.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionSlotItemType.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionSlotItemType.java (copia de trabajo)
- @@ -39,6 +39,7 @@
- _mask = mask;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (!(env.player instanceof L2PcInstance))
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetBodyPart.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetBodyPart.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetBodyPart.java (copia de trabajo)
- @@ -38,7 +38,8 @@
- armor = pArmor;
- }
- - public boolean testImpl(Env env)
- + @Override
- + public boolean testImpl(Env env)
- {
- // target is attacker
- if (env.target == null) return true;
- Index: java/net/sf/l2j/status/Status.java
- ===================================================================
- --- java/net/sf/l2j/status/Status.java (revisión: 598)
- +++ java/net/sf/l2j/status/Status.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- private int _mode;
- private List<LoginStatusThread> _loginStatus;
- - public void run()
- + @Override
- + public void run()
- {
- setPriority(Thread.MAX_PRIORITY);
- while (true)
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2ArtefactInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2ArtefactInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2ArtefactInstance.java (copia de trabajo)
- @@ -51,13 +51,15 @@
- /**
- * Return False.<BR><BR>
- */
- - @SuppressWarnings("unused")
- + @Override
- + @SuppressWarnings("unused")
- public boolean isAutoAttackable(L2Character attacker)
- {
- return false;
- }
- - public boolean isAttackable()
- + @Override
- + public boolean isAttackable()
- {
- return false;
- }
- @@ -77,7 +79,8 @@
- * @param player The L2PcInstance that start an action on the L2ArtefactInstance
- *
- */
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- return;
- @@ -116,7 +119,8 @@
- player.sendPacket(new ActionFailed());
- }
- - public void reduceCurrentHp(double damage, L2Character attacker){}
- + @Override
- + public void reduceCurrentHp(double damage, L2Character attacker){}
- public void reduceCurrentHp(double damage, L2Character attacker, boolean awake){}
- }
- Index: java/net/sf/l2j/ItemFilter.java
- ===================================================================
- --- java/net/sf/l2j/ItemFilter.java (revisión: 598)
- +++ java/net/sf/l2j/ItemFilter.java (copia de trabajo)
- @@ -33,7 +33,8 @@
- private String _excludeProcess = "Consume";
- private String _excludeItemType = "Arrow, Shot";
- - public boolean isLoggable(LogRecord record)
- + @Override
- + public boolean isLoggable(LogRecord record)
- {
- if (!record.getLoggerName().equals("item"))
- return false;
- Index: java/net/sf/l2j/AuditFormatter.java
- ===================================================================
- --- java/net/sf/l2j/AuditFormatter.java (revisión: 598)
- +++ java/net/sf/l2j/AuditFormatter.java (copia de trabajo)
- @@ -34,6 +34,7 @@
- private static final String CRLF = "\r\n";
- private SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
- + @Override
- public String format(LogRecord record)
- {
- TextBuilder output = new TextBuilder();
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDelete.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDelete.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDelete.java (copia de trabajo)
- @@ -41,7 +41,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_NPC_EDIT;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -55,7 +56,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectConfuseMob.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectConfuseMob.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectConfuseMob.java (copia de trabajo)
- @@ -43,13 +43,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.CONFUSE_MOB_ONLY;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().startConfused();
- onActionTime();
- @@ -56,12 +58,14 @@
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopConfused(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- List<L2Character> targetList = new FastList<>();
- Index: java/net/sf/l2j/gameserver/templates/L2EtcItem.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/templates/L2EtcItem.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/templates/L2EtcItem.java (copia de trabajo)
- @@ -40,6 +40,7 @@
- * Returns the type of Etc Item
- * @return L2EtcItemType
- */
- + @Override
- public L2EtcItemType getItemType()
- {
- return (L2EtcItemType)super._type;
- @@ -49,7 +50,8 @@
- * Returns if the item is consumable
- * @return boolean
- */
- - public final boolean isConsumable()
- + @Override
- + public final boolean isConsumable()
- {
- return ((getItemType() == L2EtcItemType.SHOT) || (getItemType() == L2EtcItemType.POTION)); // || (type == L2EtcItemType.SCROLL));
- }
- @@ -58,6 +60,7 @@
- * Returns the ID of the Etc item after applying the mask.
- * @return int : ID of the EtcItem
- */
- + @Override
- public int getItemMask()
- {
- return getItemType().mask();
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectRemoveTarget.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectRemoveTarget.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectRemoveTarget.java (copia de trabajo)
- @@ -33,13 +33,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.REMOVE_TARGET;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().setTarget(null);
- getEffected().abortAttack();
- @@ -48,12 +50,14 @@
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- //nothing
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- return false;
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectStun.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectStun.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectStun.java (copia de trabajo)
- @@ -34,6 +34,7 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.STUN;
- @@ -40,16 +41,19 @@
- }
- /** Notify started */
- + @Override
- public void onStart() {
- getEffected().startStunning();
- }
- /** Notify exited */
- + @Override
- public void onExit() {
- getEffected().stopStunning(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- // just stop this effect
- return false;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminChangeAccessLevel.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminChangeAccessLevel.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminChangeAccessLevel.java (copia de trabajo)
- @@ -42,7 +42,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_ACCESSLEVEL;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -56,7 +57,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeFlagInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeFlagInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeFlagInstance.java (copia de trabajo)
- @@ -57,7 +57,8 @@
- }
- }
- - public boolean isAttackable()
- + @Override
- + public boolean isAttackable()
- {
- // Attackable during siege by attacker only
- return (getCastle() != null
- @@ -65,7 +66,8 @@
- && getCastle().getSiege().getIsInProgress());
- }
- - public boolean isAutoAttackable(L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(L2Character attacker)
- {
- // Attackable during siege by attacker only
- return (attacker != null
- @@ -75,7 +77,8 @@
- && getCastle().getSiege().getIsInProgress());
- }
- - public boolean doDie(L2Character killer)
- + @Override
- + public boolean doDie(L2Character killer)
- {
- if (!super.doDie(killer))
- return false;
- @@ -86,12 +89,14 @@
- return true;
- }
- - public void onForcedAttack(L2PcInstance player)
- + @Override
- + public void onForcedAttack(L2PcInstance player)
- {
- onAction(player);
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (player == null || !canTarget(player))
- return;
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/Harvester.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/Harvester.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/Harvester.java (copia de trabajo)
- @@ -35,7 +35,8 @@
- L2PcInstance _activeChar;
- L2MonsterInstance _target;
- - public void useItem(L2PlayableInstance playable, L2ItemInstance _item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance _item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -64,7 +65,8 @@
- _activeChar.useMagic(skill, false, false);
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectManaHealOverTime.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectManaHealOverTime.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectManaHealOverTime.java (copia de trabajo)
- @@ -29,11 +29,13 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.MANA_HEAL_OVER_TIME;
- }
- + @Override
- public boolean onActionTime()
- {
- if(getEffected().isDead())
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java (copia de trabajo)
- @@ -51,7 +51,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_CHAR_EDIT;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -100,6 +101,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList() {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLogin.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLogin.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLogin.java (copia de trabajo)
- @@ -47,6 +47,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -165,6 +166,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
- */
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/idfactory/BitSetIDFactory.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/idfactory/BitSetIDFactory.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/idfactory/BitSetIDFactory.java (copia de trabajo)
- @@ -44,7 +44,8 @@
- /* (non-Javadoc)
- * @see java.lang.Runnable#run()
- */
- - public void run()
- + @Override
- + public void run()
- {
- if (reachingBitSetCapacity())
- {
- @@ -93,7 +94,8 @@
- }
- }
- - public synchronized void releaseId(int objectID)
- + @Override
- + public synchronized void releaseId(int objectID)
- {
- if ((objectID - FIRST_OID) > -1)
- {
- @@ -103,7 +105,8 @@
- _log.warning("BitSet ID Factory: release objectID "+objectID+" failed (< "+FIRST_OID+")");
- }
- - public synchronized int getNextId()
- + @Override
- + public synchronized int getNextId()
- {
- int newID = nextFreeId.get();
- freeIds.set(newID);
- @@ -132,7 +135,8 @@
- return newID + FIRST_OID;
- }
- - public synchronized int size()
- + @Override
- + public synchronized int size()
- {
- return freeIdCount.get();
- }
- Index: java/net/sf/l2j/gameserver/model/L2ItemInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2ItemInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2ItemInstance.java (copia de trabajo)
- @@ -605,6 +605,7 @@
- * @see net.sf.l2j.gameserver.model.L2Object#onAction(net.sf.l2j.gameserver.model.L2PcInstance)
- * also check constraints: only soloing castle owners may pick up mercenary tickets of their castle
- */
- + @Override
- public void onAction(L2PcInstance player)
- {
- // this causes the validate position handler to do the pickup if the location is reached.
- @@ -663,7 +664,8 @@
- * Returns false cause item can't be attacked
- * @return boolean false
- */
- - public boolean isAutoAttackable(@SuppressWarnings("unused") L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(@SuppressWarnings("unused") L2Character attacker)
- {
- return false;
- }
- @@ -986,6 +988,7 @@
- * Returns the item in String format
- * @return String
- */
- + @Override
- public String toString()
- {
- return ""+_item;
- @@ -1060,7 +1063,8 @@
- ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- restoreInitCount();
- dataTimerSave();
- Index: java/net/sf/l2j/gameserver/templates/L2ArmorType.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/templates/L2ArmorType.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/templates/L2ArmorType.java (copia de trabajo)
- @@ -57,6 +57,7 @@
- * Returns the name of the ArmorType
- * @return String
- */
- + @Override
- public String toString()
- {
- return _name;
- Index: java/net/sf/l2j/gameserver/cache/CrestCache.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/cache/CrestCache.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/cache/CrestCache.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- import net.sf.l2j.L2DatabaseFactory;
- import net.sf.l2j.gameserver.datatables.ClanTable;
- import net.sf.l2j.gameserver.idfactory.BitSetIDFactory;
- +import net.sf.l2j.gameserver.idfactory.IdFactory;
- import net.sf.l2j.gameserver.model.L2Clan;
- /**
- @@ -137,7 +138,7 @@
- _log.info("Found old crest file \"" + file.getName() + "\" for clanId " + clanId);
- - int newId = BitSetIDFactory.getInstance().getNextId();
- + int newId = IdFactory.getInstance().getNextId();
- L2Clan clan = ClanTable.getInstance().getClan(clanId);
- @@ -300,7 +301,8 @@
- class BmpFilter implements FileFilter
- {
- - public boolean accept(File file)
- + @Override
- + public boolean accept(File file)
- {
- return (file.getName().endsWith(".bmp"));
- }
- @@ -308,7 +310,8 @@
- class OldPledgeFilter implements FileFilter
- {
- - public boolean accept(File file)
- + @Override
- + public boolean accept(File file)
- {
- return (file.getName().startsWith("Pledge_"));
- }
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/OlympiadStat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/OlympiadStat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/OlympiadStat.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (COMMAND_IDS[0] != id)
- return false;
- @@ -51,7 +52,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2MercManagerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2MercManagerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2MercManagerInstance.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- super(objectId, template);
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player)) return;
- player.setLastFolkNPC(this);
- @@ -74,7 +75,8 @@
- player.sendPacket(new ActionFailed());
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- int condition = validateCondition(player);
- if (condition <= Cond_All_False) return;
- Index: java/net/sf/l2j/gameserver/util/JarClassLoader.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/util/JarClassLoader.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/util/JarClassLoader.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- jars.add(filename);
- }
- - public Class<?> findClass(String name) throws ClassNotFoundException
- + @Override
- + public Class<?> findClass(String name) throws ClassNotFoundException
- {
- try {
- byte[] b = loadClassData(name);
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionGameTime.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionGameTime.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionGameTime.java (copia de trabajo)
- @@ -40,6 +40,7 @@
- _required = required;
- }
- + @Override
- public boolean testImpl(@SuppressWarnings("unused") Env env) {
- switch (_check)
- {
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionSlotItemId.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionSlotItemId.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionSlotItemId.java (copia de trabajo)
- @@ -41,6 +41,7 @@
- _enchantLevel = enchantLevel;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (!(env.player instanceof L2PcInstance))
- Index: java/net/sf/l2j/gameserver/cache/HtmCache.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/cache/HtmCache.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/cache/HtmCache.java (copia de trabajo)
- @@ -97,7 +97,8 @@
- class HtmFilter implements FileFilter
- {
- - public boolean accept(File file)
- + @Override
- + public boolean accept(File file)
- {
- if (!file.isDirectory())
- {
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectSilentMove.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectSilentMove.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectSilentMove.java (copia de trabajo)
- @@ -32,7 +32,8 @@
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- super.onStart();
- @@ -40,7 +41,8 @@
- ((L2PlayableInstance)getEffected()).setSilentMoving(true);
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- super.onExit();
- @@ -48,12 +50,14 @@
- ((L2PlayableInstance)getEffected()).setSilentMoving(false);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.SILENT_MOVE;
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- // Only cont skills shouldn't end
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/ClanWarsList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/ClanWarsList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/ClanWarsList.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0] && id != COMMAND_IDS[1] && id != COMMAND_IDS[2])
- @@ -119,7 +120,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectStunSelf.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectStunSelf.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectStunSelf.java (copia de trabajo)
- @@ -28,21 +28,25 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.STUN_SELF;
- }
- + @Override
- public void onStart()
- {
- getEffector().startStunning();
- }
- + @Override
- public void onExit()
- {
- getEffector().stopStunning(this);
- }
- + @Override
- public boolean onActionTime()
- {
- // just stop this effect
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetLevel.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetLevel.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetLevel.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- _level = level;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (env.target == null)
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2FestivalGuideInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2FestivalGuideInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2FestivalGuideInstance.java (copia de trabajo)
- @@ -143,7 +143,8 @@
- }
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.startsWith("FestivalDesc"))
- {
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2ControlTowerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2ControlTowerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2ControlTowerInstance.java (copia de trabajo)
- @@ -41,13 +41,15 @@
- super(objectId, template);
- }
- - public boolean isAttackable()
- + @Override
- + public boolean isAttackable()
- {
- // Attackable during siege by attacker only
- return (getCastle() != null && getCastle().getCastleId() > 0 && getCastle().getSiege().getIsInProgress());
- }
- - public boolean isAutoAttackable(L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(L2Character attacker)
- {
- // Attackable during siege by attacker only
- return (attacker != null && attacker instanceof L2PcInstance && getCastle() != null
- @@ -55,12 +57,14 @@
- && getCastle().getSiege().checkIsAttacker(((L2PcInstance)attacker).getClan()));
- }
- - public void onForcedAttack(L2PcInstance player)
- + @Override
- + public void onForcedAttack(L2PcInstance player)
- {
- onAction(player);
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- return;
- Index: java/net/sf/l2j/gameserver/instancemanager/CastleManorManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/instancemanager/CastleManorManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/instancemanager/CastleManorManager.java (copia de trabajo)
- @@ -298,7 +298,8 @@
- _log.info("Manor System: Manor refresh updated");
- _scheduledManorRefresh = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (!isDisabled())
- {
- @@ -307,7 +308,8 @@
- _scheduledMaintenanceEnd = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- _log.info("Manor System: Next period started");
- setNextPeriod();
- @@ -333,7 +335,8 @@
- _log.info("Manor System: Manor period approve updated");
- _scheduledNextPeriodapprove = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (!isDisabled())
- {
- Index: java/net/sf/l2j/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java (copia de trabajo)
- @@ -38,12 +38,14 @@
- private static final Logger _log = Logger.getLogger(TaskOlympiadSave.class.getName());
- public static final String NAME = "SevenSignsUpdate";
- - public String getName()
- + @Override
- + public String getName()
- {
- return NAME;
- }
- - public void onTimeElapsed(ExecutedTask task)
- + @Override
- + public void onTimeElapsed(ExecutedTask task)
- {
- try {
- SevenSigns.getInstance().saveSevenSignsData(null, true);
- @@ -58,7 +60,8 @@
- }
- }
- - public void initializate()
- + @Override
- + public void initializate()
- {
- super.initializate();
- TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_FIXED_SHEDULED, "1800000", "1800000", "");
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- super(objectId, template);
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- return;
- @@ -87,7 +88,8 @@
- player.sendPacket(new ActionFailed());
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (CastleManorManager.getInstance().isDisabled())
- {
- Index: java/net/sf/l2j/gameserver/model/actor/knownlist/PlayableKnownList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/knownlist/PlayableKnownList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/knownlist/PlayableKnownList.java (copia de trabajo)
- @@ -40,5 +40,6 @@
- // =========================================================
- // Property - Public
- - public L2PlayableInstance getActiveChar() { return (L2PlayableInstance)super.getActiveChar(); }
- + @Override
- + public L2PlayableInstance getActiveChar() { return (L2PlayableInstance)super.getActiveChar(); }
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEventEngine.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEventEngine.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEventEngine.java (copia de trabajo)
- @@ -45,8 +45,6 @@
- import net.sf.l2j.gameserver.network.serverpackets.ItemList;
- import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
- import net.sf.l2j.gameserver.network.serverpackets.PlaySound;
- -import net.sf.l2j.gameserver.network.serverpackets.Revive;
- -import net.sf.l2j.gameserver.network.serverpackets.SocialAction;
- import net.sf.l2j.gameserver.network.serverpackets.UserInfo;
- /**
- * This class handles following admin commands:
- @@ -80,7 +78,8 @@
- private static String tempName = "";
- private static boolean npcsDeleted = false;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -370,6 +369,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelLeave.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelLeave.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelLeave.java (copia de trabajo)
- @@ -35,7 +35,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0])
- return false;
- @@ -69,7 +70,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/skills/funcs/LambdaCalc.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/LambdaCalc.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/LambdaCalc.java (copia de trabajo)
- @@ -33,6 +33,7 @@
- {
- _funcs = new Func[0];
- }
- + @Override
- public double calc(Env env)
- {
- double saveValue = env.value;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCache.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCache.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCache.java (copia de trabajo)
- @@ -45,12 +45,14 @@
- "admin_cache_crest_fix"
- };
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- Index: java/net/sf/l2j/gameserver/model/AutoSpawnHandler.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/AutoSpawnHandler.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/AutoSpawnHandler.java (copia de trabajo)
- @@ -405,7 +405,8 @@
- _objectId = objectId;
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -535,7 +536,8 @@
- _objectId = objectId;
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectPhysicalMute.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectPhysicalMute.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectPhysicalMute.java (copia de trabajo)
- @@ -28,17 +28,20 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return L2Effect.EffectType.PHYSICAL_MUTE;
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().startPhysicalMuted();
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- // Simply stop the effect
- getEffected().stopPhysicalMuted(this);
- @@ -45,7 +48,8 @@
- return false;
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopPhysicalMuted(this);
- }
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/ClanPenalty.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/ClanPenalty.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/ClanPenalty.java (copia de trabajo)
- @@ -37,7 +37,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0])
- return false;
- @@ -105,7 +106,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionGameChance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionGameChance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionGameChance.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- _chance = chance;
- }
- - public boolean testImpl(Env env)
- + @Override
- + public boolean testImpl(Env env)
- {
- return Rnd.get(100) < _chance;
- }
- Index: java/net/sf/l2j/gameserver/taskmanager/tasks/TaskRecom.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/tasks/TaskRecom.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/tasks/TaskRecom.java (copia de trabajo)
- @@ -60,7 +60,8 @@
- _log.config("Recommendation Global Task: launched.");
- }
- - public void initializate()
- + @Override
- + public void initializate()
- {
- super.initializate();
- TaskManager.addUniqueTask(NAME,TaskTypes.TYPE_GLOBAL_TASK,"1","13:00:00","");
- Index: java/net/sf/l2j/gameserver/model/L2Radar.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2Radar.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2Radar.java (copia de trabajo)
- @@ -91,7 +91,8 @@
- _z = z;
- }
- - public boolean equals(Object obj)
- + @Override
- + public boolean equals(Object obj)
- {
- try
- {
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/EnergyStone.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/EnergyStone.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/EnergyStone.java (copia de trabajo)
- @@ -31,7 +31,8 @@
- {
- private static int[] _itemIds = { 5589 };
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- L2PcInstance activeChar = null;
- @@ -74,7 +75,8 @@
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicNot.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicNot.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicNot.java (copia de trabajo)
- @@ -37,6 +37,7 @@
- _condition.setListener(this);
- }
- + @Override
- void setListener(ConditionListener listener)
- {
- if (listener != null)
- @@ -46,6 +47,7 @@
- super.setListener(listener);
- }
- + @Override
- public boolean testImpl(Env env) {
- return !_condition.test(env);
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectSilenceMagicPhysical.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectSilenceMagicPhysical.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectSilenceMagicPhysical.java (copia de trabajo)
- @@ -28,13 +28,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return L2Effect.EffectType.SILENCE_MAGIC_PHYSICAL;
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().startMuted();
- getEffected().startPhysicalMuted();
- @@ -41,7 +43,8 @@
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- getEffected().stopMuted(this);
- getEffected().stopPhysicalMuted(this);
- @@ -49,7 +52,8 @@
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopMuted(this);
- getEffected().stopPhysicalMuted(this);
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeodata.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeodata.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeodata.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -106,7 +107,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/communitybbs/Manager/RegionBBSManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/communitybbs/Manager/RegionBBSManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/communitybbs/Manager/RegionBBSManager.java (copia de trabajo)
- @@ -294,7 +294,8 @@
- Collections.sort(sortedPlayers, new Comparator<L2PcInstance>()
- {
- - public int compare(L2PcInstance p1, L2PcInstance p2)
- + @Override
- + public int compare(L2PcInstance p1, L2PcInstance p2)
- {
- return p1.getName().compareToIgnoreCase(p2.getName());
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGm.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGm.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGm.java (copia de trabajo)
- @@ -38,7 +38,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_ACCESSLEVEL;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- //don't check for gm status ;)
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -53,7 +54,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2FolkInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2FolkInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2FolkInstance.java (copia de trabajo)
- @@ -44,7 +44,8 @@
- _classesToTeach = template.getTeachInfo();
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- player.setLastFolkNPC(this);
- super.onAction(player);
- @@ -228,7 +229,8 @@
- player.sendPacket(new ActionFailed());
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.startsWith("SkillList"))
- {
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectHealOverTime.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectHealOverTime.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectHealOverTime.java (copia de trabajo)
- @@ -30,11 +30,13 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.HEAL_OVER_TIME;
- }
- + @Override
- public boolean onActionTime()
- {
- if (getEffected().isDead())
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicAnd.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicAnd.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicAnd.java (copia de trabajo)
- @@ -49,6 +49,7 @@
- _conditions = tmp;
- }
- + @Override
- void setListener(ConditionListener listener)
- {
- if (listener != null) {
- @@ -61,6 +62,7 @@
- super.setListener(listener);
- }
- + @Override
- public boolean testImpl(Env env) {
- for (Condition c : _conditions) {
- if (!c.test(env))
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectDebuff.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectDebuff.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectDebuff.java (copia de trabajo)
- @@ -34,11 +34,13 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.DEBUFF;
- }
- + @Override
- public boolean onActionTime()
- {
- // just stop this effect
- Index: java/net/sf/l2j/ChatFilter.java
- ===================================================================
- --- java/net/sf/l2j/ChatFilter.java (revisión: 598)
- +++ java/net/sf/l2j/ChatFilter.java (copia de trabajo)
- @@ -23,7 +23,8 @@
- public class ChatFilter implements Filter
- {
- - public boolean isLoggable(LogRecord record)
- + @Override
- + public boolean isLoggable(LogRecord record)
- {
- return record.getLoggerName().equals("chat");
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2SepulcherNpcInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2SepulcherNpcInstance.java (copia de trabajo)
- @@ -374,7 +374,8 @@
- _DoorId = doorId;
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -396,7 +397,8 @@
- _NpcId = npcId;
- }
- - public void run()
- + @Override
- + public void run()
- {
- FourSepulchersManager.getInstance().spawnMysteriousBox(_NpcId);
- }
- @@ -411,7 +413,8 @@
- _NpcId = npcId;
- }
- - public void run()
- + @Override
- + public void run()
- {
- FourSepulchersManager.getInstance().spawnMonster(_NpcId);
- }
- Index: java/net/sf/l2j/gameserver/communitybbs/Manager/AdminBBSManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/communitybbs/Manager/AdminBBSManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/communitybbs/Manager/AdminBBSManager.java (copia de trabajo)
- @@ -18,7 +18,6 @@
- */
- package net.sf.l2j.gameserver.communitybbs.Manager;
- -import net.sf.l2j.Config;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.ShowBoard;
- Index: java/net/sf/l2j/gameserver/model/ClanWarehouse.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/ClanWarehouse.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/ClanWarehouse.java (copia de trabajo)
- @@ -33,14 +33,18 @@
- _clan = clan;
- }
- + @Override
- public int getOwnerId() { return _clan.getClanId(); }
- + @Override
- public L2PcInstance getOwner() { return _clan.getLeader().getPlayerInstance(); }
- + @Override
- public ItemLocation getBaseLocation() { return ItemLocation.CLANWH; }
- public String getLocationId() { return "0"; }
- public int getLocationId(@SuppressWarnings("unused") boolean dummy) { return 0; }
- public void setLocationId(@SuppressWarnings("unused") L2PcInstance dummy) { }
- - public boolean validateCapacity(int slots)
- + @Override
- + public boolean validateCapacity(int slots)
- {
- return (_items.size() + slots <= Config.WAREHOUSE_SLOTS_CLAN);
- }
- Index: java/net/sf/l2j/gameserver/script/faenor/FaenorInterface.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/faenor/FaenorInterface.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/faenor/FaenorInterface.java (copia de trabajo)
- @@ -75,7 +75,8 @@
- *
- * @see net.sf.l2j.gameserver.script.EngineInterface#addQuestDrop(int)
- */
- - public void addQuestDrop(int npcID, int itemID, int min, int max, int chance, String questID, String[] states)
- + @Override
- + public void addQuestDrop(int npcID, int itemID, int min, int max, int chance, String questID, String[] states)
- {
- L2NpcTemplate npc = _npcTable.getTemplate(npcID);
- if (npc == null)
- @@ -185,12 +186,14 @@
- return questDrops;
- }
- - public void addEventDrop(int[] items, int[] count, double chance, DateRange range)
- + @Override
- + public void addEventDrop(int[] items, int[] count, double chance, DateRange range)
- {
- EventDroplist.getInstance().addGlobalDrop(items, count, (int)(chance * L2DropData.MAX_CHANCE), range);
- }
- - public void onPlayerLogin(String[] message, DateRange validDateRange)
- + @Override
- + public void onPlayerLogin(String[] message, DateRange validDateRange)
- {
- Announcements.getInstance().addEventAnnouncement(validDateRange, message);
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLevel.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLevel.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLevel.java (copia de trabajo)
- @@ -41,7 +41,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (activeChar == null) return false;
- @@ -114,7 +115,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
- */
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return ADMIN_COMMANDS;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectThrowUp.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectThrowUp.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectThrowUp.java (copia de trabajo)
- @@ -41,12 +41,14 @@
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.THROW_UP;
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- // Get current position of the L2Character
- final int curX = getEffected().getX();
- @@ -105,12 +107,14 @@
- * @see net.sf.l2j.gameserver.model.L2Effect#onActionTime()
- */
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- return false;
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().setXYZ(_x, _y, _z);
- getEffected().broadcastPacket(new ValidateLocation(getEffected()));
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionInventory.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionInventory.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionInventory.java (copia de trabajo)
- @@ -35,5 +35,6 @@
- _slot = slot;
- }
- + @Override
- public abstract boolean testImpl(Env env);
- }
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/WorldMap.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/WorldMap.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/WorldMap.java (copia de trabajo)
- @@ -38,6 +38,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IItemHandler#useItem(net.sf.l2j.gameserver.model.L2PcInstance, net.sf.l2j.gameserver.model.L2ItemInstance)
- */
- + @Override
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- @@ -47,6 +48,7 @@
- return;
- }
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerHpPercentage.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerHpPercentage.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerHpPercentage.java (copia de trabajo)
- @@ -29,7 +29,8 @@
- _p = p;
- }
- - public boolean testImpl(Env env)
- + @Override
- + public boolean testImpl(Env env)
- {
- return env.player.getCurrentHp() <= env.player.getMaxHp()*_p;
- }
- Index: java/net/sf/l2j/util/WorldObjectMap.java
- ===================================================================
- --- java/net/sf/l2j/util/WorldObjectMap.java (revisión: 598)
- +++ java/net/sf/l2j/util/WorldObjectMap.java (copia de trabajo)
- @@ -36,7 +36,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#size()
- */
- - public int size()
- + @Override
- + public int size()
- {
- return objectMap.size();
- }
- @@ -44,7 +45,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#isEmpty()
- */
- - public boolean isEmpty()
- + @Override
- + public boolean isEmpty()
- {
- return objectMap.isEmpty();
- }
- @@ -52,7 +54,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#clear()
- */
- - public void clear()
- + @Override
- + public void clear()
- {
- objectMap.clear();
- }
- @@ -60,7 +63,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#put(T)
- */
- - public void put(T obj)
- + @Override
- + public void put(T obj)
- {
- if (obj != null)
- objectMap.put(obj.getObjectId(), obj);
- @@ -69,7 +73,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#remove(T)
- */
- - public void remove(T obj)
- + @Override
- + public void remove(T obj)
- {
- if (obj != null)
- objectMap.remove(obj.getObjectId());
- @@ -78,7 +83,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#get(int)
- */
- - public T get(int id)
- + @Override
- + public T get(int id)
- {
- return objectMap.get(id);
- }
- @@ -86,7 +92,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#contains(T)
- */
- - public boolean contains(T obj)
- + @Override
- + public boolean contains(T obj)
- {
- if (obj == null)
- return false;
- @@ -96,7 +103,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#iterator()
- */
- - public Iterator<T> iterator()
- + @Override
- + public Iterator<T> iterator()
- {
- return objectMap.values().iterator();
- }
- Index: java/net/sf/l2j/gameserver/ItemsAutoDestroy.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/ItemsAutoDestroy.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/ItemsAutoDestroy.java (copia de trabajo)
- @@ -94,7 +94,8 @@
- protected class CheckItemsForDestroy extends Thread
- {
- - public void run()
- + @Override
- + public void run()
- {
- removeItems();
- }
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/Mount.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/Mount.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/Mount.java (copia de trabajo)
- @@ -33,7 +33,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0])
- return false;
- @@ -45,7 +46,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/set.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/set.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/set.java (copia de trabajo)
- @@ -29,7 +29,8 @@
- {
- private static String[] _voicedCommands = { "set name", "set home", "set group" };
- - public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
- + @Override
- + public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
- {
- return true;
- @@ -36,7 +37,8 @@
- }
- - public String[] getVoicedCommandList()
- + @Override
- + public String[] getVoicedCommandList()
- {
- return _voicedCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditNpc.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditNpc.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditNpc.java (copia de trabajo)
- @@ -21,7 +21,6 @@
- import java.sql.Connection;
- import java.sql.PreparedStatement;
- import java.sql.ResultSet;
- -import java.sql.SQLException;
- import java.util.List;
- import java.util.StringTokenizer;
- import java.util.logging.Logger;
- @@ -39,7 +38,6 @@
- import net.sf.l2j.gameserver.model.L2DropCategory;
- import net.sf.l2j.gameserver.model.L2DropData;
- import net.sf.l2j.gameserver.model.L2ItemInstance;
- -import net.sf.l2j.gameserver.model.L2Object;
- import net.sf.l2j.gameserver.model.L2TradeList;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
- @@ -76,7 +74,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_NPC_EDIT;
- private static final int REQUIRED_LEVEL2 = Config.GM_NPC_VIEW;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -645,7 +644,8 @@
- return (level >= REQUIRED_LEVEL2);
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/FishShots.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/FishShots.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/FishShots.java (copia de trabajo)
- @@ -43,6 +43,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IItemHandler#useItem(net.sf.l2j.gameserver.model.L2PcInstance, net.sf.l2j.gameserver.model.L2ItemInstance)
- */
- + @Override
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- @@ -94,6 +95,7 @@
- activeChar.setTarget(oldTarget);
- }
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/model/actor/stat/NpcStat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/stat/NpcStat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/stat/NpcStat.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- // =========================================================
- // Property - Public
- - public L2NpcInstance getActiveChar()
- + @Override
- + public L2NpcInstance getActiveChar()
- {
- return (L2NpcInstance)super.getActiveChar();
- }
- Index: java/net/sf/l2j/gameserver/instancemanager/ItemsOnGroundManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/instancemanager/ItemsOnGroundManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/instancemanager/ItemsOnGroundManager.java (copia de trabajo)
- @@ -195,7 +195,8 @@
- protected class storeInDb extends Thread
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (!Config.SAVE_DROPPED_ITEM)
- return;
- Index: java/net/sf/l2j/util/Point3D.java
- ===================================================================
- --- java/net/sf/l2j/util/Point3D.java (revisión: 598)
- +++ java/net/sf/l2j/util/Point3D.java (copia de trabajo)
- @@ -71,16 +71,19 @@
- }
- }
- + @Override
- public String toString()
- {
- return "(" + x + ", " + y + ", " + z + ")";
- }
- + @Override
- public int hashCode()
- {
- return x ^ y ^ z;
- }
- + @Override
- public synchronized boolean equals(Object o)
- {
- if (o instanceof Point3D)
- Index: java/net/sf/l2j/loginserver/serverpackets/AccountKicked.java
- ===================================================================
- --- java/net/sf/l2j/loginserver/serverpackets/AccountKicked.java (revisión: 598)
- +++ java/net/sf/l2j/loginserver/serverpackets/AccountKicked.java (copia de trabajo)
- @@ -29,6 +29,7 @@
- writeD(reason);
- }
- + @Override
- public byte[] getContent()
- {
- return getBytes();
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2BoatInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2BoatInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2BoatInstance.java (copia de trabajo)
- @@ -76,7 +76,8 @@
- setAI(new L2BoatAI(new AIAccessor()));
- }
- - public final BoatKnownList getKnownList()
- + @Override
- + public final BoatKnownList getKnownList()
- {
- if (super.getKnownList() == null || !(super.getKnownList() instanceof BoatKnownList))
- setKnownList(new BoatKnownList(this));
- @@ -83,7 +84,8 @@
- return (BoatKnownList)super.getKnownList();
- }
- - public final BoatStat getStat()
- + @Override
- + public final BoatStat getStat()
- {
- if (super.getStat() == null || !(super.getStat() instanceof BoatStat))
- setStat(new BoatStat(this));
- @@ -165,7 +167,8 @@
- if (distance > 1)
- setHeading(Util.calculateHeadingFrom(getX(), getY(), point.getX(), point.getY()));
- - m._moveStartTime = GameTimeController.getInstance().getGameTicks();
- + GameTimeController.getInstance();
- + m._moveStartTime = GameTimeController.getGameTicks();
- _move = m;
- GameTimeController.getInstance().registerMovingObject(this);
- @@ -380,7 +383,8 @@
- _boat = instance;
- }
- - public void run()
- + @Override
- + public void run()
- {
- BoatCaptain bc;
- switch(_state)
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2TownPetInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2TownPetInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2TownPetInstance.java (copia de trabajo)
- @@ -85,7 +85,8 @@
- }
- public class RandomWalkTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (!isInActiveRegion())
- return; // but rather the AI should be turned off completely..
- Index: java/net/sf/l2j/gameserver/model/L2Fishing.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2Fishing.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2Fishing.java (copia de trabajo)
- @@ -51,6 +51,7 @@
- private int _lureType;
- + @Override
- public void run()
- {
- if (_fishCurHP >= _fishMaxHP * 2)
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicOr.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicOr.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionLogicOr.java (copia de trabajo)
- @@ -44,6 +44,7 @@
- _conditions = tmp;
- }
- + @Override
- void setListener(ConditionListener listener)
- {
- if (listener != null) {
- @@ -56,6 +57,7 @@
- super.setListener(listener);
- }
- + @Override
- public boolean testImpl(Env env) {
- for (Condition c : _conditions) {
- if (c.test(env))
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMonsterRace.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMonsterRace.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMonsterRace.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_MONSTERRACE;
- protected static int state = -1;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -60,7 +61,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- @@ -129,7 +131,8 @@
- this.activeChar = pActiveChar;
- }
- - public void run()
- + @Override
- + public void run()
- {
- MonRaceInfo spk = new MonRaceInfo(codes[2][0], codes[2][1], MonsterRace.getInstance().getMonsters(), MonsterRace.getInstance().getSpeeds());
- activeChar.sendPacket(spk);
- @@ -147,7 +150,8 @@
- this.activeChar = pActiveChar;
- }
- - public void run()
- + @Override
- + public void run()
- {
- DeleteObject obj = null;
- for (int i = 0; i < 8; i++)
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminQuest.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminQuest.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminQuest.java (copia de trabajo)
- @@ -41,7 +41,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (activeChar == null) return false;
- @@ -138,7 +139,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
- */
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return ADMIN_QUEST_COMMANDS;
- }
- Index: java/net/sf/l2j/gameserver/model/L2DropData.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2DropData.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2DropData.java (copia de trabajo)
- @@ -158,7 +158,8 @@
- * Returns a report of the object
- * @return String
- */
- - public String toString()
- + @Override
- + public String toString()
- {
- String out = "ItemID: " + getItemId() + " Min: " + getMinDrop() +
- " Max: " + getMaxDrop() + " Chance: " + (getChance() / 10000.0) + "%";
- @@ -175,7 +176,8 @@
- * @param Object to compare to the current one
- * @return boolean
- */
- - public boolean equals(Object o)
- + @Override
- + public boolean equals(Object o)
- {
- if (o instanceof L2DropData)
- {
- Index: java/net/sf/l2j/gameserver/model/quest/QuestState.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/quest/QuestState.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/quest/QuestState.java (copia de trabajo)
- @@ -41,7 +41,6 @@
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.ExShowQuestMark;
- import net.sf.l2j.gameserver.network.serverpackets.ItemList;
- -import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
- import net.sf.l2j.gameserver.network.serverpackets.PlaySound;
- import net.sf.l2j.gameserver.network.serverpackets.QuestList;
- import net.sf.l2j.gameserver.network.serverpackets.StatusUpdate;
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectBuff.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectBuff.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectBuff.java (copia de trabajo)
- @@ -34,11 +34,13 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.BUFF;
- }
- + @Override
- public boolean onActionTime()
- {
- // just stop this effect
- Index: java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/castle.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/castle.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/castle.java (copia de trabajo)
- @@ -33,7 +33,8 @@
- "ride wyvern"
- };
- - public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
- + @Override
- + public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
- {
- if (target.equals("castle") && activeChar.isClanLeader())
- {
- @@ -67,7 +68,8 @@
- }
- - public String[] getVoicedCommandList()
- + @Override
- + public String[] getVoicedCommandList()
- {
- return _voicedCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/conditions/Condition.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/Condition.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/Condition.java (copia de trabajo)
- @@ -71,6 +71,7 @@
- abstract boolean testImpl(Env env);
- + @Override
- public void notifyChanged()
- {
- if (_listener != null)
- Index: java/net/sf/l2j/gameserver/ai/L2NpcWalkerAI.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/ai/L2NpcWalkerAI.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/ai/L2NpcWalkerAI.java (copia de trabajo)
- @@ -74,12 +74,14 @@
- ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 1000, 1000);
- }
- - public void run()
- + @Override
- + public void run()
- {
- onEvtThink();
- }
- - protected void onEvtThink()
- + @Override
- + protected void onEvtThink()
- {
- if (!Config.ALLOW_NPC_WALKERS)
- return;
- @@ -98,7 +100,8 @@
- * If npc can't walk to it's target then just teleport to next point
- * @param blocked_at_pos ignoring it
- */
- - protected void onEvtArrivedBlocked(L2CharPosition blocked_at_pos)
- + @Override
- + protected void onEvtArrivedBlocked(L2CharPosition blocked_at_pos)
- {
- _log.warning("NpcWalker ID: " + getActor().getNpcId() + ": Blocked at rote position [" + _currentPos + "], coords: " + blocked_at_pos.x + ", " + blocked_at_pos.y + ", " + blocked_at_pos.z + ". Teleporting to next point");
- @@ -176,7 +179,8 @@
- setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new L2CharPosition(destinationX, destinationY, destinationZ, 0));
- }
- - public L2NpcWalkerInstance getActor()
- + @Override
- + public L2NpcWalkerInstance getActor()
- {
- return (L2NpcWalkerInstance) super.getActor();
- }
- Index: java/net/sf/l2j/gameserver/instancemanager/games/Lottery.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/instancemanager/games/Lottery.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/instancemanager/games/Lottery.java (copia de trabajo)
- @@ -122,7 +122,8 @@
- // Do nothing
- }
- - public void run()
- + @Override
- + public void run()
- {
- try (Connection con = L2DatabaseFactory.getInstance().getConnection();
- PreparedStatement statement = con.prepareStatement(SELECT_LAST_LOTTERY))
- @@ -235,7 +236,8 @@
- // Do nothing
- }
- - public void run()
- + @Override
- + public void run()
- {
- if (Config.DEBUG) _log.info("Lottery: Stopping ticket sell for lottery #" + getId() + ".");
- _isSellingTickets = false;
- @@ -251,7 +253,8 @@
- // Do nothing
- }
- - public void run()
- + @Override
- + public void run()
- {
- if (Config.DEBUG) _log.info("Lottery: Ending lottery #" + getId() + ".");
- Index: java/net/sf/l2j/gameserver/taskmanager/KnownListUpdateTaskManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/KnownListUpdateTaskManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/KnownListUpdateTaskManager.java (copia de trabajo)
- @@ -58,7 +58,8 @@
- // Do nothing
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- Index: java/net/sf/l2j/util/L2ObjectHashSet.java
- ===================================================================
- --- java/net/sf/l2j/util/L2ObjectHashSet.java (revisión: 598)
- +++ java/net/sf/l2j/util/L2ObjectHashSet.java (copia de trabajo)
- @@ -88,6 +88,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectSet#size()
- */
- + @Override
- public int size()
- {
- return count;
- @@ -96,6 +97,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectSet#isEmpty()
- */
- + @Override
- public boolean isEmpty()
- {
- return count == 0;
- @@ -104,7 +106,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectSet#clear()
- */
- - @SuppressWarnings("unchecked")
- + @Override
- + @SuppressWarnings("unchecked")
- public synchronized void clear()
- {
- int size = primes[0];
- @@ -133,6 +136,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectSet#put(T)
- */
- + @Override
- public synchronized void put(T obj)
- {
- if (obj == null)
- @@ -196,6 +200,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectSet#remove(T)
- */
- + @Override
- public synchronized void remove(T obj)
- {
- if (obj == null)
- @@ -234,6 +239,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectSet#contains(T)
- */
- + @Override
- public boolean contains(T obj)
- {
- final int size = table.length;
- @@ -311,6 +317,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectSet#iterator()
- */
- + @Override
- public Iterator<T> iterator()
- {
- return new Itr(table);
- @@ -332,10 +339,12 @@
- return;
- }
- }
- + @Override
- public boolean hasNext()
- {
- return nextObj != null;
- }
- + @Override
- public T next()
- {
- if (nextObj == null)
- @@ -351,6 +360,7 @@
- nextObj = null;
- return lastRet;
- }
- + @Override
- public void remove()
- {
- if (lastRet == null)
- Index: java/net/sf/l2j/util/L2ObjectSet.java
- ===================================================================
- --- java/net/sf/l2j/util/L2ObjectSet.java (revisión: 598)
- +++ java/net/sf/l2j/util/L2ObjectSet.java (copia de trabajo)
- @@ -65,5 +65,6 @@
- public abstract boolean contains(T obj);
- - public abstract Iterator<T> iterator();
- + @Override
- + public abstract Iterator<T> iterator();
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSpawn.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSpawn.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSpawn.java (copia de trabajo)
- @@ -73,7 +73,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_NPC_EDIT;
- private static final int REQUIRED_LEVEL2 = Config.GM_TELEPORT_OTHER;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -206,7 +207,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/SevenSignsRecord.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/SevenSignsRecord.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/SevenSignsRecord.java (copia de trabajo)
- @@ -34,6 +34,7 @@
- {
- private static int[] _itemIds = {5707};
- + @Override
- public void useItem(L2PlayableInstance playable, @SuppressWarnings("unused") L2ItemInstance item)
- {
- L2PcInstance activeChar;
- @@ -49,6 +50,7 @@
- activeChar.sendPacket(ssqs);
- }
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2NpcWalkerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2NpcWalkerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2NpcWalkerInstance.java (copia de trabajo)
- @@ -52,13 +52,15 @@
- * AI can't be deattached, npc must move always with the same AI instance.
- * @param newAI AI to set for this L2NpcWalkerInstance
- */
- - public void setAI(L2CharacterAI newAI)
- + @Override
- + public void setAI(L2CharacterAI newAI)
- {
- if (_ai == null || !(_ai instanceof L2NpcWalkerAI))
- _ai = newAI;
- }
- - public void onSpawn()
- + @Override
- + public void onSpawn()
- {
- getAI().setHomeX(getX());
- getAI().setHomeY(getY());
- @@ -107,12 +109,14 @@
- * @param killer ignore it
- * @return false
- */
- - public boolean doDie(L2Character killer)
- + @Override
- + public boolean doDie(L2Character killer)
- {
- return false;
- }
- - public L2NpcWalkerAI getAI()
- + @Override
- + public L2NpcWalkerAI getAI()
- {
- return (L2NpcWalkerAI)_ai;
- }
- @@ -122,6 +126,7 @@
- /**
- * AI can't be deattached.
- */
- - public void detachAI() {}
- + @Override
- + public void detachAI() {}
- }
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/skills/funcs/FuncDiv.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/FuncDiv.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/FuncDiv.java (copia de trabajo)
- @@ -29,6 +29,7 @@
- super(stat, order, owner);
- _lambda = lambda;
- }
- + @Override
- public void calc(Env env)
- {
- if (_cond == null || _cond.test(env))
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java (copia de trabajo)
- @@ -24,12 +24,12 @@
- import javolution.text.TextBuilder;
- import net.sf.l2j.Config;
- -import net.sf.l2j.L2DatabaseFactory;
- import net.sf.l2j.gameserver.Olympiad;
- import net.sf.l2j.gameserver.datatables.CharTemplateTable;
- import net.sf.l2j.gameserver.datatables.ClanTable;
- import net.sf.l2j.gameserver.instancemanager.CastleManager;
- import net.sf.l2j.gameserver.instancemanager.SiegeManager;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.L2Clan;
- import net.sf.l2j.gameserver.model.base.ClassId;
- import net.sf.l2j.gameserver.model.base.ClassType;
- @@ -62,7 +62,8 @@
- super(objectId, template);
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- String[] commandStr = command.split(" ");
- String actualCommand = commandStr[0]; // Get actual command
- @@ -389,7 +390,8 @@
- }
- }
- - public String getHtmlPath(int npcId, int val)
- + @Override
- + public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- @@ -436,7 +438,7 @@
- }
- }
- - if (player.isInsideZone(L2PcInstance.ZONE_SIEGE))
- + if (player.isInsideZone(L2Character.ZONE_SIEGE))
- {
- player.sendPacket(new SystemMessage(SystemMessage.CANNOT_DISSOLVE_WHILE_IN_SIEGE));
- return;
- Index: java/net/sf/l2j/gameserver/script/faenor/FaenorEventParser.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/faenor/FaenorEventParser.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/faenor/FaenorEventParser.java (copia de trabajo)
- @@ -63,7 +63,8 @@
- _log.info("Event ID: (" + ID + ") is not active yet... Ignored.");
- ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- parseEventDropAndMessage(eventNode);
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMammon.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMammon.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMammon.java (copia de trabajo)
- @@ -39,7 +39,8 @@
- "admin_list_spawns", "admin_msg"};
- private static final int REQUIRED_LEVEL = Config.GM_MENU;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -151,7 +152,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/network/serverpackets/EtcStatusUpdate.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/serverpackets/EtcStatusUpdate.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/network/serverpackets/EtcStatusUpdate.java (copia de trabajo)
- @@ -18,6 +18,7 @@
- */
- package net.sf.l2j.gameserver.network.serverpackets;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- /* Packet format: F3 XX000000 YY000000 ZZ000000 */
- @@ -48,7 +49,7 @@
- writeD(_activeChar.getCharges()); // 1-7 increase force, lvl
- writeD(_activeChar.getWeightPenalty()); // 1-4 weight penalty, lvl (1=50%, 2=66.6%, 3=80%, 4=100%)
- writeD((_activeChar.getMessageRefusal() || _activeChar.isChatBanned()) ? 1 : 0); // 1 = block all chat
- - writeD(_activeChar.isInsideZone(L2PcInstance.ZONE_DANGERAREA) ? 1 : 0); // 1 = danger area
- + writeD(_activeChar.isInsideZone(L2Character.ZONE_DANGERAREA) ? 1 : 0); // 1 = danger area
- writeD(Math.min(_activeChar.getExpertisePenalty(), 1)); // 1 = grade penalty
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2FestivalMonsterInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2FestivalMonsterInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2FestivalMonsterInstance.java (copia de trabajo)
- @@ -59,7 +59,8 @@
- /**
- * Return True if the attacker is not another L2FestivalMonsterInstance.<BR><BR>
- */
- - public boolean isAutoAttackable(L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(L2Character attacker)
- {
- if (attacker instanceof L2FestivalMonsterInstance)
- return false;
- @@ -70,7 +71,8 @@
- /**
- * All mobs in the festival are aggressive, and have high aggro range.
- */
- - public boolean isAggressive()
- + @Override
- + public boolean isAggressive()
- {
- return true;
- }
- @@ -78,7 +80,8 @@
- /**
- * All mobs in the festival really don't need random animation.
- */
- - public boolean hasRandomAnimation()
- + @Override
- + public boolean hasRandomAnimation()
- {
- return false;
- }
- @@ -89,7 +92,8 @@
- * <li>Add a blood offering item to the leader of the party.</li>
- * <li>Update the party leader's inventory to show the new item addition.</li>
- */
- - public void doItemDrop(L2Character lastAttacker)
- + @Override
- + public void doItemDrop(L2Character lastAttacker)
- {
- L2PcInstance killingChar = null;
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeGuardInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeGuardInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeGuardInstance.java (copia de trabajo)
- @@ -56,7 +56,8 @@
- getKnownList();
- }
- - public final SiegeGuardKnownList getKnownList()
- + @Override
- + public final SiegeGuardKnownList getKnownList()
- {
- if (super.getKnownList() == null || !(super.getKnownList() instanceof SiegeGuardKnownList))
- this.setKnownList(new SiegeGuardKnownList(this));
- @@ -63,6 +64,7 @@
- return (SiegeGuardKnownList)super.getKnownList();
- }
- + @Override
- public L2CharacterAI getAI()
- {
- synchronized(this)
- @@ -79,7 +81,8 @@
- * @param attacker The L2Character that the L2SiegeGuardInstance try to attack
- *
- */
- - public boolean isAutoAttackable(L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(L2Character attacker)
- {
- L2PcInstance attackingPlayer = null;
- if (attacker instanceof L2PcInstance)
- @@ -117,7 +120,8 @@
- * extra check to see if a player should interact or ATTACK them when clicked.
- *
- */
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- @@ -176,7 +180,8 @@
- }
- }
- - public void addDamageHate(L2Character attacker, int damage, int aggro)
- + @Override
- + public void addDamageHate(L2Character attacker, int damage, int aggro)
- {
- if (attacker == null)
- return;
- @@ -187,7 +192,8 @@
- }
- }
- - public boolean hasRandomAnimation()
- + @Override
- + public boolean hasRandomAnimation()
- {
- return false;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java (copia de trabajo)
- @@ -88,7 +88,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_TELEPORT;
- private static final int REQUIRED_LEVEL2 = Config.GM_TELEPORT_OTHER;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -375,7 +376,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/pathfinding/geonodes/GeoNodeLoc.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/pathfinding/geonodes/GeoNodeLoc.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/pathfinding/geonodes/GeoNodeLoc.java (copia de trabajo)
- @@ -71,11 +71,13 @@
- // Overriden
- }
- + @Override
- public int getNodeX()
- {
- return _x;
- }
- + @Override
- public int getNodeY()
- {
- return _y;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeoEditor.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeoEditor.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeoEditor.java (copia de trabajo)
- @@ -41,7 +41,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -118,7 +119,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHeal.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHeal.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHeal.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- private static String[] _adminCommands = {"admin_heal"};
- private static final int REQUIRED_LEVEL = Config.GM_HEAL;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -68,7 +69,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2ControllableMobInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2ControllableMobInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2ControllableMobInstance.java (copia de trabajo)
- @@ -36,6 +36,7 @@
- protected class ControllableAIAcessor extends AIAccessor
- {
- + @Override
- public void detachAI()
- {
- // do nothing, AI of controllable mobs can't be detached automatically
- @@ -42,11 +43,13 @@
- }
- }
- + @Override
- public boolean isAggressive()
- {
- return true;
- }
- + @Override
- public int getAggroRange()
- {
- // force mobs to be aggro
- @@ -58,6 +61,7 @@
- super(objectId, template);
- }
- + @Override
- public L2CharacterAI getAI()
- {
- if (_ai == null)
- @@ -78,6 +82,7 @@
- return _ai;
- }
- + @Override
- public boolean isInvul()
- {
- return _isInvul;
- @@ -119,6 +124,7 @@
- }
- }
- + @Override
- public boolean doDie(L2Character killer)
- {
- if (!super.doDie(killer))
- @@ -128,6 +134,7 @@
- return true;
- }
- + @Override
- public void deleteMe()
- {
- removeAI();
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectFear.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectFear.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectFear.java (copia de trabajo)
- @@ -48,13 +48,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.FEAR;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- if (getEffected() instanceof L2FolkInstance)
- return;
- @@ -84,13 +86,15 @@
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopFear(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- int posX = getEffected().getX();
- int posY = getEffected().getY();
- Index: java/net/sf/l2j/gameserver/idfactory/StackIDFactory.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/idfactory/StackIDFactory.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/idfactory/StackIDFactory.java (copia de trabajo)
- @@ -123,7 +123,8 @@
- return _instance;
- }
- - public synchronized int getNextId()
- + @Override
- + public synchronized int getNextId()
- {
- int id;
- if (!_freeOIDStack.empty())
- @@ -140,12 +141,14 @@
- * return a used Object ID back to the pool
- * @param object ID
- */
- - public synchronized void releaseId(int id)
- + @Override
- + public synchronized void releaseId(int id)
- {
- _freeOIDStack.push(id);
- }
- - public int size()
- + @Override
- + public int size()
- {
- return FREE_OBJECT_ID_SIZE - _curOID + FIRST_OID + _freeOIDStack.size();
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectSleep.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectSleep.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectSleep.java (copia de trabajo)
- @@ -34,6 +34,7 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.SLEEP;
- @@ -40,6 +41,7 @@
- }
- /** Notify started */
- + @Override
- public void onStart()
- {
- getEffected().startSleeping();
- @@ -46,11 +48,13 @@
- }
- /** Notify exited */
- + @Override
- public void onExit() {
- getEffected().stopSleeping(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- getEffected().stopSleeping(this);
- // just stop this effect
- Index: java/net/sf/l2j/gameserver/model/Inventory.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/Inventory.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/Inventory.java (copia de trabajo)
- @@ -104,7 +104,8 @@
- /**
- * Add alteration in inventory when item equipped
- */
- - @SuppressWarnings("unused")
- + @Override
- + @SuppressWarnings("unused")
- public void notifyEquiped(int slot, L2ItemInstance item) {
- if (!_changed.contains(item))
- _changed.add(item);
- @@ -113,7 +114,8 @@
- /**
- * Add alteration in inventory when item unequipped
- */
- - @SuppressWarnings("unused")
- + @Override
- + @SuppressWarnings("unused")
- public void notifyUnequiped(int slot, L2ItemInstance item) {
- if (!_changed.contains(item))
- _changed.add(item);
- @@ -130,7 +132,8 @@
- final class BowListener implements PaperdollListener
- {
- - public void notifyUnequiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyUnequiped(int slot, L2ItemInstance item)
- {
- if (slot != PAPERDOLL_LRHAND)
- return;
- @@ -142,7 +145,8 @@
- setPaperdollItem(PAPERDOLL_LHAND, null);
- }
- }
- - public void notifyEquiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyEquiped(int slot, L2ItemInstance item)
- {
- if (slot != PAPERDOLL_LRHAND)
- return;
- @@ -158,13 +162,15 @@
- final class StatsListener implements PaperdollListener
- {
- - public void notifyUnequiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyUnequiped(int slot, L2ItemInstance item)
- {
- if (slot == PAPERDOLL_LRHAND)
- return;
- getOwner().removeStatsOwner(item);
- }
- - public void notifyEquiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyEquiped(int slot, L2ItemInstance item)
- {
- if (slot == PAPERDOLL_LRHAND)
- return;
- @@ -174,7 +180,8 @@
- final class ItemPassiveSkillsListener implements PaperdollListener
- {
- - public void notifyUnequiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyUnequiped(int slot, L2ItemInstance item)
- {
- if (!(getOwner() instanceof L2PcInstance))
- return;
- @@ -202,7 +209,8 @@
- }
- - public void notifyEquiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyEquiped(int slot, L2ItemInstance item)
- {
- if (!(getOwner() instanceof L2PcInstance))
- return;
- @@ -230,7 +238,8 @@
- final class ArmorSetListener implements PaperdollListener
- {
- - public void notifyEquiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyEquiped(int slot, L2ItemInstance item)
- {
- if (!(getOwner() instanceof L2PcInstance))
- return;
- @@ -294,7 +303,8 @@
- }
- }
- - public void notifyUnequiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyUnequiped(int slot, L2ItemInstance item)
- {
- boolean remove = false;
- int removeSkillId1 = 0; // set skill
- @@ -359,7 +369,8 @@
- final class FormalWearListener implements PaperdollListener
- {
- - public void notifyUnequiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyUnequiped(int slot, L2ItemInstance item)
- {
- if (!(getOwner() != null
- && getOwner() instanceof L2PcInstance))
- @@ -370,7 +381,8 @@
- if (item.getItemId() == 6408)
- owner.setIsWearingFormalWear(false);
- }
- - public void notifyEquiped(int slot, L2ItemInstance item)
- + @Override
- + public void notifyEquiped(int slot, L2ItemInstance item)
- {
- if (!(getOwner() != null
- && getOwner() instanceof L2PcInstance))
- @@ -493,7 +505,8 @@
- *
- * @param item : L2ItemInstance to be added from inventory
- */
- - protected void addItem(L2ItemInstance item)
- + @Override
- + protected void addItem(L2ItemInstance item)
- {
- super.addItem(item);
- if (item.isEquipped())
- @@ -504,7 +517,8 @@
- * Removes item from inventory for further adjustments.
- * @param item : L2ItemInstance to be removed from inventory
- */
- - protected boolean removeItem(L2ItemInstance item)
- + @Override
- + protected boolean removeItem(L2ItemInstance item)
- {
- // Unequip item if equipped
- for (int i = 0; i < _paperdoll.length; i++)
- @@ -948,6 +962,7 @@
- /**
- * Refresh the weight of equipment loaded
- */
- + @Override
- protected void refreshWeight()
- {
- int weight = 0;
- @@ -997,6 +1012,7 @@
- /**
- * Get back items in inventory from database
- */
- + @Override
- public void restore()
- {
- try (Connection con = L2DatabaseFactory.getInstance().getConnection();
- Index: java/net/sf/l2j/gameserver/skills/funcs/FuncSet.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/FuncSet.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/FuncSet.java (copia de trabajo)
- @@ -29,6 +29,7 @@
- super(stat, order, owner);
- _lambda = lambda;
- }
- + @Override
- public void calc(Env env)
- {
- if (_cond == null || _cond.test(env))
- Index: java/net/sf/l2j/gameserver/communitybbs/Manager/ForumsBBSManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/communitybbs/Manager/ForumsBBSManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/communitybbs/Manager/ForumsBBSManager.java (copia de trabajo)
- @@ -22,12 +22,9 @@
- import java.sql.PreparedStatement;
- import java.sql.ResultSet;
- import java.util.List;
- -import java.util.Map;
- import java.util.logging.Logger;
- import javolution.util.FastList;
- -import javolution.util.FastMap;
- -
- import net.sf.l2j.L2DatabaseFactory;
- import net.sf.l2j.gameserver.communitybbs.BB.Forum;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- Index: java/net/sf/l2j/gameserver/model/L2Effect.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2Effect.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2Effect.java (copia de trabajo)
- @@ -150,7 +150,8 @@
- rate = pRate;
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- Index: java/net/sf/l2j/gameserver/model/entity/Siege.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/entity/Siege.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/entity/Siege.java (copia de trabajo)
- @@ -36,6 +36,7 @@
- import net.sf.l2j.gameserver.instancemanager.SiegeGuardManager;
- import net.sf.l2j.gameserver.instancemanager.SiegeManager;
- import net.sf.l2j.gameserver.instancemanager.SiegeManager.SiegeSpawn;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.L2Clan;
- import net.sf.l2j.gameserver.model.L2Object;
- import net.sf.l2j.gameserver.model.L2SiegeClan;
- @@ -740,7 +741,7 @@
- for (L2PcInstance player : L2World.getInstance().getAllPlayers())
- {
- - if (!player.isInsideZone(L2PcInstance.ZONE_SIEGE) || (player.getSiegeState() != 0))
- + if (!player.isInsideZone(L2Character.ZONE_SIEGE) || (player.getSiegeState() != 0))
- {
- continue;
- }
- Index: java/net/sf/l2j/gameserver/model/zone/type/L2DamageZone.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/zone/type/L2DamageZone.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/zone/type/L2DamageZone.java (copia de trabajo)
- @@ -88,7 +88,8 @@
- _dmgZone = zone;
- }
- - public void run()
- + @Override
- + public void run()
- {
- for (L2Character temp : _dmgZone.getCharacterList())
- {
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerLevel.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerLevel.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerLevel.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- _level = level;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- return env.player.getLevel() >= _level;
- Index: java/net/sf/l2j/gameserver/scripting/L2ScriptEngineManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/scripting/L2ScriptEngineManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/scripting/L2ScriptEngineManager.java (copia de trabajo)
- @@ -27,9 +27,7 @@
- import java.io.FileOutputStream;
- import java.io.IOException;
- import java.io.InputStreamReader;
- -import java.io.InvalidClassException;
- import java.io.LineNumberReader;
- -import java.io.ObjectInputStream;
- import java.util.LinkedList;
- import java.util.List;
- import java.util.Map;
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/SoulCrystals.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/SoulCrystals.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/SoulCrystals.java (copia de trabajo)
- @@ -53,7 +53,8 @@
- };
- // Our main method, where everything goes on
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -106,7 +107,8 @@
- _crystalId = crystalId;
- }
- - public void run()
- + @Override
- + public void run()
- {
- if (_activeChar.isDead() || _target.isDead())
- @@ -126,7 +128,8 @@
- }
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2SymbolMakerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2SymbolMakerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2SymbolMakerInstance.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- {
- //private static Logger _log = Logger.getLogger(L2SymbolMakerInstance.class.getName());
- + @Override
- public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.equals("Draw"))
- @@ -91,6 +92,7 @@
- super(objectID, template);
- }
- + @Override
- public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- @@ -107,7 +109,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.model.L2Object#isAttackable()
- */
- - public boolean isAutoAttackable(@SuppressWarnings("unused") L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(@SuppressWarnings("unused") L2Character attacker)
- {
- return false;
- }
- Index: java/net/sf/l2j/gameserver/script/faenor/FaenorWorldDataParser.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/faenor/FaenorWorldDataParser.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/faenor/FaenorWorldDataParser.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- //Script Types
- private final static String PET_DATA = "PetData";
- - public void parseScript(Node eventNode, ScriptContext context)
- + @Override
- + public void parseScript(Node eventNode, ScriptContext context)
- {
- if (Config.DEBUG) System.out.println("Parsing WorldData");
- @@ -127,7 +128,8 @@
- static class FaenorWorldDataParserFactory extends ParserFactory
- {
- - public Parser create()
- + @Override
- + public Parser create()
- {
- return(new FaenorWorldDataParser());
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2WyvernManagerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2WyvernManagerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2WyvernManagerInstance.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- super(objectId, template);
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.startsWith("RideWyvern"))
- {
- @@ -106,7 +107,8 @@
- super.onBypassFeedback(player, command);
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- return;
- Index: java/net/sf/l2j/gameserver/model/quest/QuestTimer.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/quest/QuestTimer.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/quest/QuestTimer.java (copia de trabajo)
- @@ -30,7 +30,8 @@
- // Schedule Task
- public class ScheduleTimerTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (this == null || !getIsActive())
- return;
- @@ -138,7 +139,8 @@
- return _player;
- }
- - public final String toString()
- + @Override
- + public final String toString()
- {
- return _name;
- }
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionElementSeed.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionElementSeed.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionElementSeed.java (copia de trabajo)
- @@ -46,7 +46,8 @@
- _requiredSeeds[4] = any;
- }
- - public boolean testImpl(Env env)
- + @Override
- + public boolean testImpl(Env env)
- {
- int[] Seeds = new int[3];
- for (int i = 0; i < Seeds.length; i++)
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java (copia de trabajo)
- @@ -66,7 +66,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_MENU;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -324,7 +325,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/BeastSpice.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/BeastSpice.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/BeastSpice.java (copia de trabajo)
- @@ -32,7 +32,8 @@
- // Golden Spice, Crystal Spice
- private static int[] _itemIds = { 6643, 6644 };
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -58,7 +59,8 @@
- activeChar.useMagic(SkillTable.getInstance().getInfo(2189,1),false,false);
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/stat/DoorStat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/stat/DoorStat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/stat/DoorStat.java (copia de trabajo)
- @@ -42,7 +42,9 @@
- // =========================================================
- // Property - Public
- - public L2DoorInstance getActiveChar() { return (L2DoorInstance)super.getActiveChar(); }
- + @Override
- + public L2DoorInstance getActiveChar() { return (L2DoorInstance)super.getActiveChar(); }
- - public final byte getLevel() { return 1; }
- + @Override
- + public final byte getLevel() { return 1; }
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/instancemanager/MercTicketManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/instancemanager/MercTicketManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/instancemanager/MercTicketManager.java (copia de trabajo)
- @@ -368,7 +368,8 @@
- {
- ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- npc.deleteMe();
- }
- Index: java/net/sf/l2j/gameserver/skills/funcs/LambdaStats.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/LambdaStats.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/LambdaStats.java (copia de trabajo)
- @@ -43,6 +43,7 @@
- _stat = stat;
- }
- + @Override
- public double calc(Env env)
- {
- switch (_stat)
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionSkillStats.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionSkillStats.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionSkillStats.java (copia de trabajo)
- @@ -37,6 +37,7 @@
- _stat = stat;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (env.skill == null)
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerBaseStats.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerBaseStats.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerBaseStats.java (copia de trabajo)
- @@ -40,6 +40,7 @@
- _value = value;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (!(env.player instanceof L2PcInstance))
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionWithSkill.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionWithSkill.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionWithSkill.java (copia de trabajo)
- @@ -33,6 +33,7 @@
- _skill = skill;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (!_skill && env.skill != null)
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/Seed.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/Seed.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/Seed.java (copia de trabajo)
- @@ -65,7 +65,8 @@
- L2MonsterInstance _target;
- L2PcInstance _activeChar;
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -125,7 +126,8 @@
- return (L2Manor.getInstance().getCastleIdForSeed(_seedId) == castleId);
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/knownlist/BoatKnownList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/knownlist/BoatKnownList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/knownlist/BoatKnownList.java (copia de trabajo)
- @@ -37,12 +37,14 @@
- // =========================================================
- // Property - Public
- - public final L2BoatInstance getActiveChar()
- + @Override
- + public final L2BoatInstance getActiveChar()
- {
- return (L2BoatInstance)super.getActiveChar();
- }
- - public int getDistanceToForgetObject(L2Object object)
- + @Override
- + public int getDistanceToForgetObject(L2Object object)
- {
- if (!(object instanceof L2PcInstance))
- return 0;
- @@ -49,7 +51,8 @@
- return 5000;
- }
- - public int getDistanceToWatchObject(L2Object object)
- + @Override
- + public int getDistanceToWatchObject(L2Object object)
- {
- if (!(object instanceof L2PcInstance))
- return 0;
- Index: java/net/sf/l2j/gameserver/model/actor/knownlist/CharKnownList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/knownlist/CharKnownList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/knownlist/CharKnownList.java (copia de trabajo)
- @@ -47,8 +47,10 @@
- // =========================================================
- // Method - Public
- - public boolean addKnownObject(L2Object object) { return addKnownObject(object, null); }
- - public boolean addKnownObject(L2Object object, L2Character dropper)
- + @Override
- + public boolean addKnownObject(L2Object object) { return addKnownObject(object, null); }
- + @Override
- + public boolean addKnownObject(L2Object object, L2Character dropper)
- {
- if (!super.addKnownObject(object, dropper))
- return false;
- @@ -74,7 +76,8 @@
- }
- /** Remove all L2Object from _knownObjects and _knownPlayer of the L2Character then cancel Attak or Cast and notify AI. */
- - public final void removeAllKnownObjects()
- + @Override
- + public final void removeAllKnownObjects()
- {
- super.removeAllKnownObjects();
- getKnownPlayers().clear();
- @@ -89,7 +92,8 @@
- if (getActiveChar().hasAI()) getActiveChar().setAI(null);
- }
- - public boolean removeKnownObject(L2Object object)
- + @Override
- + public boolean removeKnownObject(L2Object object)
- {
- if (!super.removeKnownObject(object)) return false;
- if (object instanceof L2PcInstance)
- @@ -142,9 +146,11 @@
- // Property - Public
- public L2Character getActiveChar() { return (L2Character)super.getActiveObject(); }
- - public int getDistanceToForgetObject(L2Object object) { return 0; }
- + @Override
- + public int getDistanceToForgetObject(L2Object object) { return 0; }
- - public int getDistanceToWatchObject(L2Object object) { return 0; }
- + @Override
- + public int getDistanceToWatchObject(L2Object object) { return 0; }
- public Collection<L2Character> getKnownCharacters()
- {
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/EnchantScrolls.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/EnchantScrolls.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/EnchantScrolls.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- 959, 960, 961, 962, 6577, 6578 // s grade
- };
- + @Override
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- @@ -50,6 +51,7 @@
- activeChar.sendPacket(new ChooseInventoryItem(item.getItemId()));
- }
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/model/DropProtection.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/DropProtection.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/DropProtection.java (copia de trabajo)
- @@ -36,7 +36,8 @@
- private static final long PROTECTED_MILLIS_TIME = 15000;
- - public synchronized void run()
- + @Override
- + public synchronized void run()
- {
- _isProtected = false;
- _owner = null;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMobGroup.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMobGroup.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMobGroup.java (copia de trabajo)
- @@ -49,7 +49,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -220,6 +221,7 @@
- group.setFollowMode(target);
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/ChatLogFormatter.java
- ===================================================================
- --- java/net/sf/l2j/ChatLogFormatter.java (revisión: 598)
- +++ java/net/sf/l2j/ChatLogFormatter.java (copia de trabajo)
- @@ -37,6 +37,7 @@
- private SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
- + @Override
- public String format(LogRecord record)
- {
- Object[] params = record.getParameters();
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java (copia de trabajo)
- @@ -51,7 +51,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_CREATE_ITEM;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -190,7 +191,8 @@
- return (level >= REQUIRED_LEVEL);
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/GeoData.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/GeoData.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/GeoData.java (copia de trabajo)
- @@ -34,7 +34,6 @@
- import net.sf.l2j.gameserver.model.L2Object;
- import net.sf.l2j.gameserver.model.Location;
- import net.sf.l2j.gameserver.model.actor.instance.L2DoorInstance;
- -import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.util.GeoUtils;
- import net.sf.l2j.gameserver.util.LinePointIterator;
- import net.sf.l2j.gameserver.util.LinePointIterator3D;
- Index: java/net/sf/l2j/gameserver/model/PetInventory.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/PetInventory.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/PetInventory.java (copia de trabajo)
- @@ -32,12 +32,14 @@
- _owner = owner;
- }
- - public L2PetInstance getOwner()
- + @Override
- + public L2PetInstance getOwner()
- {
- return _owner;
- }
- - public int getOwnerId()
- + @Override
- + public int getOwnerId()
- {
- // gets the L2PcInstance-owner's ID
- int id;
- @@ -73,7 +75,8 @@
- return validateCapacity(slots);
- }
- - public boolean validateCapacity(int slots)
- + @Override
- + public boolean validateCapacity(int slots)
- {
- return (_items.size() + slots <= _owner.getInventoryLimit());
- }
- @@ -94,12 +97,14 @@
- return (_totalWeight + weight <= _owner.getMaxLoad());
- }
- - protected ItemLocation getBaseLocation()
- + @Override
- + protected ItemLocation getBaseLocation()
- {
- return ItemLocation.PET;
- }
- - protected ItemLocation getEquipLocation()
- + @Override
- + protected ItemLocation getEquipLocation()
- {
- return ItemLocation.PET_EQUIP;
- }
- Index: java/net/sf/l2j/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java (copia de trabajo)
- @@ -27,6 +27,7 @@
- import net.sf.l2j.L2DatabaseFactory;
- import net.sf.l2j.gameserver.cache.CrestCache;
- import net.sf.l2j.gameserver.idfactory.BitSetIDFactory;
- +import net.sf.l2j.gameserver.idfactory.IdFactory;
- import net.sf.l2j.gameserver.model.L2Clan;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
- @@ -109,7 +110,7 @@
- }
- CrestCache crestCache = CrestCache.getInstance();
- - int newId = BitSetIDFactory.getInstance().getNextId();
- + int newId = IdFactory.getInstance().getNextId();
- if (!crestCache.savePledgeCrestLarge(newId, _data))
- {
- Index: java/net/sf/l2j/gameserver/taskmanager/tasks/TaskCleanUp.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/tasks/TaskCleanUp.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/tasks/TaskCleanUp.java (copia de trabajo)
- @@ -29,12 +29,14 @@
- {
- public static String NAME = "CleanUp";
- - public String getName()
- + @Override
- + public String getName()
- {
- return NAME;
- }
- - public void onTimeElapsed(ExecutedTask task)
- + @Override
- + public void onTimeElapsed(ExecutedTask task)
- {
- System.runFinalization();
- System.gc();
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminFightCalculator.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminFightCalculator.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminFightCalculator.java (copia de trabajo)
- @@ -53,7 +53,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- //TODO: remove from gm list etc etc
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- try
- {
- @@ -75,6 +76,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList() {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/funcs/LambdaRnd.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/LambdaRnd.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/LambdaRnd.java (copia de trabajo)
- @@ -38,7 +38,8 @@
- _linear = linear;
- }
- - public double calc(Env env)
- + @Override
- + public double calc(Env env)
- {
- if (_linear)
- return _max.calc(env) * Rnd.nextDouble();
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectManaDamOverTime.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectManaDamOverTime.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectManaDamOverTime.java (copia de trabajo)
- @@ -29,12 +29,14 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.MANA_DMG_OVER_TIME;
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- if (getEffected().isDead())
- return false;
- Index: java/net/sf/l2j/gameserver/templates/L2WeaponType.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/templates/L2WeaponType.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/templates/L2WeaponType.java (copia de trabajo)
- @@ -64,6 +64,7 @@
- * Returns the name of the WeaponType
- * @return String
- */
- + @Override
- public String toString()
- {
- return _name;
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/Time.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/Time.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/Time.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- /* (non-Javadoc)
- *
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (COMMAND_IDS[0] != id) return false;
- @@ -75,7 +76,8 @@
- return true;
- }
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/util/L2ObjectMap.java
- ===================================================================
- --- java/net/sf/l2j/util/L2ObjectMap.java (revisión: 598)
- +++ java/net/sf/l2j/util/L2ObjectMap.java (copia de trabajo)
- @@ -45,7 +45,8 @@
- public abstract boolean contains(T obj);
- - public abstract Iterator<T> iterator();
- + @Override
- + public abstract Iterator<T> iterator();
- public static L2ObjectMap<L2Object> createL2ObjectMap()
- {
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHelpPage.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHelpPage.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHelpPage.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- private static String[] _adminCommands = {"admin_help"};
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -59,6 +60,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2FriendlyMobInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2FriendlyMobInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2FriendlyMobInstance.java (copia de trabajo)
- @@ -38,7 +38,8 @@
- getKnownList();
- }
- - public final FriendlyMobKnownList getKnownList()
- + @Override
- + public final FriendlyMobKnownList getKnownList()
- {
- if (super.getKnownList() == null || !(super.getKnownList() instanceof FriendlyMobKnownList))
- setKnownList(new FriendlyMobKnownList(this));
- @@ -45,6 +46,7 @@
- return (FriendlyMobKnownList)super.getKnownList();
- }
- + @Override
- public boolean isAutoAttackable(L2Character attacker)
- {
- if (attacker instanceof L2PcInstance)
- @@ -52,11 +54,13 @@
- return false;
- }
- + @Override
- public boolean isAggressive()
- {
- return true;
- }
- + @Override
- public boolean hasRandomAnimation()
- {
- return false;
- Index: java/net/sf/l2j/AuditFilter.java
- ===================================================================
- --- java/net/sf/l2j/AuditFilter.java (revisión: 598)
- +++ java/net/sf/l2j/AuditFilter.java (copia de trabajo)
- @@ -27,7 +27,8 @@
- */
- public class AuditFilter implements Filter
- {
- - public boolean isLoggable(LogRecord record)
- + @Override
- + public boolean isLoggable(LogRecord record)
- {
- return record.getLoggerName().equalsIgnoreCase("audit");
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionUsingItemType.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionUsingItemType.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionUsingItemType.java (copia de trabajo)
- @@ -37,6 +37,7 @@
- _mask = mask;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (!(env.player instanceof L2PcInstance))
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectRelax.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectRelax.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectRelax.java (copia de trabajo)
- @@ -30,13 +30,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.RELAXING;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- if (getEffected().getCurrentHp() == getEffected().getMaxHp())
- {
- @@ -62,7 +64,8 @@
- super.onStart();
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- if (getEffected() instanceof L2PcInstance)
- ((L2PcInstance)getEffected()).setRelax(false);
- @@ -70,7 +73,8 @@
- super.onExit();
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- if (getEffected().isDead())
- Index: java/net/sf/l2j/accountmanager/SQLAccountManager.java
- ===================================================================
- --- java/net/sf/l2j/accountmanager/SQLAccountManager.java (revisión: 598)
- +++ java/net/sf/l2j/accountmanager/SQLAccountManager.java (copia de trabajo)
- @@ -29,8 +29,6 @@
- import java.sql.SQLException;
- import java.util.Base64;
- -import javolution.util.FastList;
- -
- import net.sf.l2j.Config;
- import net.sf.l2j.L2DatabaseFactory;
- import net.sf.l2j.Server;
- Index: java/net/sf/l2j/gameserver/instancemanager/RaidBossSpawnManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/instancemanager/RaidBossSpawnManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/instancemanager/RaidBossSpawnManager.java (copia de trabajo)
- @@ -139,7 +139,8 @@
- bossId = npcId;
- }
- - public void run()
- + @Override
- + public void run()
- {
- L2RaidBossInstance raidboss = null;
- Index: java/net/sf/l2j/gameserver/SevenSignsFestival.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/SevenSignsFestival.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/SevenSignsFestival.java (copia de trabajo)
- @@ -1610,7 +1610,8 @@
- *
- * @param npc
- */
- - public void npcSpawned(L2NpcInstance npc)
- + @Override
- + public void npcSpawned(L2NpcInstance npc)
- {
- if (npc == null)
- return;
- @@ -1659,7 +1660,8 @@
- setNextFestivalStart(Config.ALT_FESTIVAL_CYCLE_LENGTH - FESTIVAL_SIGNUP_TIME);
- }
- - public synchronized void run()
- + @Override
- + public synchronized void run()
- {
- // The manager shouldn't be running if Seal Validation is in effect.
- if (SevenSigns.getInstance().isSealValidationPeriod())
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectFakeDeath.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectFakeDeath.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectFakeDeath.java (copia de trabajo)
- @@ -35,24 +35,28 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.FAKE_DEATH;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().startFakeDeath();
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopFakeDeath(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- if (getEffected().isDead())
- return false;
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java (copia de trabajo)
- @@ -36,6 +36,7 @@
- _weaponMask = weaponMask;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (env.target == null)
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeNpcInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeNpcInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeNpcInstance.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- * this is called when a player interacts with this NPC
- * @param player
- */
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- Index: java/net/sf/l2j/gameserver/ai/L2ControllableMobAI.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/ai/L2ControllableMobAI.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/ai/L2ControllableMobAI.java (copia de trabajo)
- @@ -77,7 +77,8 @@
- }
- }
- - protected void onEvtThink()
- + @Override
- + protected void onEvtThink()
- {
- if (isThinking() || _actor.isAllSkillsDisabled())
- return;
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2TrainerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2TrainerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2TrainerInstance.java (copia de trabajo)
- @@ -35,7 +35,8 @@
- super(objectId, template);
- }
- - public String getHtmlPath(int npcId, int val)
- + @Override
- + public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- if (val == 0)
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/Loc.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/Loc.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/Loc.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(@SuppressWarnings("unused") int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(@SuppressWarnings("unused") int id, L2PcInstance activeChar)
- {
- int _nearestTown = MapRegionTable.getInstance().getClosestTownNumber(activeChar);
- int msg = 0;
- @@ -107,7 +108,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectHitMainTarget.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectHitMainTarget.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectHitMainTarget.java (copia de trabajo)
- @@ -29,22 +29,26 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.MANA_DMG_OVER_TIME;
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().setIsSingleSpear(true);
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().setIsSingleSpear(false);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- if (getEffected().isDead())
- return false;
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectNoblesseBless.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectNoblesseBless.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectNoblesseBless.java (copia de trabajo)
- @@ -35,13 +35,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.NOBLESSE_BLESSING;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- if (getEffected() instanceof L2PlayableInstance)
- ((L2PlayableInstance)getEffected()).startNoblesseBlessing();
- @@ -48,13 +50,15 @@
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- if (getEffected() instanceof L2PlayableInstance)
- ((L2PlayableInstance)getEffected()).stopNoblesseBlessing(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- // just stop this effect
- return false;
- Index: java/net/sf/l2j/gameserver/RecipeController.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/RecipeController.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/RecipeController.java (copia de trabajo)
- @@ -28,7 +28,6 @@
- import java.util.Map;
- import java.util.StringTokenizer;
- import java.util.WeakHashMap;
- -import java.util.logging.Level;
- import java.util.logging.Logger;
- import javolution.util.FastList;
- @@ -427,6 +426,7 @@
- isValid = true;
- }
- + @Override
- public void run()
- {
- if (!Config.IS_CRAFTING_ENABLED)
- Index: java/net/sf/l2j/gameserver/templates/L2EtcItemType.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/templates/L2EtcItemType.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/templates/L2EtcItemType.java (copia de trabajo)
- @@ -62,6 +62,7 @@
- * Returns the name of the EtcItemType
- * @return String
- */
- + @Override
- public String toString()
- {
- return _name;
- Index: java/net/sf/l2j/gameserver/model/actor/stat/PetStat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/stat/PetStat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/stat/PetStat.java (copia de trabajo)
- @@ -42,7 +42,8 @@
- // =========================================================
- // Method - Public
- - public boolean addExp(long value)
- + @Override
- + public boolean addExp(long value)
- {
- if (!super.addExp(value)) return false;
- @@ -51,7 +52,8 @@
- return true;
- }
- - public boolean addExpAndSp(long addToExp, int addToSp)
- + @Override
- + public boolean addExpAndSp(long addToExp, int addToSp)
- {
- if (!super.addExpAndSp(addToExp, addToSp)) return false;
- @@ -65,7 +67,8 @@
- return true;
- }
- - public final boolean addLevel(byte value)
- + @Override
- + public final boolean addLevel(byte value)
- {
- if (getLevel() + value > Experience.MAX_LEVEL - 1)
- return false;
- @@ -97,7 +100,8 @@
- return levelIncreased;
- }
- - public final long getExpForLevel(int level) { return L2PetDataTable.getInstance().getPetData(getActiveChar().getNpcId(), level).getPetMaxExp(); }
- + @Override
- + public final long getExpForLevel(int level) { return L2PetDataTable.getInstance().getPetData(getActiveChar().getNpcId(), level).getPetMaxExp(); }
- // =========================================================
- // Method - Private
- @@ -104,13 +108,15 @@
- // =========================================================
- // Property - Public
- - public L2PetInstance getActiveChar() { return (L2PetInstance)super.getActiveChar(); }
- + @Override
- + public L2PetInstance getActiveChar() { return (L2PetInstance)super.getActiveChar(); }
- public final int getFeedBattle() { return getActiveChar().getPetData().getPetFeedBattle(); }
- public final int getFeedNormal() { return getActiveChar().getPetData().getPetFeedNormal(); }
- - public void setLevel(byte value)
- + @Override
- + public void setLevel(byte value)
- {
- getActiveChar().stopFeed();
- super.setLevel(value);
- @@ -124,49 +130,59 @@
- public final int getMaxFeed() { return getActiveChar().getPetData().getPetMaxFeed(); }
- - public int getMaxHp() { return (int)calcStat(Stats.MAX_HP, getActiveChar().getPetData().getPetMaxHP(), null, null); }
- + @Override
- + public int getMaxHp() { return (int)calcStat(Stats.MAX_HP, getActiveChar().getPetData().getPetMaxHP(), null, null); }
- - public int getMaxMp() { return (int)calcStat(Stats.MAX_MP, getActiveChar().getPetData().getPetMaxMP(), null, null); }
- + @Override
- + public int getMaxMp() { return (int)calcStat(Stats.MAX_MP, getActiveChar().getPetData().getPetMaxMP(), null, null); }
- - public int getMAtk(L2Character target, L2Skill skill)
- + @Override
- + public int getMAtk(L2Character target, L2Skill skill)
- {
- double attack = getActiveChar().getPetData().getPetMAtk();
- return (int)calcStat(Stats.MAGIC_ATTACK, attack, target, skill);
- }
- - public int getMDef(L2Character target, L2Skill skill)
- + @Override
- + public int getMDef(L2Character target, L2Skill skill)
- {
- double defence = getActiveChar().getPetData().getPetMDef();
- return (int)calcStat(Stats.MAGIC_DEFENCE, defence, target, skill);
- }
- - public int getPAtk(L2Character target)
- + @Override
- + public int getPAtk(L2Character target)
- {
- return (int)calcStat(Stats.POWER_ATTACK, getActiveChar().getPetData().getPetPAtk(), target, null);
- }
- - public int getPDef(L2Character target)
- + @Override
- + public int getPDef(L2Character target)
- {
- return (int)calcStat(Stats.POWER_DEFENCE, getActiveChar().getPetData().getPetPDef(), target, null);
- }
- - public int getAccuracy()
- + @Override
- + public int getAccuracy()
- {
- return (int)calcStat(Stats.ACCURACY_COMBAT, getActiveChar().getPetData().getPetAccuracy(), null, null);
- }
- - public int getCriticalHit(L2Character target, L2Skill skill)
- + @Override
- + public int getCriticalHit(L2Character target, L2Skill skill)
- {
- return (int)calcStat(Stats.CRITICAL_RATE, getActiveChar().getPetData().getPetCritical(), target, null);
- }
- - public int getEvasionRate(L2Character target)
- + @Override
- + public int getEvasionRate(L2Character target)
- {
- return (int)calcStat(Stats.EVASION_RATE, getActiveChar().getPetData().getPetEvasion(), target, null);
- }
- - public int getRunSpeed()
- + @Override
- + public int getRunSpeed()
- {
- return (int)calcStat(Stats.RUN_SPEED, getActiveChar().getPetData().getPetSpeed(), null, null);
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2ClassMasterInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2ClassMasterInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2ClassMasterInstance.java (copia de trabajo)
- @@ -18,14 +18,11 @@
- */
- package net.sf.l2j.gameserver.model.actor.instance;
- -import javolution.text.TextBuilder;
- -
- import net.sf.l2j.Config;
- import net.sf.l2j.gameserver.cache.HtmCache;
- import net.sf.l2j.gameserver.datatables.CharTemplateTable;
- import net.sf.l2j.gameserver.datatables.ItemTable;
- import net.sf.l2j.gameserver.model.base.ClassId;
- -import net.sf.l2j.gameserver.model.quest.Quest;
- import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
- import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
- import net.sf.l2j.gameserver.network.serverpackets.TutorialCloseHtml;
- Index: java/net/sf/l2j/gameserver/network/clientpackets/RequestSetPledgeCrest.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/RequestSetPledgeCrest.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/RequestSetPledgeCrest.java (copia de trabajo)
- @@ -27,6 +27,7 @@
- import net.sf.l2j.L2DatabaseFactory;
- import net.sf.l2j.gameserver.cache.CrestCache;
- import net.sf.l2j.gameserver.idfactory.BitSetIDFactory;
- +import net.sf.l2j.gameserver.idfactory.IdFactory;
- import net.sf.l2j.gameserver.model.L2Clan;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
- @@ -119,7 +120,7 @@
- return;
- }
- - int newId = BitSetIDFactory.getInstance().getNextId();
- + int newId = IdFactory.getInstance().getNextId();
- if (clan.hasCrest())
- {
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelDelete.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelDelete.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelDelete.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0])
- return false;
- @@ -59,7 +60,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/taskmanager/tasks/TaskOlympiadSave.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/tasks/TaskOlympiadSave.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/tasks/TaskOlympiadSave.java (copia de trabajo)
- @@ -36,12 +36,14 @@
- private static final Logger _log = Logger.getLogger(TaskOlympiadSave.class.getName());
- public static final String NAME = "OlympiadSave";
- - public String getName()
- + @Override
- + public String getName()
- {
- return NAME;
- }
- - public void onTimeElapsed(ExecutedTask task)
- + @Override
- + public void onTimeElapsed(ExecutedTask task)
- {
- try {
- Olympiad.getInstance().save();
- @@ -52,7 +54,8 @@
- }
- }
- - public void initializate()
- + @Override
- + public void initializate()
- {
- super.initializate();
- TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_FIXED_SHEDULED, "900000", "1800000", "");
- Index: java/net/sf/l2j/gameserver/GameTimeController.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/GameTimeController.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/GameTimeController.java (copia de trabajo)
- @@ -170,6 +170,7 @@
- _error = null;
- }
- + @Override
- public void run()
- {
- try
- @@ -203,6 +204,7 @@
- class TimerWatcher implements Runnable
- {
- + @Override
- public void run()
- {
- if (!_timer.isAlive())
- @@ -230,7 +232,8 @@
- _ended = ended;
- }
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -250,6 +253,7 @@
- */
- class BroadcastSunState implements Runnable
- {
- + @Override
- public void run()
- {
- int h = (getGameTime() / 60) % 24; // Time in hour
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/SpecialXMas.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/SpecialXMas.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/SpecialXMas.java (copia de trabajo)
- @@ -31,6 +31,7 @@
- {
- private static int[] _itemIds = { 5555 };
- + @Override
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- @@ -48,6 +49,7 @@
- /**
- * @see net.sf.l2j.gameserver.handler.IItemHandler#getItemIds()
- */
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/model/L2WorldRegion.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2WorldRegion.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2WorldRegion.java (copia de trabajo)
- @@ -118,7 +118,8 @@
- _isActivating = isActivating;
- }
- - public void run()
- + @Override
- + public void run()
- {
- if (_isActivating)
- {
- Index: java/net/sf/l2j/gameserver/Universe.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/Universe.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/Universe.java (copia de trabajo)
- @@ -105,7 +105,8 @@
- return new L2CharPosition(_x, _y, _z, 0);
- }
- - public int compareTo(Object obj)
- + @Override
- + public int compareTo(Object obj)
- {
- Position o = (Position) obj;
- int res = Integer.valueOf(_x).compareTo(o._x);
- @@ -116,7 +117,8 @@
- return res;
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- return String.valueOf(_x) + " " + _y + " " + _z + " " + _flag;
- }
- @@ -146,7 +148,8 @@
- _z = pos.z;
- }
- - public int compareTo(Object obj)
- + @Override
- + public int compareTo(Object obj)
- {
- Position o = (Position) obj;
- int res = Integer.valueOf(_x).compareTo(o._x);
- @@ -157,7 +160,8 @@
- return res;
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- return String.valueOf(_x) + " " + _y + " " + _z;
- }
- @@ -299,7 +303,8 @@
- /* (non-Javadoc)
- * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
- */
- - public boolean accept(File arg0, String name)
- + @Override
- + public boolean accept(File arg0, String name)
- {
- return name.startsWith("universe") && name.endsWith("." + ext);
- }
- @@ -429,7 +434,8 @@
- /* (non-Javadoc)
- * @see java.lang.Runnable#run()
- */
- - public void run()
- + @Override
- + public void run()
- {
- int size = coordList.size();
- if (size > 100000)
- Index: java/net/sf/l2j/gameserver/cache/FastMRUCache.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/cache/FastMRUCache.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/cache/FastMRUCache.java (copia de trabajo)
- @@ -52,7 +52,8 @@
- node = object;
- }
- - public boolean equals(Object object)
- + @Override
- + public boolean equals(Object object)
- {
- return node == object;
- }
- @@ -65,12 +66,14 @@
- private static final ObjectFactory FACTORY = new ObjectFactory()
- {
- - public Object create()
- + @Override
- + public Object create()
- {
- return new FastMRUCache();
- }
- - public void cleanup(Object obj)
- + @Override
- + public void cleanup(Object obj)
- {
- ((FastMRUCache) obj).reset();
- }
- @@ -167,7 +170,8 @@
- return result;
- }
- - public synchronized boolean remove(Object key)
- + @Override
- + public synchronized boolean remove(Object key)
- {
- _cache.remove(key);
- _mruList.remove(key);
- Index: java/net/sf/l2j/gameserver/geoeditorcon/GeoEditorListener.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/geoeditorcon/GeoEditorListener.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/geoeditorcon/GeoEditorListener.java (copia de trabajo)
- @@ -72,7 +72,8 @@
- return "Geoeditor not connected.";
- }
- - public void run()
- + @Override
- + public void run()
- {
- try (Socket connection = _serverSocket.accept())
- {
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2OlympiadManagerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2OlympiadManagerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2OlympiadManagerInstance.java (copia de trabajo)
- @@ -50,7 +50,8 @@
- super(objectId, template);
- }
- - public void onBypassFeedback (L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback (L2PcInstance player, String command)
- {
- if (command.startsWith("OlympiadDesc"))
- {
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerState.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerState.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerState.java (copia de trabajo)
- @@ -40,6 +40,7 @@
- _required = required;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- switch (_check)
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2StaticObjectInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2StaticObjectInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2StaticObjectInstance.java (copia de trabajo)
- @@ -100,7 +100,8 @@
- * this is called when a player interacts with this NPC
- * @param player
- */
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if(_type < 0) _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: "+getStaticObjectId());
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMenu.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMenu.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMenu.java (copia de trabajo)
- @@ -22,7 +22,6 @@
- import java.util.logging.Logger;
- import net.sf.l2j.Config;
- -import net.sf.l2j.L2DatabaseFactory;
- import net.sf.l2j.gameserver.LoginServerThread;
- import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
- import net.sf.l2j.gameserver.model.GMAudit;
- @@ -56,7 +55,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_ACCESSLEVEL;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -177,7 +177,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPledge.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPledge.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPledge.java (copia de trabajo)
- @@ -46,7 +46,8 @@
- "admin_pledge"
- };
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -168,7 +169,8 @@
- activeChar.sendPacket(adminReply);
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/network/clientpackets/RequestRecipeShopListSet.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/RequestRecipeShopListSet.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/RequestRecipeShopListSet.java (copia de trabajo)
- @@ -19,6 +19,7 @@
- package net.sf.l2j.gameserver.network.clientpackets;
- import net.sf.l2j.Config;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.L2ManufactureItem;
- import net.sf.l2j.gameserver.model.L2ManufactureList;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- @@ -65,7 +66,7 @@
- return;
- }
- - if (player.isInsideZone(L2PcInstance.ZONE_NOSTORE))
- + if (player.isInsideZone(L2Character.ZONE_NOSTORE))
- {
- player.sendPacket(new SystemMessage(SystemMessage.NO_PRIVATE_WORKSHOP_HERE));
- player.sendPacket(new ActionFailed());
- Index: java/net/sf/l2j/gameserver/model/L2Potion.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2Potion.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2Potion.java (copia de trabajo)
- @@ -55,6 +55,7 @@
- _instance = instance;
- }
- + @Override
- public void run()
- {
- try
- @@ -148,6 +149,7 @@
- _instance = instance;
- }
- + @Override
- public void run()
- {
- try
- @@ -216,7 +218,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.model.L2Object#isAttackable()
- */
- - public boolean isAutoAttackable(@SuppressWarnings("unused") L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(@SuppressWarnings("unused") L2Character attacker)
- {
- return false;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectCharmOfLuck.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectCharmOfLuck.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectCharmOfLuck.java (copia de trabajo)
- @@ -34,13 +34,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.CHARM_OF_LUCK;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- if (getEffected() instanceof L2PlayableInstance)
- ((L2PlayableInstance)getEffected()).startCharmOfLuck();
- @@ -47,13 +49,15 @@
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- if (getEffected() instanceof L2PlayableInstance)
- ((L2PlayableInstance)getEffected()).stopCharmOfLuck(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- // just stop this effect
- return false;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRepairChar.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRepairChar.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRepairChar.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_CHAR_EDIT;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -58,7 +59,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2DoormenInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2DoormenInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2DoormenInstance.java (copia de trabajo)
- @@ -63,7 +63,8 @@
- return _ClanHall;
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- int condition = validateCondition(player);
- if (condition <= Cond_All_False) return;
- @@ -139,7 +140,8 @@
- * this is called when a player interacts with this NPC
- * @param player
- */
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- return;
- Index: java/net/sf/l2j/gameserver/model/entity/DimensionalRift.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/entity/DimensionalRift.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/entity/DimensionalRift.java (copia de trabajo)
- @@ -158,7 +158,8 @@
- earthQuakeTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- for (L2PcInstance p : _party.getPartyMembers())
- p.sendPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 65, 9));
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/RollingDice.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/RollingDice.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/RollingDice.java (copia de trabajo)
- @@ -19,6 +19,7 @@
- package net.sf.l2j.gameserver.handler.itemhandlers;
- import net.sf.l2j.gameserver.handler.IItemHandler;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.L2ItemInstance;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.model.actor.instance.L2PlayableInstance;
- @@ -36,7 +37,8 @@
- {
- private static int[] _itemIds = { 4625, 4626, 4627, 4628 };
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -74,7 +76,7 @@
- activeChar.sendPacket(sm);
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_PEACE))
- + if (activeChar.isInsideZone(L2Character.ZONE_PEACE))
- Broadcast.toKnownPlayers(activeChar, sm);
- else if (activeChar.isInParty())
- activeChar.getParty().broadcastToPartyMembers(activeChar,sm);
- @@ -81,7 +83,8 @@
- }
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBan.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBan.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBan.java (copia de trabajo)
- @@ -48,7 +48,8 @@
- };
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -231,7 +232,8 @@
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/funcs/FuncAdd.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/FuncAdd.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/FuncAdd.java (copia de trabajo)
- @@ -29,6 +29,7 @@
- super(stat, order, owner);
- _lambda = lambda;
- }
- + @Override
- public void calc(Env env)
- {
- if (_cond == null || _cond.test(env))
- Index: java/net/sf/l2j/gameserver/script/ScriptDocument.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/ScriptDocument.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/ScriptDocument.java (copia de trabajo)
- @@ -78,7 +78,8 @@
- return _name;
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- return _name;
- }
- Index: java/net/sf/l2j/ConsoleLogFormatter.java
- ===================================================================
- --- java/net/sf/l2j/ConsoleLogFormatter.java (revisión: 598)
- +++ java/net/sf/l2j/ConsoleLogFormatter.java (copia de trabajo)
- @@ -37,7 +37,8 @@
- */
- private static final String CRLF = "\r\n";
- - public String format(LogRecord record)
- + @Override
- + public String format(LogRecord record)
- {
- TextBuilder output = new TextBuilder();
- output.append(record.getMessage());
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPetition.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPetition.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPetition.java (copia de trabajo)
- @@ -37,6 +37,7 @@
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -96,6 +97,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/DisMount.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/DisMount.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/DisMount.java (copia de trabajo)
- @@ -33,7 +33,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public synchronized boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0]) return false;
- @@ -56,7 +57,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/events/EventHandler.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/events/EventHandler.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/events/EventHandler.java (copia de trabajo)
- @@ -36,7 +36,8 @@
- return _owner;
- }
- - public final boolean equals(Object object)
- + @Override
- + public final boolean equals(Object object)
- {
- if (object instanceof EventHandler && _owner == ((EventHandler)object)._owner)
- return true;
- Index: java/net/sf/l2j/gameserver/model/quest/Quest.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/quest/Quest.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/quest/Quest.java (copia de trabajo)
- @@ -24,7 +24,6 @@
- import java.sql.PreparedStatement;
- import java.sql.ResultSet;
- import java.util.Collection;
- -import java.util.List;
- import java.util.Map;
- import java.util.concurrent.locks.ReentrantReadWriteLock;
- import java.util.logging.Level;
- @@ -38,7 +37,6 @@
- import net.sf.l2j.gameserver.ThreadPoolManager;
- import net.sf.l2j.gameserver.cache.HtmCache;
- import net.sf.l2j.gameserver.datatables.NpcTable;
- -import net.sf.l2j.gameserver.idfactory.IdFactory;
- import net.sf.l2j.gameserver.instancemanager.QuestManager;
- import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.L2Object;
- @@ -473,7 +471,8 @@
- {
- ThreadPoolManager.getInstance().executeAi(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- String res = null;
- try
- @@ -494,7 +493,8 @@
- {
- ThreadPoolManager.getInstance().executeAi(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- String res = null;
- try
- @@ -543,7 +543,8 @@
- {
- ThreadPoolManager.getInstance().executeAi(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- String res = null;
- try
- @@ -1323,7 +1324,8 @@
- _npc = npc;
- }
- - public void run()
- + @Override
- + public void run()
- {
- _npc.onDecay();
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2FishermanInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2FishermanInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2FishermanInstance.java (copia de trabajo)
- @@ -41,6 +41,7 @@
- super(objectId, template);
- }
- + @Override
- public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- @@ -53,6 +54,7 @@
- return "data/html/fisherman/" + pom + ".htm";
- }
- + @Override
- public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.startsWith("FishSkillList"))
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2TeleporterInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2TeleporterInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2TeleporterInstance.java (copia de trabajo)
- @@ -53,7 +53,8 @@
- super(objectId, template);
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- player.sendPacket(new ActionFailed());
- @@ -91,7 +92,8 @@
- super.onBypassFeedback(player, command);
- }
- - public String getHtmlPath(int npcId, int val)
- + @Override
- + public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- if (val == 0)
- @@ -106,7 +108,8 @@
- return "data/html/teleporter/" + pom + ".htm";
- }
- - public void showChatWindow(L2PcInstance player)
- + @Override
- + public void showChatWindow(L2PcInstance player)
- {
- String filename = "data/html/teleporter/castleteleporter-no.htm";
- Index: java/net/sf/l2j/gameserver/script/faenor/FaenorScriptEngine.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/faenor/FaenorScriptEngine.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/faenor/FaenorScriptEngine.java (copia de trabajo)
- @@ -84,7 +84,8 @@
- FileFilter fileFilter = new FileFilter()
- {
- - public boolean accept(File file)
- + @Override
- + public boolean accept(File file)
- {
- return file.getName().endsWith(".zip");
- }
- @@ -200,7 +201,8 @@
- }
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- if (scripts.isEmpty()) return "No Packages Loaded.";
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectPetrification.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectPetrification.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectPetrification.java (copia de trabajo)
- @@ -28,12 +28,14 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return L2Effect.EffectType.PETRIFICATION;
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().startAbnormalEffect((short)0x0800);
- getEffected().startParalyze();
- @@ -40,7 +42,8 @@
- getEffected().setIsInvul(true);
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopAbnormalEffect((short)0x0800);
- getEffected().stopParalyze(this);
- @@ -47,7 +50,8 @@
- getEffected().setIsInvul(false);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- return false;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2GuardInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2GuardInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2GuardInstance.java (copia de trabajo)
- @@ -53,7 +53,8 @@
- public class ReturnTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)
- returnHome();
- @@ -80,7 +81,8 @@
- ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new ReturnTask(),RETURN_INTERVAL,RETURN_INTERVAL+Rnd.nextInt(60000));
- }
- - public final GuardKnownList getKnownList()
- + @Override
- + public final GuardKnownList getKnownList()
- {
- if (super.getKnownList() == null || !(super.getKnownList() instanceof GuardKnownList))
- setKnownList(new GuardKnownList(this));
- @@ -90,6 +92,7 @@
- /**
- * Return True if hte attacker is a L2MonsterInstance.<BR><BR>
- */
- + @Override
- public boolean isAutoAttackable(L2Character attacker)
- {
- return attacker instanceof L2MonsterInstance;
- @@ -110,6 +113,7 @@
- /**
- * Set the home location of its L2GuardInstance.<BR><BR>
- */
- + @Override
- public void onSpawn()
- {
- super.onSpawn();
- @@ -131,6 +135,7 @@
- * @param val The number of the page to display
- *
- */
- + @Override
- public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- @@ -165,6 +170,7 @@
- * @param player The L2PcInstance that start an action on the L2GuardInstance
- *
- */
- + @Override
- public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2PlayableInstance.java (copia de trabajo)
- @@ -59,7 +59,8 @@
- getStatus();
- }
- - public PlayableKnownList getKnownList()
- + @Override
- + public PlayableKnownList getKnownList()
- {
- if (super.getKnownList() == null || !(super.getKnownList() instanceof PlayableKnownList))
- setKnownList(new PlayableKnownList(this));
- @@ -66,7 +67,8 @@
- return (PlayableKnownList)super.getKnownList();
- }
- - public PlayableStat getStat()
- + @Override
- + public PlayableStat getStat()
- {
- if (super.getStat() == null || !(super.getStat() instanceof PlayableStat))
- setStat(new PlayableStat(this));
- @@ -73,7 +75,8 @@
- return (PlayableStat)super.getStat();
- }
- - public PlayableStatus getStatus()
- + @Override
- + public PlayableStatus getStatus()
- {
- if (super.getStatus() == null || !(super.getStatus() instanceof PlayableStatus))
- setStatus(new PlayableStatus(this));
- @@ -80,7 +83,8 @@
- return (PlayableStatus)super.getStatus();
- }
- - public boolean doDie(L2Character killer)
- + @Override
- + public boolean doDie(L2Character killer)
- {
- if (!super.doDie(killer))
- return false;
- @@ -125,7 +129,8 @@
- /**
- * Return True.<BR><BR>
- */
- - public boolean isAttackable()
- + @Override
- + public boolean isAttackable()
- {
- return true;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRideWyvern.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRideWyvern.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRideWyvern.java (copia de trabajo)
- @@ -41,7 +41,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_RIDER;
- private int PetRideId;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -88,7 +89,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminZone.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminZone.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminZone.java (copia de trabajo)
- @@ -23,6 +23,7 @@
- import net.sf.l2j.Config;
- import net.sf.l2j.gameserver.datatables.MapRegionTable;
- import net.sf.l2j.gameserver.handler.IAdminCommandHandler;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- public class AdminZone implements IAdminCommandHandler
- @@ -60,55 +61,55 @@
- if (actualCommand.equalsIgnoreCase("admin_zone_check"))
- {
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_PVP))
- + if (activeChar.isInsideZone(L2Character.ZONE_PVP))
- {
- activeChar.sendMessage("This is a PvP zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_NOLANDING))
- + if (activeChar.isInsideZone(L2Character.ZONE_NOLANDING))
- {
- activeChar.sendMessage("This is a non-landing zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_PEACE))
- + if (activeChar.isInsideZone(L2Character.ZONE_PEACE))
- {
- activeChar.sendMessage("This is a Peace zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_SIEGE))
- + if (activeChar.isInsideZone(L2Character.ZONE_SIEGE))
- {
- activeChar.sendMessage("This is a Siege zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_MOTHERTREE))
- + if (activeChar.isInsideZone(L2Character.ZONE_MOTHERTREE))
- {
- activeChar.sendMessage("This is a Mother Tree zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_CLANHALL))
- + if (activeChar.isInsideZone(L2Character.ZONE_CLANHALL))
- {
- activeChar.sendMessage("This is a Clan Hall zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_WATER))
- + if (activeChar.isInsideZone(L2Character.ZONE_WATER))
- {
- activeChar.sendMessage("This is a Water zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_JAIL))
- + if (activeChar.isInsideZone(L2Character.ZONE_JAIL))
- {
- activeChar.sendMessage("This is a Jail zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_MONSTERTRACK))
- + if (activeChar.isInsideZone(L2Character.ZONE_MONSTERTRACK))
- {
- activeChar.sendMessage("This is a Monster Track zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_NOHQ))
- + if (activeChar.isInsideZone(L2Character.ZONE_NOHQ))
- {
- activeChar.sendMessage("This is a Castle zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_UNUSED))
- + if (activeChar.isInsideZone(L2Character.ZONE_UNUSED))
- {
- activeChar.sendMessage("This zone is not used.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_BOSS))
- + if (activeChar.isInsideZone(L2Character.ZONE_BOSS))
- {
- activeChar.sendMessage("This is a Boss zone.");
- }
- - if (activeChar.isInsideZone(L2PcInstance.ZONE_DANGERAREA))
- + if (activeChar.isInsideZone(L2Character.ZONE_DANGERAREA))
- {
- activeChar.sendMessage("This is a Danger Area zone.");
- }
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelListUpdate.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelListUpdate.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/ChannelListUpdate.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0])
- return false;
- @@ -51,7 +52,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/stat/SummonStat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/stat/SummonStat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/stat/SummonStat.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- // =========================================================
- // Property - Public
- - public L2Summon getActiveChar()
- + @Override
- + public L2Summon getActiveChar()
- {
- return (L2Summon)super.getActiveChar();
- }
- Index: java/net/sf/l2j/gameserver/SevenSigns.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/SevenSigns.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/SevenSigns.java (copia de trabajo)
- @@ -30,7 +30,6 @@
- import net.sf.l2j.Config;
- import net.sf.l2j.L2DatabaseFactory;
- -import net.sf.l2j.gameserver.datatables.MapRegionTable;
- import net.sf.l2j.gameserver.instancemanager.CastleManager;
- import net.sf.l2j.gameserver.model.AutoChatHandler;
- import net.sf.l2j.gameserver.model.AutoSpawnHandler;
- @@ -1225,7 +1224,8 @@
- */
- protected class SevenSignsPeriodChange implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- /*
- * Remember the period check here refers to the period just ENDED!
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDoorControl.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDoorControl.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDoorControl.java (copia de trabajo)
- @@ -57,7 +57,8 @@
- "admin_closeall"
- };
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -148,7 +149,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGmChat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGmChat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGmChat.java (copia de trabajo)
- @@ -36,6 +36,7 @@
- private static String[] _adminCommands = {"admin_gmchat", "admin_snoop"};
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -74,6 +75,7 @@
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/model/actor/knownlist/SiegeGuardKnownList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/knownlist/SiegeGuardKnownList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/knownlist/SiegeGuardKnownList.java (copia de trabajo)
- @@ -38,8 +38,10 @@
- // =========================================================
- // Method - Public
- - public boolean addKnownObject(L2Object object) { return addKnownObject(object, null); }
- - public boolean addKnownObject(L2Object object, L2Character dropper)
- + @Override
- + public boolean addKnownObject(L2Object object) { return addKnownObject(object, null); }
- + @Override
- + public boolean addKnownObject(L2Object object, L2Character dropper)
- {
- if (!super.addKnownObject(object, dropper)) return false;
- @@ -65,5 +67,6 @@
- // =========================================================
- // Property - Public
- - public final L2SiegeGuardInstance getActiveChar() { return (L2SiegeGuardInstance)super.getActiveChar(); }
- + @Override
- + public final L2SiegeGuardInstance getActiveChar() { return (L2SiegeGuardInstance)super.getActiveChar(); }
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/datatables/ItemTable.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/datatables/ItemTable.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/datatables/ItemTable.java (copia de trabajo)
- @@ -822,7 +822,8 @@
- _item = item;
- }
- - public void run()
- + @Override
- + public void run()
- {
- _item.setOwnerId(0);
- _item.setItemLootSchedule(null);
- Index: java/net/sf/l2j/gameserver/taskmanager/AttackStanceTaskManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/AttackStanceTaskManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/AttackStanceTaskManager.java (copia de trabajo)
- @@ -93,7 +93,8 @@
- // Do nothing
- }
- - public void run()
- + @Override
- + public void run()
- {
- Long current = System.currentTimeMillis();
- try
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionItemId.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionItemId.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionItemId.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- _itemId = itemId;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (env.item == null)
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectChameleonRest.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectChameleonRest.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectChameleonRest.java (copia de trabajo)
- @@ -32,13 +32,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.RELAXING;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- if (getEffected() instanceof L2PcInstance)
- @@ -54,7 +56,8 @@
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- if (getEffected() instanceof L2PcInstance)
- @@ -66,7 +69,8 @@
- super.onExit();
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- boolean retval = true;
- L2PcInstance effected = (L2PcInstance)getEffected();
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/CompSpiritShotPacks.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/CompSpiritShotPacks.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/CompSpiritShotPacks.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- {
- private static int[] _itemIds = { 5140, 5141, 5142, 5143, 5144, 5145, 5256, 5257, 5258, 5259, 5260, 5261 };
- + @Override
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- @@ -64,6 +65,7 @@
- ItemList playerUI = new ItemList(activeChar, false);
- activeChar.sendPacket(playerUI);
- }
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2AdventurerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2AdventurerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2AdventurerInstance.java (copia de trabajo)
- @@ -39,7 +39,8 @@
- super(objectId, template);
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.startsWith("npcfind_byid"))
- {
- @@ -81,7 +82,8 @@
- }
- }
- - public String getHtmlPath(int npcId, int val)
- + @Override
- + public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPForge.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPForge.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPForge.java (copia de trabajo)
- @@ -40,7 +40,8 @@
- private static String[] _adminCommands = {"admin_forge","admin_forge2","admin_forge3" };
- private static final int REQUIRED_LEVEL = Config.GM_MIN;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -226,7 +227,8 @@
- adminReply.setHtml(replyMSG.toString());
- activeChar.sendPacket(adminReply);
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/FileLogFormatter.java
- ===================================================================
- --- java/net/sf/l2j/FileLogFormatter.java (revisión: 598)
- +++ java/net/sf/l2j/FileLogFormatter.java (copia de trabajo)
- @@ -39,6 +39,7 @@
- private static final String TAB = "\t";
- private SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss,SSS");
- + @Override
- public String format(LogRecord record)
- {
- TextBuilder output = new TextBuilder();
- Index: java/net/sf/l2j/gameserver/templates/L2Armor.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/templates/L2Armor.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/templates/L2Armor.java (copia de trabajo)
- @@ -73,6 +73,7 @@
- * Returns the type of the armor.
- * @return L2ArmorType
- */
- + @Override
- public L2ArmorType getItemType()
- {
- return (L2ArmorType)super._type;
- @@ -82,6 +83,7 @@
- * Returns the ID of the item after applying the mask.
- * @return int : ID of the item
- */
- + @Override
- public final int getItemMask()
- {
- return getItemType().mask();
- @@ -147,7 +149,8 @@
- * @param player : L2Character pointing out the player
- * @return Func[] : array of functions
- */
- - public Func[] getStatFuncs(L2ItemInstance instance, L2Character player)
- + @Override
- + public Func[] getStatFuncs(L2ItemInstance instance, L2Character player)
- {
- List<Func> funcs = new FastList<>();
- if (_funcTemplates != null)
- Index: java/net/sf/l2j/gameserver/model/actor/knownlist/SummonKnownList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/knownlist/SummonKnownList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/knownlist/SummonKnownList.java (copia de trabajo)
- @@ -41,13 +41,16 @@
- // =========================================================
- // Property - Public
- - public final L2Summon getActiveChar() { return (L2Summon)super.getActiveChar(); }
- + @Override
- + public final L2Summon getActiveChar() { return (L2Summon)super.getActiveChar(); }
- - public int getDistanceToForgetObject(L2Object object)
- + @Override
- + public int getDistanceToForgetObject(L2Object object)
- {
- if (object == getActiveChar().getOwner() || object == getActiveChar().getTarget()) return 6000;
- return 3000;
- }
- - public int getDistanceToWatchObject(L2Object object) { return 1500; }
- + @Override
- + public int getDistanceToWatchObject(L2Object object) { return 1500; }
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/CompShotPacks.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/CompShotPacks.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/CompShotPacks.java (copia de trabajo)
- @@ -39,6 +39,7 @@
- //5146, 5147, 5148, 5149, 5150, 5151, /**/ 5262, 5263, 5264, 5265, 5266, 5267 // BSpS
- };
- + @Override
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- @@ -86,6 +87,7 @@
- activeChar.sendPacket(playerUI);
- }
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectBigHead.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectBigHead.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectBigHead.java (copia de trabajo)
- @@ -31,21 +31,25 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.BUFF;
- }
- + @Override
- public void onStart()
- {
- getEffected().startAbnormalEffect((short)0x02000);
- }
- + @Override
- public void onExit()
- {
- getEffected().stopAbnormalEffect((short)0x02000);
- }
- + @Override
- public boolean onActionTime()
- {
- return false;
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerHp.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerHp.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerHp.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- _hp = hp;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPathNode.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPathNode.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPathNode.java (copia de trabajo)
- @@ -39,7 +39,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_CREATE_NODES;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -102,7 +103,8 @@
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/L2PetData.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2PetData.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2PetData.java (copia de trabajo)
- @@ -400,7 +400,8 @@
- petRegenMP = pPetRegenMP;
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- return "PetID: " + getPetID() + " \t" + "PetLevel: " + getPetLevel() + " \t" +
- // PET_EXP + ": " + getPetExp() + " \t" +
- Index: java/net/sf/l2j/gameserver/script/faenor/FaenorParser.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/script/faenor/FaenorParser.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/script/faenor/FaenorParser.java (copia de trabajo)
- @@ -129,5 +129,6 @@
- /**
- * @param script
- */
- - public abstract void parseScript(Node node, ScriptContext context);
- + @Override
- + public abstract void parseScript(Node node, ScriptContext context);
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectConfusion.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectConfusion.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectConfusion.java (copia de trabajo)
- @@ -22,7 +22,6 @@
- import javolution.util.FastList;
- -import net.sf.l2j.Config;
- import net.sf.l2j.gameserver.ai.CtrlIntention;
- import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.L2Effect;
- @@ -43,13 +42,15 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.CONFUSION;
- }
- /** Notify started */
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().startConfused();
- onActionTime();
- @@ -56,12 +57,14 @@
- }
- /** Notify exited */
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopConfused(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- List<L2Character> targetList = new FastList<>();
- Index: java/net/sf/l2j/gameserver/skills/funcs/LambdaConst.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/LambdaConst.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/LambdaConst.java (copia de trabajo)
- @@ -33,6 +33,7 @@
- {
- _value = value;
- }
- + @Override
- public double calc(@SuppressWarnings("unused") Env env)
- {
- return _value;
- Index: java/net/sf/l2j/gameserver/datatables/ClanTable.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/datatables/ClanTable.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/datatables/ClanTable.java (copia de trabajo)
- @@ -394,7 +394,8 @@
- {
- ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (getClan(clanId) == null)
- Index: java/net/sf/l2j/util/L2LogManager.java
- ===================================================================
- --- java/net/sf/l2j/util/L2LogManager.java (revisión: 598)
- +++ java/net/sf/l2j/util/L2LogManager.java (copia de trabajo)
- @@ -31,7 +31,8 @@
- super();
- }
- - public void reset()
- + @Override
- + public void reset()
- {
- // do nothing
- }
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfEscape.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfEscape.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfEscape.java (copia de trabajo)
- @@ -55,7 +55,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IItemHandler#useItem(net.sf.l2j.gameserver.model.L2PcInstance, net.sf.l2j.gameserver.model.L2ItemInstance)
- */
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance)) return;
- L2PcInstance activeChar = (L2PcInstance)playable;
- @@ -154,7 +155,8 @@
- }
- - public void run()
- + @Override
- + public void run()
- {
- if (_activeChar.isDead())
- return;
- @@ -281,7 +283,8 @@
- }
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- {
- private static int[] _itemIds = { 5146, 5147, 5148, 5149, 5150, 5151, 5262, 5263, 5264, 5265, 5266, 5267 };
- + @Override
- public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- @@ -65,6 +66,7 @@
- activeChar.sendPacket(playerUI);
- }
- + @Override
- public int[] getItemIds()
- {
- return _itemIds;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRes.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRes.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRes.java (copia de trabajo)
- @@ -43,6 +43,7 @@
- private static String[] _adminCommands = {"admin_res", "admin_res_monster"};
- private static final int REQUIRED_LEVEL = Config.GM_RES;
- + @Override
- public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- @@ -66,6 +67,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2XmassTreeInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2XmassTreeInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2XmassTreeInstance.java (copia de trabajo)
- @@ -46,7 +46,8 @@
- _caster = caster;
- }
- - public void run()
- + @Override
- + public void run()
- {
- for (L2PcInstance player : getKnownList().getKnownPlayers().values())
- @@ -83,7 +84,8 @@
- 3000);
- }
- - public void deleteMe()
- + @Override
- + public void deleteMe()
- {
- if (aiTask != null)
- {
- @@ -95,7 +97,8 @@
- super.deleteMe();
- }
- - public int getDistanceToWatchObject(L2Object object)
- + @Override
- + public int getDistanceToWatchObject(L2Object object)
- {
- return 900;
- }
- @@ -103,7 +106,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.model.L2Object#isAttackable()
- */
- - public boolean isAutoAttackable(@SuppressWarnings("unused")
- + @Override
- + public boolean isAutoAttackable(@SuppressWarnings("unused")
- L2Character attacker)
- {
- return false;
- Index: java/net/sf/l2j/gameserver/model/actor/knownlist/RaceManagerKnownList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/knownlist/RaceManagerKnownList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/knownlist/RaceManagerKnownList.java (copia de trabajo)
- @@ -39,8 +39,10 @@
- // =========================================================
- // Method - Public
- - public boolean addKnownObject(L2Object object) { return addKnownObject(object, null); }
- - public boolean addKnownObject(L2Object object, L2Character dropper)
- + @Override
- + public boolean addKnownObject(L2Object object) { return addKnownObject(object, null); }
- + @Override
- + public boolean addKnownObject(L2Object object, L2Character dropper)
- {
- if (!super.addKnownObject(object, dropper))
- return false;
- @@ -48,7 +50,8 @@
- return true;
- }
- - public boolean removeKnownObject(L2Object object)
- + @Override
- + public boolean removeKnownObject(L2Object object)
- {
- if (!super.removeKnownObject(object)) return false;
- @@ -70,5 +73,6 @@
- // =========================================================
- // Property - Public
- - public L2RaceManagerInstance getActiveChar() { return (L2RaceManagerInstance)super.getActiveChar(); }
- + @Override
- + public L2RaceManagerInstance getActiveChar() { return (L2RaceManagerInstance)super.getActiveChar(); }
- }
- \ No newline at end of file
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2PetInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2PetInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2PetInstance.java (copia de trabajo)
- @@ -118,7 +118,8 @@
- */
- class FeedTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -242,7 +243,8 @@
- _maxload = getPetData().getPetMaxLoad();
- }
- - public PetStat getStat()
- + @Override
- + public PetStat getStat()
- {
- if (super.getStat() == null || !(super.getStat() instanceof PetStat))
- setStat(new PetStat(this));
- @@ -249,7 +251,8 @@
- return (PetStat)super.getStat();
- }
- - public double getLevelMod()
- + @Override
- + public double getLevelMod()
- {
- return (100.0 - 11 + getLevel()) / 100.0;
- }
- @@ -259,12 +262,14 @@
- return _respawned;
- }
- - public int getSummonType()
- + @Override
- + public int getSummonType()
- {
- return 2;
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- boolean isOwner = player.getObjectId() == getOwner().getObjectId();
- @@ -327,7 +332,8 @@
- player.sendPacket(new ActionFailed());
- }
- - public int getControlItemId()
- + @Override
- + public int getControlItemId()
- {
- return _controlItemId;
- }
- @@ -337,7 +343,8 @@
- return getOwner().getInventory().getItemByObjectId(_controlItemId);
- }
- - public int getCurrentFed()
- + @Override
- + public int getCurrentFed()
- {
- return _curFed;
- }
- @@ -350,7 +357,8 @@
- /**
- * Returns the pet's currently equipped weapon instance (if any).
- */
- - public L2ItemInstance getActiveWeaponInstance()
- + @Override
- + public L2ItemInstance getActiveWeaponInstance()
- {
- for (L2ItemInstance item : getInventory().getItems())
- {
- @@ -370,7 +378,8 @@
- /**
- * Returns the pet's currently equipped weapon (if any).
- */
- - public L2Weapon getActiveWeaponItem()
- + @Override
- + public L2Weapon getActiveWeaponItem()
- {
- L2ItemInstance weapon = getActiveWeaponInstance();
- @@ -382,7 +391,8 @@
- }
- - public L2ItemInstance getSecondaryWeaponInstance()
- + @Override
- + public L2ItemInstance getSecondaryWeaponInstance()
- {
- // temporary? unavailable
- return null;
- @@ -389,13 +399,15 @@
- }
- - public L2Weapon getSecondaryWeaponItem()
- + @Override
- + public L2Weapon getSecondaryWeaponItem()
- {
- // temporary? unavailable
- return null;
- }
- - public PetInventory getInventory()
- + @Override
- + public PetInventory getInventory()
- {
- return _inventory;
- }
- @@ -409,7 +421,8 @@
- * @param sendMessage : boolean Specifies whether to send message to Client about this action
- * @return boolean informing if the action was successful
- */
- - public boolean destroyItem(String process, int objectId, int count, L2Object reference, boolean sendMessage)
- + @Override
- + public boolean destroyItem(String process, int objectId, int count, L2Object reference, boolean sendMessage)
- {
- L2ItemInstance item = _inventory.destroyItem(process, objectId, count, getOwner(), reference);
- @@ -447,7 +460,8 @@
- * @param sendMessage : boolean Specifies whether to send message to Client about this action
- * @return boolean informing if the action was successfull
- */
- - public boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference, boolean sendMessage)
- + @Override
- + public boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference, boolean sendMessage)
- {
- L2ItemInstance item = _inventory.destroyItemByItemId(process, itemId, count, getOwner(), reference);
- @@ -475,7 +489,8 @@
- return true;
- }
- - protected void doPickupItem(L2Object object)
- + @Override
- + protected void doPickupItem(L2Object object)
- {
- boolean follow = getFollowStatus();
- @@ -586,13 +601,15 @@
- }
- - public void deleteMe(L2PcInstance owner)
- + @Override
- + public void deleteMe(L2PcInstance owner)
- {
- super.deleteMe(owner);
- destroyControlItem(owner); //this should also delete the pet from the db
- }
- - public boolean doDie(L2Character killer)
- + @Override
- + public boolean doDie(L2Character killer)
- {
- if (!super.doDie(killer, true))
- return false;
- @@ -608,7 +625,8 @@
- return true;
- }
- - public void doRevive()
- + @Override
- + public void doRevive()
- {
- getOwner().removeReviving();
- @@ -623,7 +641,8 @@
- getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
- }
- - public void doRevive(double revivePower)
- + @Override
- + public void doRevive(double revivePower)
- {
- // Restore the pet's lost experience,
- // depending on the % return of the skill used (based on its power).
- @@ -684,7 +703,8 @@
- return newItem;
- }
- - public void giveAllToOwner()
- + @Override
- + public void giveAllToOwner()
- {
- try
- {
- @@ -809,7 +829,8 @@
- }
- /** @return Returns the mountable. */
- - public boolean isMountable()
- + @Override
- + public boolean isMountable()
- {
- return _mountable;
- }
- @@ -864,7 +885,8 @@
- return pet;
- }
- - public void store()
- + @Override
- + public void store()
- {
- if (getControlItemId() == 0)
- {
- @@ -928,7 +950,8 @@
- _feedTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FeedTask(), 10000, 10000);
- }
- - public synchronized void unSummon(L2PcInstance owner)
- + @Override
- + public synchronized void unSummon(L2PcInstance owner)
- {
- stopFeed();
- super.unSummon(owner);
- @@ -971,7 +994,8 @@
- getStat().addExp(-lostExp);
- }
- - public void addExpAndSp(long addToExp, int addToSp)
- + @Override
- + public void addExpAndSp(long addToExp, int addToSp)
- {
- if (getNpcId() == 12564) // Sin Eater
- getStat().addExpAndSp(Math.round(addToExp * Config.SINEATER_XP_RATE), addToSp);
- @@ -979,78 +1003,93 @@
- getStat().addExpAndSp(Math.round(addToExp * Config.PET_XP_RATE), addToSp);
- }
- - public long getExpForThisLevel()
- + @Override
- + public long getExpForThisLevel()
- {
- return getStat().getExpForLevel(getLevel());
- }
- - public long getExpForNextLevel()
- + @Override
- + public long getExpForNextLevel()
- {
- return getStat().getExpForLevel(getLevel() + 1);
- }
- - public final int getLevel()
- + @Override
- + public final int getLevel()
- {
- return getStat().getLevel();
- }
- - public int getMaxFed()
- + @Override
- + public int getMaxFed()
- {
- return getStat().getMaxFeed();
- }
- - public int getAccuracy()
- + @Override
- + public int getAccuracy()
- {
- return getStat().getAccuracy();
- }
- - public int getCriticalHit(L2Character target, L2Skill skill)
- + @Override
- + public int getCriticalHit(L2Character target, L2Skill skill)
- {
- return getStat().getCriticalHit(target, skill);
- }
- - public int getEvasionRate(L2Character target)
- + @Override
- + public int getEvasionRate(L2Character target)
- {
- return getStat().getEvasionRate(target);
- }
- - public int getRunSpeed()
- + @Override
- + public int getRunSpeed()
- {
- return getStat().getRunSpeed();
- }
- - public int getPAtkSpd()
- + @Override
- + public int getPAtkSpd()
- {
- return getStat().getPAtkSpd();
- }
- - public int getMAtkSpd()
- + @Override
- + public int getMAtkSpd()
- {
- return getStat().getMAtkSpd();
- }
- - public int getMAtk(L2Character target, L2Skill skill)
- + @Override
- + public int getMAtk(L2Character target, L2Skill skill)
- {
- return getStat().getMAtk(target, skill);
- }
- - public int getMDef(L2Character target, L2Skill skill)
- + @Override
- + public int getMDef(L2Character target, L2Skill skill)
- {
- return getStat().getMDef(target, skill);
- }
- - public int getPAtk(L2Character target)
- + @Override
- + public int getPAtk(L2Character target)
- {
- return getStat().getPAtk(target);
- }
- - public int getPDef(L2Character target)
- + @Override
- + public int getPDef(L2Character target)
- {
- return getStat().getPDef(target);
- }
- - public final int getSkillLevel(int skillId)
- + @Override
- + public final int getSkillLevel(int skillId)
- {
- if (_Skills == null || _Skills.get(skillId) == null)
- return -1;
- @@ -1158,12 +1197,14 @@
- _jewel = id;
- }
- - public final int getWeapon()
- + @Override
- + public final int getWeapon()
- {
- return _weapon;
- }
- - public final int getArmor()
- + @Override
- + public final int getArmor()
- {
- return _armor;
- }
- @@ -1173,7 +1214,8 @@
- return _jewel;
- }
- - public final void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss)
- + @Override
- + public final void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss)
- {
- if (miss)
- {
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/MercTicket.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/MercTicket.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/MercTicket.java (copia de trabajo)
- @@ -46,7 +46,8 @@
- * 2) If allowed, call the MercTicketManager to add the item and spawn in the world
- * 3) Remove the item from the person's inventory
- */
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- int itemId = item.getItemId();
- L2PcInstance activeChar = (L2PcInstance)playable;
- @@ -133,7 +134,8 @@
- }
- // left in here for backward compatibility
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return MercTicketManager.getInstance().getItemIds();
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectParalyze.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectParalyze.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectParalyze.java (copia de trabajo)
- @@ -28,12 +28,14 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.PARALYZE;
- }
- - public void onStart()
- + @Override
- + public void onStart()
- {
- getEffected().startAbnormalEffect((short)0x0400);
- @@ -40,13 +42,15 @@
- getEffected().startParalyze();
- }
- - public void onExit()
- + @Override
- + public void onExit()
- {
- getEffected().stopAbnormalEffect((short)0x0400);
- getEffected().stopParalyze(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- return false;
- }
- Index: java/net/sf/l2j/gameserver/cache/WarehouseCacheManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/cache/WarehouseCacheManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/cache/WarehouseCacheManager.java (copia de trabajo)
- @@ -58,6 +58,7 @@
- public class CacheScheduler implements Runnable
- {
- + @Override
- public void run()
- {
- long cTime = System.currentTimeMillis();
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java (copia de trabajo)
- @@ -43,7 +43,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(@SuppressWarnings("unused") int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(@SuppressWarnings("unused") int id, L2PcInstance activeChar)
- {
- if (activeChar.isCastingNow() || activeChar.isMovementDisabled() || activeChar.isAlikeDead() ||
- activeChar.isInOlympiadMode())
- @@ -107,7 +108,8 @@
- _activeChar = activeChar;
- }
- - public void run()
- + @Override
- + public void run()
- {
- if (_activeChar.isDead())
- return;
- @@ -125,7 +127,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminInvul.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminInvul.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminInvul.java (copia de trabajo)
- @@ -39,7 +39,8 @@
- private static String[] _adminCommands = {"admin_invul", "admin_setinvul"};
- private static final int REQUIRED_LEVEL = Config.GM_GODMODE;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -60,6 +61,7 @@
- return true;
- }
- + @Override
- public String[] getAdminCommandList()
- {
- return _adminCommands;
- Index: java/net/sf/l2j/gameserver/model/quest/QuestStateManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/quest/QuestStateManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/quest/QuestStateManager.java (copia de trabajo)
- @@ -22,7 +22,6 @@
- import javolution.util.FastList;
- import net.sf.l2j.gameserver.ThreadPoolManager;
- -import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- public class QuestStateManager
- {
- @@ -30,7 +29,8 @@
- // Schedule Task
- public class ScheduleTimerTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSiege.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSiege.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSiege.java (copia de trabajo)
- @@ -63,7 +63,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_NPC_EDIT;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -364,7 +365,8 @@
- activeChar.sendPacket(adminReply);
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerRace.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerRace.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerRace.java (copia de trabajo)
- @@ -37,6 +37,7 @@
- _race = race;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (!(env.player instanceof L2PcInstance))
- Index: java/net/sf/l2j/gameserver/taskmanager/TaskManager.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/taskmanager/TaskManager.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/taskmanager/TaskManager.java (copia de trabajo)
- @@ -86,7 +86,8 @@
- rset.getString("param3")};
- }
- - public void run()
- + @Override
- + public void run()
- {
- _task.onTimeElapsed(this);
- @@ -110,7 +111,8 @@
- }
- }
- - public boolean equals(Object object)
- + @Override
- + public boolean equals(Object object)
- {
- return _id == ((ExecutedTask) object)._id;
- }
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPolymorph.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPolymorph.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPolymorph.java (copia de trabajo)
- @@ -42,7 +42,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_NPC_EDIT;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -66,7 +67,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/funcs/FuncMul.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/FuncMul.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/FuncMul.java (copia de trabajo)
- @@ -29,6 +29,7 @@
- super(stat, order, owner);
- _lambda = lambda;
- }
- + @Override
- public void calc(Env env)
- {
- if (_cond == null || _cond.test(env))
- Index: java/net/sf/l2j/gameserver/network/clientpackets/SetPrivateStoreListSell.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/SetPrivateStoreListSell.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/SetPrivateStoreListSell.java (copia de trabajo)
- @@ -19,6 +19,7 @@
- package net.sf.l2j.gameserver.network.clientpackets;
- import net.sf.l2j.Config;
- +import net.sf.l2j.gameserver.model.L2Character;
- import net.sf.l2j.gameserver.model.TradeList;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
- @@ -87,7 +88,7 @@
- return;
- }
- - if (player.isInsideZone(L2PcInstance.ZONE_NOSTORE))
- + if (player.isInsideZone(L2Character.ZONE_NOSTORE))
- {
- player.sendPacket(new PrivateStoreManageListSell(player));
- player.sendPacket(new SystemMessage(SystemMessage.NO_PRIVATE_STORE_HERE));
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/ExtractableItems.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/ExtractableItems.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/ExtractableItems.java (copia de trabajo)
- @@ -39,7 +39,8 @@
- public class ExtractableItems implements IItemHandler
- {
- private static Logger _log = Logger.getLogger(ItemTable.class.getName());
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -112,7 +113,8 @@
- activeChar.sendPacket(sm);
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return ExtractableItemsData.getInstance().itemIDs();
- }
- Index: java/net/sf/l2j/gameserver/idfactory/CompactionIDFactory.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/idfactory/CompactionIDFactory.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/idfactory/CompactionIDFactory.java (copia de trabajo)
- @@ -115,12 +115,14 @@
- return N - hole;
- }
- - public synchronized int getNextId()
- + @Override
- + public synchronized int getNextId()
- {
- return _curOID++;
- }
- - public synchronized void releaseId(@SuppressWarnings("unused") int id)
- + @Override
- + public synchronized void releaseId(@SuppressWarnings("unused") int id)
- {
- //dont release ids until we are sure it isnt messing up
- /* if (_freeSize >= _freeOIDs.length)
- @@ -132,7 +134,8 @@
- _freeOIDs[_freeSize++] = id;*/
- }
- - public int size()
- + @Override
- + public int size()
- {
- return _freeSize + LAST_OID - FIRST_OID;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2DoorInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2DoorInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2DoorInstance.java (copia de trabajo)
- @@ -91,20 +91,27 @@
- public class AIAccessor extends L2Character.AIAccessor
- {
- protected AIAccessor() {}
- - public L2DoorInstance getActor() { return L2DoorInstance.this; }
- - @SuppressWarnings("unused")
- + @Override
- + public L2DoorInstance getActor() { return L2DoorInstance.this; }
- + @Override
- + @SuppressWarnings("unused")
- public void moveTo(int x, int y, int z, int offset) {}
- - @SuppressWarnings("unused")
- + @Override
- + @SuppressWarnings("unused")
- public void moveTo(int x, int y, int z) {}
- - @SuppressWarnings("unused")
- + @Override
- + @SuppressWarnings("unused")
- public void stopMove(L2CharPosition pos) {}
- - @SuppressWarnings("unused")
- + @Override
- + @SuppressWarnings("unused")
- public void doAttack(L2Character target) {}
- - @SuppressWarnings("unused")
- + @Override
- + @SuppressWarnings("unused")
- public void doCast(L2Skill skill) {}
- }
- - public L2CharacterAI getAI()
- + @Override
- + public L2CharacterAI getAI()
- {
- if (_ai == null)
- {
- @@ -121,7 +128,8 @@
- class CloseTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -139,7 +147,8 @@
- */
- class AutoOpenClose implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -168,7 +177,8 @@
- _unlockable = unlockable;
- }
- - public final DoorKnownList getKnownList()
- + @Override
- + public final DoorKnownList getKnownList()
- {
- if (super.getKnownList() == null || !(super.getKnownList() instanceof DoorKnownList))
- setKnownList(new DoorKnownList(this));
- @@ -175,7 +185,8 @@
- return (DoorKnownList)super.getKnownList();
- }
- - public final DoorStat getStat()
- + @Override
- + public final DoorStat getStat()
- {
- if (super.getStat() == null || !(super.getStat() instanceof DoorStat))
- setStat(new DoorStat(this));
- @@ -182,7 +193,8 @@
- return (DoorStat)super.getStat();
- }
- - public final DoorStatus getStatus()
- + @Override
- + public final DoorStatus getStatus()
- {
- if (super.getStatus() == null || !(super.getStatus() instanceof DoorStatus))
- setStatus(new DoorStatus(this));
- @@ -194,7 +206,8 @@
- return _unlockable;
- }
- - public final int getLevel()
- + @Override
- + public final int getLevel()
- {
- return 1;
- }
- @@ -269,7 +282,8 @@
- return true;
- }
- - public boolean isAutoAttackable(L2Character attacker)
- + @Override
- + public boolean isAutoAttackable(L2Character attacker)
- {
- if (attacker == null || !(attacker instanceof L2PlayableInstance))
- return false;
- @@ -291,7 +305,8 @@
- return isAutoAttackable(attacker);
- }
- - public void updateAbnormalEffect() {}
- + @Override
- + public void updateAbnormalEffect() {}
- public int getDistanceToWatchObject(L2Object object)
- {
- @@ -319,27 +334,32 @@
- /**
- * Return null.<BR><BR>
- */
- - public L2ItemInstance getActiveWeaponInstance()
- + @Override
- + public L2ItemInstance getActiveWeaponInstance()
- {
- return null;
- }
- - public L2Weapon getActiveWeaponItem()
- + @Override
- + public L2Weapon getActiveWeaponItem()
- {
- return null;
- }
- - public L2ItemInstance getSecondaryWeaponInstance()
- + @Override
- + public L2ItemInstance getSecondaryWeaponInstance()
- {
- return null;
- }
- - public L2Weapon getSecondaryWeaponItem()
- + @Override
- + public L2Weapon getSecondaryWeaponItem()
- {
- return null;
- }
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (player == null)
- return;
- @@ -390,7 +410,8 @@
- player.sendPacket(new ActionFailed());
- }
- - public void onActionShift(L2GameClient client)
- + @Override
- + public void onActionShift(L2GameClient client)
- {
- L2PcInstance player = client.getActiveChar();
- if (player == null) return;
- @@ -441,7 +462,8 @@
- player.sendPacket(new ActionFailed());
- }
- - public void broadcastStatusUpdate()
- + @Override
- + public void broadcastStatusUpdate()
- {
- Collection<L2PcInstance> knownPlayers = getKnownList().getKnownPlayers().values();
- if (knownPlayers == null || knownPlayers.isEmpty())
- @@ -484,7 +506,8 @@
- startAutoCloseTask();
- }
- - public String toString()
- + @Override
- + public String toString()
- {
- return "door "+_doorId;
- }
- Index: java/net/sf/l2j/gameserver/handler/usercommandhandlers/PartyInfo.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/usercommandhandlers/PartyInfo.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/usercommandhandlers/PartyInfo.java (copia de trabajo)
- @@ -34,7 +34,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#useUserCommand(int, net.sf.l2j.gameserver.model.L2PcInstance)
- */
- - public boolean useUserCommand(int id, L2PcInstance activeChar)
- + @Override
- + public boolean useUserCommand(int id, L2PcInstance activeChar)
- {
- if (id != COMMAND_IDS[0])
- return false;
- @@ -91,7 +92,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IUserCommandHandler#getUserCommandList()
- */
- - public int[] getUserCommandList()
- + @Override
- + public int[] getUserCommandList()
- {
- return COMMAND_IDS;
- }
- Index: java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/stats.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/stats.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/voicedcommandhandlers/stats.java (copia de trabajo)
- @@ -35,7 +35,8 @@
- {
- private static String[] _voicedCommands = { "stats" };
- - public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
- + @Override
- + public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
- {
- if (command.equalsIgnoreCase("stats"))
- {
- @@ -62,7 +63,8 @@
- return true;
- }
- - public String[] getVoicedCommandList()
- + @Override
- + public String[] getVoicedCommandList()
- {
- return _voicedCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (copia de trabajo)
- @@ -10609,11 +10609,11 @@
- if ((boat == null) && (_boat != null))
- {
- _boat.removePassenger(this);
- - setInsideZone(L2PcInstance.ZONE_PEACE, false);
- + setInsideZone(L2Character.ZONE_PEACE, false);
- }
- else if ((_boat == null) && (boat != null))
- {
- - setInsideZone(L2PcInstance.ZONE_PEACE, true);
- + setInsideZone(L2Character.ZONE_PEACE, true);
- }
- _boat = boat;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/stat/BoatStat.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/stat/BoatStat.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/stat/BoatStat.java (copia de trabajo)
- @@ -36,7 +36,8 @@
- // =========================================================
- // Property - Public
- - public L2BoatInstance getActiveChar()
- + @Override
- + public L2BoatInstance getActiveChar()
- {
- return (L2BoatInstance)super.getActiveChar();
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2ChestInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2ChestInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2ChestInstance.java (copia de trabajo)
- @@ -44,7 +44,8 @@
- _specialDrop = false;
- }
- - public void onSpawn()
- + @Override
- + public void onSpawn()
- {
- super.onSpawn();
- _isInteracted = false;
- @@ -53,7 +54,8 @@
- setMustRewardExpSp(true);
- }
- - public boolean hasRandomAnimation()
- + @Override
- + public boolean hasRandomAnimation()
- {
- return false;
- }
- @@ -82,7 +84,8 @@
- }
- - public void doItemDrop(L2NpcTemplate npcTemplate, L2Character lastAttacker)
- + @Override
- + public void doItemDrop(L2NpcTemplate npcTemplate, L2Character lastAttacker)
- {
- @@ -201,7 +204,8 @@
- return false;
- }
- - public boolean isMovementDisabled()
- + @Override
- + public boolean isMovementDisabled()
- {
- if (super.isMovementDisabled())
- return true;
- Index: java/net/sf/l2j/gameserver/network/clientpackets/RequestSetAllyCrest.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/RequestSetAllyCrest.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/RequestSetAllyCrest.java (copia de trabajo)
- @@ -28,6 +28,7 @@
- import net.sf.l2j.gameserver.cache.CrestCache;
- import net.sf.l2j.gameserver.datatables.ClanTable;
- import net.sf.l2j.gameserver.idfactory.BitSetIDFactory;
- +import net.sf.l2j.gameserver.idfactory.IdFactory;
- import net.sf.l2j.gameserver.model.L2Clan;
- import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- @@ -88,7 +89,7 @@
- CrestCache crestCache = CrestCache.getInstance();
- - int newId = BitSetIDFactory.getInstance().getNextId();
- + int newId = IdFactory.getInstance().getNextId();
- if (!crestCache.saveAllyCrest(newId, _data))
- {
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetNone.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetNone.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetNone.java (copia de trabajo)
- @@ -32,6 +32,7 @@
- {
- }
- + @Override
- public boolean testImpl(Env env)
- {
- return (env.target == null);
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminManor.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminManor.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminManor.java (copia de trabajo)
- @@ -58,7 +58,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_MENU;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -218,7 +219,8 @@
- return (level >= REQUIRED_LEVEL);
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectSeed.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectSeed.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectSeed.java (copia de trabajo)
- @@ -30,12 +30,14 @@
- super(env, template);
- }
- - public EffectType getEffectType()
- + @Override
- + public EffectType getEffectType()
- {
- return EffectType.SEED;
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- // just stop this effect
- return false;
- Index: java/net/sf/l2j/gameserver/model/actor/knownlist/DoorKnownList.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/knownlist/DoorKnownList.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/knownlist/DoorKnownList.java (copia de trabajo)
- @@ -43,12 +43,14 @@
- // =========================================================
- // Property - Public
- - public final L2DoorInstance getActiveChar()
- + @Override
- + public final L2DoorInstance getActiveChar()
- {
- return (L2DoorInstance)super.getActiveChar();
- }
- - public int getDistanceToForgetObject(L2Object object)
- + @Override
- + public int getDistanceToForgetObject(L2Object object)
- {
- if (object instanceof L2SiegeGuardInstance) return 800;
- if (!(object instanceof L2PcInstance))
- @@ -57,7 +59,8 @@
- return 4000;
- }
- - public int getDistanceToWatchObject(L2Object object)
- + @Override
- + public int getDistanceToWatchObject(L2Object object)
- {
- if (object instanceof L2SiegeGuardInstance) return 600;
- if (!(object instanceof L2PcInstance))
- Index: java/net/sf/l2j/gameserver/skills/effects/EffectRoot.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/effects/EffectRoot.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/effects/EffectRoot.java (copia de trabajo)
- @@ -34,6 +34,7 @@
- super(env, template);
- }
- + @Override
- public EffectType getEffectType()
- {
- return EffectType.ROOT;
- @@ -40,16 +41,19 @@
- }
- /** Notify started */
- + @Override
- public void onStart() {
- getEffected().startRooted();
- }
- /** Notify exited */
- + @Override
- public void onExit() {
- getEffected().stopRooting(this);
- }
- - public boolean onActionTime()
- + @Override
- + public boolean onActionTime()
- {
- // just stop this effect
- return false;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAnnouncements.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAnnouncements.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAnnouncements.java (copia de trabajo)
- @@ -52,7 +52,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_ANNOUNCE;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -122,7 +123,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2CastleTeleporterInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2CastleTeleporterInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2CastleTeleporterInstance.java (copia de trabajo)
- @@ -20,7 +20,6 @@
- import java.util.StringTokenizer;
- -import net.sf.l2j.Config;
- import net.sf.l2j.gameserver.ThreadPoolManager;
- import net.sf.l2j.gameserver.ai.CtrlIntention;
- import net.sf.l2j.gameserver.datatables.MapRegionTable;
- @@ -49,7 +48,8 @@
- super(objectId, template);
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- StringTokenizer st = new StringTokenizer(command, " ");
- @@ -90,7 +90,8 @@
- }
- - public void showChatWindow(L2PcInstance player)
- + @Override
- + public void showChatWindow(L2PcInstance player)
- {
- String filename;
- if (!getTask())
- @@ -122,7 +123,8 @@
- class oustAllPlayers implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- try
- {
- @@ -150,7 +152,8 @@
- * This is called when a player interacts with this NPC
- * @param player
- */
- - public void onAction(L2PcInstance player)
- + @Override
- + public void onAction(L2PcInstance player)
- {
- if (!canTarget(player))
- return;
- Index: java/net/sf/l2j/gameserver/skills/conditions/ConditionUsingSkill.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/conditions/ConditionUsingSkill.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/conditions/ConditionUsingSkill.java (copia de trabajo)
- @@ -35,6 +35,7 @@
- _skillId = skillId;
- }
- + @Override
- public boolean testImpl(Env env)
- {
- if (env.skill == null)
- Index: java/net/sf/l2j/GMAuditFilter.java
- ===================================================================
- --- java/net/sf/l2j/GMAuditFilter.java (revisión: 598)
- +++ java/net/sf/l2j/GMAuditFilter.java (copia de trabajo)
- @@ -23,6 +23,7 @@
- public class GMAuditFilter implements Filter
- {
- + @Override
- public boolean isLoggable(LogRecord record)
- {
- return record.getLoggerName().equalsIgnoreCase("gmaudit");
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBBS.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBBS.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBBS.java (copia de trabajo)
- @@ -31,7 +31,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#useAdminCommand(java.lang.String, net.sf.l2j.gameserver.model.actor.instance.L2PcInstance)
- */
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -45,7 +46,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.gameserver.handler.IAdminCommandHandler#getAdminCommandList()
- */
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/util/L2ObjectHashMap.java
- ===================================================================
- --- java/net/sf/l2j/util/L2ObjectHashMap.java (revisión: 598)
- +++ java/net/sf/l2j/util/L2ObjectHashMap.java (copia de trabajo)
- @@ -88,6 +88,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#size()
- */
- + @Override
- public int size()
- {
- return count;
- @@ -96,6 +97,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#isEmpty()
- */
- + @Override
- public boolean isEmpty()
- {
- return count == 0;
- @@ -104,7 +106,8 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#clear()
- */
- - @SuppressWarnings("unchecked")
- + @Override
- + @SuppressWarnings("unchecked")
- public synchronized void clear()
- {
- int size = primes[0];
- @@ -136,6 +139,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#put(T)
- */
- + @Override
- public synchronized void put(T obj)
- {
- if (count >= table.length/2)
- @@ -196,6 +200,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#remove(T)
- */
- + @Override
- public synchronized void remove(T obj)
- {
- int hashcode = obj.getObjectId();
- @@ -231,6 +236,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#get(int)
- */
- + @Override
- public T get(int id)
- {
- final int size = table.length;
- @@ -267,6 +273,7 @@
- /* (non-Javadoc)
- * @see net.sf.l2j.util.L2ObjectMap#contains(T)
- */
- + @Override
- public boolean contains(T obj)
- {
- return get(obj.getObjectId()) != null;
- @@ -320,6 +327,7 @@
- * @see net.sf.l2j.util.L2ObjectMap#iterator()
- */
- + @Override
- public Iterator<T> iterator()
- {
- return new Itr(table);
- @@ -341,10 +349,12 @@
- return;
- }
- }
- + @Override
- public boolean hasNext()
- {
- return nextObj != null;
- }
- + @Override
- public T next()
- {
- if (nextObj == null)
- @@ -360,6 +370,7 @@
- nextObj = null;
- return lastRet;
- }
- + @Override
- public void remove()
- {
- if (lastRet == null)
- Index: java/net/sf/l2j/gameserver/skills/funcs/FuncEnchant.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/skills/funcs/FuncEnchant.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/skills/funcs/FuncEnchant.java (copia de trabajo)
- @@ -31,7 +31,8 @@
- super(stat, order, owner);
- }
- - public void calc(Env env)
- + @Override
- + public void calc(Env env)
- {
- if (_cond != null && !_cond.test(env))
- return;
- Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShop.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShop.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShop.java (copia de trabajo)
- @@ -29,7 +29,6 @@
- import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
- import net.sf.l2j.gameserver.network.serverpackets.BuyList;
- import net.sf.l2j.gameserver.network.serverpackets.SellList;
- -import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
- /**
- * This class handles following admin commands:
- @@ -51,7 +50,8 @@
- private static final int REQUIRED_LEVEL = Config.GM_CREATE_ITEM;
- - public boolean useAdminCommand(String command, L2PcInstance activeChar)
- + @Override
- + public boolean useAdminCommand(String command, L2PcInstance activeChar)
- {
- if (!Config.ALT_PRIVILEGES_ADMIN)
- {
- @@ -88,7 +88,8 @@
- return true;
- }
- - public String[] getAdminCommandList()
- + @Override
- + public String[] getAdminCommandList()
- {
- return _adminCommands;
- }
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2RaceManagerInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2RaceManagerInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2RaceManagerInstance.java (copia de trabajo)
- @@ -139,7 +139,8 @@
- managers.add(this);
- }
- - public final RaceManagerKnownList getKnownList()
- + @Override
- + public final RaceManagerKnownList getKnownList()
- {
- if (super.getKnownList() == null || !(super.getKnownList() instanceof RaceManagerKnownList))
- this.setKnownList(new RaceManagerKnownList(this));
- @@ -155,7 +156,8 @@
- this.type = pType;
- }
- - public void run()
- + @Override
- + public void run()
- {
- makeAnnouncement(type);
- }
- @@ -255,7 +257,8 @@
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.startsWith("BuyTicket") && state != ACCEPTING_BETS)
- {
- @@ -482,7 +485,8 @@
- class RunRace implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- packet = new MonRaceInfo(codes[2][0], codes[2][1], MonsterRace.getInstance().getMonsters(),
- MonsterRace.getInstance().getSpeeds());
- @@ -493,7 +497,8 @@
- class RunEnd implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- makeAnnouncement(SystemMessage.MONSRACE_FIRST_PLACE_S1_SECOND_S2);
- makeAnnouncement(SystemMessage.MONSRACE_RACE_END);
- Index: java/net/sf/l2j/gameserver/Olympiad.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/Olympiad.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/Olympiad.java (copia de trabajo)
- @@ -58,7 +58,6 @@
- import net.sf.l2j.gameserver.network.serverpackets.InventoryUpdate;
- import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
- import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
- -import net.sf.l2j.gameserver.templates.L2NpcTemplate;
- import net.sf.l2j.gameserver.templates.StatsSet;
- import net.sf.l2j.util.L2FastList;
- import net.sf.l2j.util.Rnd;
- @@ -231,7 +230,8 @@
- _game = null;
- }
- - public void run()
- + @Override
- + public void run()
- {
- _started = true;
- if (_game != null)
- @@ -575,7 +575,8 @@
- protected class OlympiadEndTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- SystemMessage sm = new SystemMessage(SystemMessage.OLYMPIAD_PERIOD_S1_HAS_ENDED);
- sm.addNumber(_currentCycle);
- @@ -615,7 +616,8 @@
- protected class ValidationEndTask implements Runnable
- {
- - public void run()
- + @Override
- + public void run()
- {
- Announcements.getInstance().announceToAll("Olympiad Validation Period has ended.");
- _period = 0;
- @@ -830,7 +832,8 @@
- _scheduledCompStart = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (isOlympiadEnd())
- return;
- @@ -853,7 +856,8 @@
- {
- ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (isOlympiadEnd())
- return;
- @@ -866,7 +870,8 @@
- _scheduledCompEnd = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- if (isOlympiadEnd())
- return;
- @@ -998,7 +1003,8 @@
- {
- _scheduledWeeklyTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- addWeeklyPoints();
- _log.info("Olympiad System: Added weekly points to nobles");
- @@ -1398,7 +1404,8 @@
- _manager = this;
- }
- - public synchronized void run()
- + @Override
- + public synchronized void run()
- {
- if (isOlympiadEnd())
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2SummonInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2SummonInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2SummonInstance.java (copia de trabajo)
- @@ -97,12 +97,14 @@
- delay, delay);
- }
- - public final int getLevel()
- + @Override
- + public final int getLevel()
- {
- return (getTemplate() != null ? getTemplate().level : 0);
- }
- - public int getSummonType()
- + @Override
- + public int getSummonType()
- {
- return 1;
- }
- @@ -172,12 +174,14 @@
- _timeRemaining -= value;
- }
- - public void addExpAndSp(long addToExp, int addToSp)
- + @Override
- + public void addExpAndSp(long addToExp, int addToSp)
- {
- getOwner().addExpAndSp(addToExp, addToSp);
- }
- - public boolean doDie(L2Character killer)
- + @Override
- + public boolean doDie(L2Character killer)
- {
- if (!super.doDie(killer))
- return false;
- @@ -206,7 +210,8 @@
- _summon = newpet;
- }
- - public void run()
- + @Override
- + public void run()
- {
- if (Config.DEBUG)
- log.warning("L2SummonInstance: " + _summon.getTemplate().name + " ("
- @@ -258,7 +263,8 @@
- }
- }
- - public void unSummon(L2PcInstance owner)
- + @Override
- + public void unSummon(L2PcInstance owner)
- {
- if (Config.DEBUG)
- _log.warning("L2SummonInstance: " + getTemplate().name + " (" + owner.getName() + ") unsummoned.");
- @@ -274,13 +280,15 @@
- }
- - public boolean destroyItem(String process, int objectId, int count, L2Object reference,
- + @Override
- + public boolean destroyItem(String process, int objectId, int count, L2Object reference,
- boolean sendMessage)
- {
- return getOwner().destroyItem(process, objectId, count, reference, sendMessage);
- }
- - public boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference,
- + @Override
- + public boolean destroyItemByItemId(String process, int itemId, int count, L2Object reference,
- boolean sendMessage)
- {
- if (Config.DEBUG)
- @@ -290,7 +298,8 @@
- return getOwner().destroyItemByItemId(process, itemId, count, reference, sendMessage);
- }
- - public final void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss)
- + @Override
- + public final void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss)
- {
- if (miss)
- {
- Index: java/net/sf/l2j/gameserver/model/L2Request.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/L2Request.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/L2Request.java (copia de trabajo)
- @@ -125,7 +125,8 @@
- _isAnswerer = isRequestor ? false : true;
- ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
- {
- - public void run()
- + @Override
- + public void run()
- {
- Clear();
- }
- Index: java/net/sf/l2j/gameserver/handler/itemhandlers/ChestKey.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/handler/itemhandlers/ChestKey.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/handler/itemhandlers/ChestKey.java (copia de trabajo)
- @@ -41,7 +41,8 @@
- 6665, 6666, 6667, 6668, 6669, 6670, 6671, 6672 //deluxe key
- };
- - public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- + @Override
- + public void useItem(L2PlayableInstance playable, L2ItemInstance item)
- {
- if (!(playable instanceof L2PcInstance))
- return;
- @@ -70,7 +71,8 @@
- }
- }
- - public int[] getItemIds()
- + @Override
- + public int[] getItemIds()
- {
- return _itemIds;
- }
- Index: java/net/sf/l2j/gameserver/model/quest/State.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/quest/State.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/quest/State.java (copia de trabajo)
- @@ -70,7 +70,8 @@
- * Return name of the quest
- * @return String
- */
- - public String toString()
- + @Override
- + public String toString()
- {
- return _Name;
- }
- Index: java/net/sf/l2j/gameserver/ai/L2BoatAI.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/ai/L2BoatAI.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/ai/L2BoatAI.java (copia de trabajo)
- @@ -23,7 +23,6 @@
- import net.sf.l2j.gameserver.model.L2Object;
- import net.sf.l2j.gameserver.model.L2Skill;
- import net.sf.l2j.gameserver.model.actor.instance.L2BoatInstance;
- -import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
- import net.sf.l2j.gameserver.network.serverpackets.VehicleDeparture;
- import net.sf.l2j.gameserver.network.serverpackets.VehicleInfo;
- import net.sf.l2j.gameserver.network.serverpackets.VehicleStarted;
- Index: java/net/sf/l2j/gameserver/model/actor/instance/L2BlacksmithInstance.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/model/actor/instance/L2BlacksmithInstance.java (revisión: 598)
- +++ java/net/sf/l2j/gameserver/model/actor/instance/L2BlacksmithInstance.java (copia de trabajo)
- @@ -32,7 +32,8 @@
- super(objectId, template);
- }
- - public void onBypassFeedback(L2PcInstance player, String command)
- + @Override
- + public void onBypassFeedback(L2PcInstance player, String command)
- {
- if (command.startsWith("multisell"))
- @@ -45,7 +46,8 @@
- super.onBypassFeedback(player,command);
- }
- - public String getHtmlPath(int npcId, int val)
- + @Override
- + public String getHtmlPath(int npcId, int val)
- {
- String pom = "";
- if (val == 0)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement