2
0
JIV 15 жил өмнө
parent
commit
122c612a61
52 өөрчлөгдсөн 93 нэмэгдсэн , 18 устгасан
  1. 4 4
      L2_GameServer/.settings/org.eclipse.jdt.core.prefs
  2. 4 2
      L2_GameServer/java/com/l2jserver/configurator/ConfigUserInterface.java
  3. 4 0
      L2_GameServer/java/com/l2jserver/configurator/JIPTextField.java
  4. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/GeoEngine.java
  5. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/ClanWarehouse.java
  6. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Attackable.java
  7. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Summon.java
  8. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Trap.java
  9. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java
  10. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java
  11. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2CastleChamberlainInstance.java
  12. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
  13. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ClanTraderInstance.java
  14. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DawnPriestInstance.java
  15. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java
  16. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java
  17. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DuskPriestInstance.java
  18. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FameManagerInstance.java
  19. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java
  20. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java
  21. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortEnvoyInstance.java
  22. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java
  23. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java
  24. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortSiegeNpcInstance.java
  25. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortSupportCaptainInstance.java
  26. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java
  27. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ManorManagerInstance.java
  28. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2MercManagerInstance.java
  29. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ObservationInstance.java
  30. 6 2
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  31. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
  32. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java
  33. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeNpcInstance.java
  34. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java
  35. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2WyvernManagerInstance.java
  36. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/position/PcPosition.java
  37. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java
  38. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java
  39. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/PcWarehouse.java
  40. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java
  41. 3 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java
  42. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
  43. 3 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
  44. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
  45. 2 0
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExAttributeEnchantResult.java
  46. 3 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectChanceSkillTrigger.java
  47. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobilePetBuff.java
  48. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSiegeFlag.java
  49. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/templates/item/L2WarehouseItem.java
  50. 1 0
      L2_GameServer/java/com/l2jserver/util/L2LogManager.java
  51. 4 2
      L2_GameServer/java/com/l2jserver/util/L2SyncList.java
  52. 6 3
      L2_GameServer/java/com/l2jserver/util/L2SyncMap.java

+ 4 - 4
L2_GameServer/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Thu Mar 04 08:44:26 CET 2010
+#Mon Mar 29 08:35:45 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -30,7 +30,7 @@ org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
@@ -41,7 +41,7 @@ org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
@@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

+ 4 - 2
L2_GameServer/java/com/l2jserver/configurator/ConfigUserInterface.java

@@ -192,7 +192,8 @@ public class ConfigUserInterface extends JFrame implements ActionListener
 	    for (ConfigFile cf : getConfigs())
 	    {
 	    	JPanel panel = new JPanel() {
-	    		public void scrollRectToVisible(Rectangle r ) {}
+	    		@Override
+				public void scrollRectToVisible(Rectangle r ) {}
 	    	};
 	    	panel.setLayout(new GridBagLayout());
 	    	
@@ -607,7 +608,8 @@ public class ConfigUserInterface extends JFrame implements ActionListener
             	}
             }
             
-            public void save(Writer writer) throws IOException
+            @Override
+			public void save(Writer writer) throws IOException
             {
             	String value;
             	if (this.getValueComponent() instanceof JCheckBox)

+ 4 - 0
L2_GameServer/java/com/l2jserver/configurator/JIPTextField.java

@@ -123,6 +123,7 @@ public class JIPTextField extends JPanel implements FocusListener
 		}
 	}
 
+	@Override
 	public void addFocusListener(FocusListener fl)
 	{
 		if (_focusListeners == null)
@@ -136,6 +137,7 @@ public class JIPTextField extends JPanel implements FocusListener
 		}
 	}
 
+	@Override
 	public void removeFocusListener(FocusListener fl)
 	{
 		if (_focusListeners != null)
@@ -200,6 +202,7 @@ public class JIPTextField extends JPanel implements FocusListener
 		}
 	}
 
+	@Override
 	public void setEnabled(boolean enabled)
 	{
 		for(int i=0;i<_textFields.length;i++)
@@ -283,6 +286,7 @@ public class JIPTextField extends JPanel implements FocusListener
 			setNext(next);
 		}
 		
+		@Override
 		public void insertString(int offset, String str, AttributeSet a) throws BadLocationException
 		{
 			if (getLength() + str.length() > _max)

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/GeoEngine.java

@@ -245,6 +245,7 @@ public class GeoEngine extends GeoData
 		return canSee((x - L2World.MAP_MIN_X) >> 4, (y - L2World.MAP_MIN_Y) >> 4, z, (tx - L2World.MAP_MIN_X) >> 4, (ty - L2World.MAP_MIN_Y) >> 4, tz);
 	}
 	
+	@Override
 	public boolean hasGeo(int x, int y)
 	{
 		int gx = (x - L2World.MAP_MIN_X) >> 4;

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/ClanWarehouse.java

@@ -30,6 +30,7 @@ public final class ClanWarehouse extends Warehouse
 		_clan = clan;
 	}
 
+	@Override
 	public String getName() { return "ClanWarehouse"; };
 
 	@Override

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -131,6 +131,7 @@ public class L2Attackable extends L2Npc
 			_damage = Math.min(_damage + value, 999999999);
 		}
 
+		@Override
 		public final boolean equals(Object obj)
 		{
 			if (this == obj)

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -788,6 +788,7 @@ public abstract class L2Summon extends L2Playable
         super.doCast(skill);
 	}
 	
+	@Override
 	public boolean isInCombat()
 	{
 		return getOwner().isInCombat();

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Trap.java

@@ -79,6 +79,7 @@ public class L2Trap extends L2Character
 		setKnownList(new TrapKnownList(this));
     }
 	
+	@Override
 	public boolean isAutoAttackable(L2Character attacker)
 	{
 		return !canSee(attacker);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java

@@ -587,6 +587,7 @@ public final class L2AuctioneerInstance extends L2Npc
 		super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		String filename = "data/html/auction/auction-no.htm";

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java

@@ -71,6 +71,7 @@ public class L2CastleBlacksmithInstance extends L2NpcInstance
 		}
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player, int val)
 	{
 		if (CastleManorManager.getInstance().isDisabled())

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2CastleChamberlainInstance.java

@@ -1442,6 +1442,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 		player.sendPacket(html);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -1336,7 +1336,8 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
         player.sendPacket(html);
     }
 
-    public void showChatWindow(L2PcInstance player)
+    @Override
+	public void showChatWindow(L2PcInstance player)
     {
         player.sendPacket(ActionFailed.STATIC_PACKET);
         String filename = "data/html/clanHallManager/chamberlain-no.htm";

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ClanTraderInstance.java

@@ -102,6 +102,7 @@ public final class L2ClanTraderInstance extends L2Npc
 		player.sendPacket(html);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DawnPriestInstance.java

@@ -36,6 +36,7 @@ public class L2DawnPriestInstance extends L2SignsPriestInstance
 			super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java

@@ -119,6 +119,7 @@ public class L2DefenderInstance extends L2Attackable
 	 * This method forces guard to return to home location previously set
 	 *
 	 */
+	@Override
 	public void returnHome()
 	{
 		if (getWalkSpeed() <= 0)

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java

@@ -78,6 +78,7 @@ public class L2DoormenInstance extends L2NpcInstance
 		super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2DuskPriestInstance.java

@@ -36,6 +36,7 @@ public class L2DuskPriestInstance extends L2SignsPriestInstance
 			super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FameManagerInstance.java

@@ -97,6 +97,7 @@ public class L2FameManagerInstance extends L2Npc
 		player.sendPacket(html);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java

@@ -90,7 +90,8 @@ public class L2FortCommanderInstance extends L2DefenderInstance
      * This method forces guard to return to home location previously set
      *
      */
-    public void returnHome()
+    @Override
+	public void returnHome()
     {
         if (!isInsideRadius(getSpawn().getLocx(), getSpawn().getLocy(), 200, false))
         {

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java

@@ -29,6 +29,7 @@ public class L2FortDoormenInstance extends L2DoormenInstance
 		setInstanceType(InstanceType.L2FortDoormenInstance);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortEnvoyInstance.java

@@ -30,6 +30,7 @@ public class L2FortEnvoyInstance extends L2Npc
 		setInstanceType(InstanceType.L2FortEnvoyInstance);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);
@@ -50,6 +51,7 @@ public class L2FortEnvoyInstance extends L2Npc
 		player.sendPacket(html);
 	}
 
+	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)
 	{
 		StringTokenizer st = new StringTokenizer(command, " ");

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java

@@ -33,6 +33,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 		setInstanceType(InstanceType.L2FortLogisticsInstance);
 	}
 
+	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)
 	{
 		// BypassValidation Exploit plug.
@@ -110,6 +111,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 			super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		showMessageWindow(player, 0);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java

@@ -925,6 +925,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 		}
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket(ActionFailed.STATIC_PACKET);

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortSiegeNpcInstance.java

@@ -35,6 +35,7 @@ public class L2FortSiegeNpcInstance extends L2NpcWalkerInstance
 		setInstanceType(InstanceType.L2FortSiegeNpcInstance);
 	}
 
+	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)
 	{
 		StringTokenizer st = new StringTokenizer(command, " ");
@@ -91,6 +92,7 @@ public class L2FortSiegeNpcInstance extends L2NpcWalkerInstance
 			super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		showMessageWindow(player, 0);

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FortSupportCaptainInstance.java

@@ -44,6 +44,7 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance
 		10141,10142,10158
 	};
 
+	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)
 	{
 		// BypassValidation Exploit plug.
@@ -95,6 +96,7 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance
 			super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		if (player.getClan() == null || getFort().getOwnerClan() == null || player.getClan() != getFort().getOwnerClan())

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java

@@ -100,6 +100,7 @@ public final class L2GuardInstance extends L2Attackable
 	/**
 	 * Notify the L2GuardInstance to return to its home location (AI_INTENTION_MOVE_TO) and clear its _aggroList.<BR><BR>
 	 */
+	@Override
 	public void returnHome()
 	{
         if (!isInsideRadius(getSpawn().getLocx(), getSpawn().getLocy(), 150, false))

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ManorManagerInstance.java

@@ -122,6 +122,7 @@ public class L2ManorManagerInstance extends L2MerchantInstance
 		return "data/html/manormanager/manager.htm";
 	}
 	
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		if (CastleManorManager.getInstance().isDisabled())
@@ -138,6 +139,7 @@ public class L2ManorManagerInstance extends L2MerchantInstance
 			showChatWindow(player, "manager.htm");
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player, String filename)
 	{
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2MercManagerInstance.java

@@ -63,6 +63,7 @@ public final class L2MercManagerInstance extends L2MerchantInstance
 		super.onBypassFeedback(player, command);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		String filename = "data/html/mercmanager/mercmanager-no.htm";

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2ObservationInstance.java

@@ -30,6 +30,7 @@ public final class L2ObservationInstance extends L2Npc
 		setInstanceType(InstanceType.L2ObservationInstance);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player, int val)
 	{
 		String filename = null;

+ 6 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -4892,7 +4892,8 @@ public final class L2PcInstance extends L2Playable
 		}
 	}
     
-    public boolean isTransformed()
+    @Override
+	public boolean isTransformed()
     {
         return _transformation != null && !_transformation.isStance();
     }
@@ -4925,7 +4926,8 @@ public final class L2PcInstance extends L2Playable
         broadcastUserInfo();
     }
     
-    public void untransform()
+    @Override
+	public void untransform()
     {
         if (_transformation != null)
         {
@@ -6898,6 +6900,7 @@ public final class L2PcInstance extends L2Playable
 	/**
 	 * Return True if the L2PcInstance is a GM.<BR><BR>
 	 */
+	@Override
 	public boolean isGM()
 	{
 		return getAccessLevel().isGm();
@@ -7857,6 +7860,7 @@ public final class L2PcInstance extends L2Playable
 		return oldSkill;
 	}
 	
+	@Override
 	public L2Skill removeSkill(L2Skill skill, boolean store)
 	{
 		if (store)

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -1131,11 +1131,13 @@ public class L2PetInstance extends L2Summon
 		_jewel = id;
 	}
 	
+	@Override
 	public final int getWeapon()
 	{
 		return _weapon;
 	}
 	
+	@Override
 	public final int getArmor()
 	{
 		return _armor;

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java

@@ -46,6 +46,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
 		return "data/html/petmanager/" + pom + ".htm";
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		String filename = "data/html/petmanager/" + getNpcId() + ".htm";
@@ -63,6 +64,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
 		player.sendPacket(html);
 	}
 
+	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)
 	{
 		if (command.startsWith("exchange"))

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeNpcInstance.java

@@ -31,6 +31,7 @@ public class L2SiegeNpcInstance extends L2NpcInstance
 		setInstanceType(InstanceType.L2SiegeNpcInstance);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		showSiegeInfoWindow(player);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java

@@ -39,6 +39,7 @@ public class L2WeddingManagerInstance extends L2Npc
 		setInstanceType(InstanceType.L2WeddingManagerInstance);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
     {
         String filename = "data/html/mods/Wedding_start.htm";

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2WyvernManagerInstance.java

@@ -27,6 +27,7 @@ public class L2WyvernManagerInstance extends L2Npc
 		setInstanceType(InstanceType.L2WyvernManagerInstance);
 	}
 
+	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
 		player.sendPacket( ActionFailed.STATIC_PACKET );

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/position/PcPosition.java

@@ -32,7 +32,8 @@ public class PcPosition extends CharPosition
         super(activeObject);
     }
     
-    public L2PcInstance getActiveObject()
+    @Override
+	public L2PcInstance getActiveObject()
     {
     	return ((L2PcInstance)super.getActiveObject());
     }

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java

@@ -41,7 +41,8 @@ public class Mail extends ItemContainer
     	_messageId = messageId;
     }
 
-    public String getName()
+    @Override
+	public String getName()
     {
     	return "Mail";
     }

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java

@@ -35,6 +35,7 @@ public class PcRefund extends ItemContainer
 		_owner = owner;
 	}
 
+	@Override
 	public String getName() 
 	{
 		return "Refund";

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/itemcontainer/PcWarehouse.java

@@ -28,6 +28,7 @@ public class PcWarehouse extends Warehouse
 		_owner = owner;
 	}
 
+	@Override
 	public String getName() { return "Warehouse"; };
 
 	@Override

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java

@@ -37,6 +37,7 @@ public class L2MotherTreeZone extends L2ZoneType
 		super(id);
 	}
 	
+	@Override
 	public void setParameter(String name, String value)
 	{
 		if (name.equals("enterMsgId"))

+ 3 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java

@@ -22,11 +22,13 @@ public class RequestTutorialClientEvent extends L2GameClientPacket
 	private static final String _C__88_REQUESTTUTORIALCLIENTEVENT = "[C] 88 RequestTutorialClientEvent";
 	int eventId = 0;
 
+	@Override
 	protected void readImpl()
 	{
 		eventId = readD();
 	}
 
+	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
@@ -39,6 +41,7 @@ public class RequestTutorialClientEvent extends L2GameClientPacket
 			qs.getQuest().notifyEvent("CE" + eventId + "",null,player);
 	}
 
+	@Override
 	public String getType()
 	{
 		return _C__88_REQUESTTUTORIALCLIENTEVENT;

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialLinkHtml.java

@@ -23,6 +23,7 @@ public class RequestTutorialLinkHtml extends L2GameClientPacket
 	private static final String _C__85_REQUESTTUTORIALLINKHTML = "[C] 85 RequestTutorialLinkHtml";
 	String _bypass;
 
+	@Override
 	protected void readImpl()
 	{
 		_bypass = readS();

+ 3 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java

@@ -21,10 +21,12 @@ public class RequestTutorialPassCmdToServer extends L2GameClientPacket
 {
 	String _bypass = null;
 
+	@Override
 	protected void readImpl()
 	{
 		_bypass = readS();
 	} 
+	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();
@@ -37,6 +39,7 @@ public class RequestTutorialPassCmdToServer extends L2GameClientPacket
 			qs.getQuest().notifyEvent(_bypass, null, player);
        	}
 
+	@Override
 	public String getType()
 	{
 		return "[C] 86 RequestTutorialPassCmdToServer";

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java

@@ -23,10 +23,12 @@ public class RequestTutorialQuestionMark extends L2GameClientPacket
 	//     private static Logger _log = Logger.getLogger(RequestTutorialQuestionMark.class.getName());
 	int _number = 0;
 
+	@Override
 	protected void readImpl()
 	{
 		_number = readD();
 	}
+	@Override
 	protected void runImpl()
 	{
 		L2PcInstance player = getClient().getActiveChar();

+ 2 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExAttributeEnchantResult.java

@@ -25,6 +25,7 @@ public class ExAttributeEnchantResult extends L2GameServerPacket
 		_result = result;
 	}
 	
+	@Override
 	protected final void writeImpl()
 	{
 		writeC(0xfe);
@@ -33,6 +34,7 @@ public class ExAttributeEnchantResult extends L2GameServerPacket
 		writeD(_result);
 	}
 	
+	@Override
 	public String getType()
 	{
 		return _S__FE_61_EXATTRIBUTEENCHANTRESULT;

+ 3 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectChanceSkillTrigger.java

@@ -42,6 +42,7 @@ public class EffectChanceSkillTrigger extends L2Effect implements IChanceSkillTr
 	    return L2EffectType.CHANCE_SKILL_TRIGGER;
     }
 	
+	@Override
 	public boolean onStart()
 	{
 		getEffected().addChanceEffect(this);
@@ -49,7 +50,8 @@ public class EffectChanceSkillTrigger extends L2Effect implements IChanceSkillTr
 		return super.onStart();
 	}
 
-    public boolean onActionTime()
+    @Override
+	public boolean onActionTime()
     {
 		getEffected().onActionTimeChanceEffect(getSkill().getElement());
 	    return false;

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobilePetBuff.java

@@ -80,6 +80,7 @@ public class EffectImmobilePetBuff extends L2Effect
 	 * 
 	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
 	 */
+	@Override
 	public boolean onActionTime()
 	{
 		// just stop this effect

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSiegeFlag.java

@@ -45,6 +45,7 @@ public class L2SkillSiegeFlag extends L2Skill
 	/**
 	 * @see com.l2jserver.gameserver.model.L2Skill#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Object[])
 	 */
+	@Override
 	public void useSkill(L2Character activeChar, L2Object[] targets)
 	{
 		if (!(activeChar instanceof L2PcInstance))

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/templates/item/L2WarehouseItem.java

@@ -266,6 +266,7 @@ public class L2WarehouseItem
 	 * Returns the name of the item
 	 * @return String
 	 */
+	@Override
 	public String toString()
 	{
 		return _item.toString();

+ 1 - 0
L2_GameServer/java/com/l2jserver/util/L2LogManager.java

@@ -12,6 +12,7 @@ public class L2LogManager extends LogManager {
 		super();
 	}
 
+	@Override
 	public void reset() {
 		// do nothing
 	}

+ 4 - 2
L2_GameServer/java/com/l2jserver/util/L2SyncList.java

@@ -59,7 +59,8 @@ public class L2SyncList<T extends Object> implements List<T>
 		}
 	}
 	
-    public boolean equals(Object o) {
+    @Override
+	public boolean equals(Object o) {
     	_rl.lock();
     	try {
     		return _list.equals(o);
@@ -67,7 +68,8 @@ public class L2SyncList<T extends Object> implements List<T>
     		_rl.unlock();
     	}
     }
-    public int hashCode() {
+    @Override
+	public int hashCode() {
     	_rl.lock();
     	try {
     		return _list.hashCode();

+ 6 - 3
L2_GameServer/java/com/l2jserver/util/L2SyncMap.java

@@ -91,15 +91,18 @@ public class L2SyncMap<K extends Object, V extends Object> implements Map<K, V>
         return _map.containsValue(value);
     }
 
-    public synchronized boolean equals(Object o) {
+    @Override
+	public synchronized boolean equals(Object o) {
         return _map.equals(o);
     }
     
-    public synchronized int hashCode() {
+    @Override
+	public synchronized int hashCode() {
         return _map.hashCode();
     }
     
-    public synchronized String toString() {
+    @Override
+	public synchronized String toString() {
         return _map.toString();
     }