some cleanup, fixes.

L2_GameServer/java/com/l2jserver/gameserver/RecipeController.java

@@ -712,15 +712,15 @@ public class RecipeController
 			
 			for (L2RecipeStatInstance altStatChange : _recipeList.getAltStatChange())
 			{
-				if (altStatChange.getType() == L2RecipeStatInstance.statType.XP)
+				if (altStatChange.getType() == L2RecipeStatInstance.StatType.XP)
 				{
 					_exp = altStatChange.getValue();
 				}
-				else if (altStatChange.getType() == L2RecipeStatInstance.statType.SP)
+				else if (altStatChange.getType() == L2RecipeStatInstance.StatType.SP)
 				{
 					_sp = altStatChange.getValue();
 				}
-				else if (altStatChange.getType() == L2RecipeStatInstance.statType.GIM)
+				else if (altStatChange.getType() == L2RecipeStatInstance.StatType.GIM)
 				{
 					_itemGrab *= altStatChange.getValue();
 				}
@@ -738,7 +738,7 @@ public class RecipeController
 			for (L2RecipeStatInstance statUse : _recipeList.getStatUse())
 			{
 				double modifiedValue = statUse.getValue() / _creationPasses;
-				if (statUse.getType() == L2RecipeStatInstance.statType.HP)
+				if (statUse.getType() == L2RecipeStatInstance.StatType.HP)
 				{
 					// we do not want to kill the player, so its CurrentHP must be greater than the reduce value 
 					if (_player.getCurrentHp() <= modifiedValue)
@@ -760,7 +760,7 @@ public class RecipeController
 					else if (isReduce)
 						_player.reduceCurrentHp(modifiedValue, _player, _skill);
 				}
-				else if (statUse.getType() == L2RecipeStatInstance.statType.MP)
+				else if (statUse.getType() == L2RecipeStatInstance.StatType.MP)
 				{
 					if (_player.getCurrentMp() < modifiedValue)
 					{

L2_GameServer/java/com/l2jserver/gameserver/ai/AbstractAI.java

@@ -171,7 +171,7 @@ abstract class AbstractAI implements Ctrl
 		return _intention;
 	}
 	
-	protected synchronized void setCastTarget(L2Character target)
+	protected void setCastTarget(L2Character target)
 	{
 		_castTarget = target;
 	}
@@ -184,7 +184,7 @@ abstract class AbstractAI implements Ctrl
 		return _castTarget;
 	}
 	
-	protected synchronized void setAttackTarget(L2Character target)
+	protected void setAttackTarget(L2Character target)
 	{
 		_attackTarget = target;
 	}
@@ -936,7 +936,7 @@ abstract class AbstractAI implements Ctrl
 		return _target;
 	}
 	
-	protected synchronized void setTarget(L2Object target)
+	protected void setTarget(L2Object target)
 	{
 		_target = target;
 	}

L2_GameServer/java/com/l2jserver/gameserver/datatables/AugmentationData.java

@@ -113,7 +113,7 @@ public class AugmentationData
 	private ArrayList<?>[] _redSkills = new ArrayList[10];
 	private ArrayList<?>[] _yellowSkills = new ArrayList[10];
 
-	private TIntObjectHashMap<augmentationSkill> _allSkills = new TIntObjectHashMap<augmentationSkill>(); 
+	private TIntObjectHashMap<AugmentationSkill> _allSkills = new TIntObjectHashMap<AugmentationSkill>(); 
 
 	// =========================================================
 	// Constructor
@@ -121,15 +121,15 @@ public class AugmentationData
 	{
 		_log.info("Initializing AugmentationData.");
 		
-		_augStats[0] = new ArrayList<augmentationStat>();
-		_augStats[1] = new ArrayList<augmentationStat>();
-		_augStats[2] = new ArrayList<augmentationStat>();
-		_augStats[3] = new ArrayList<augmentationStat>();
+		_augStats[0] = new ArrayList<AugmentationStat>();
+		_augStats[1] = new ArrayList<AugmentationStat>();
+		_augStats[2] = new ArrayList<AugmentationStat>();
+		_augStats[3] = new ArrayList<AugmentationStat>();
 		
-		_augAccStats[0] = new ArrayList<augmentationStat>();
-		_augAccStats[1] = new ArrayList<augmentationStat>();
-		_augAccStats[2] = new ArrayList<augmentationStat>();
-		_augAccStats[3] = new ArrayList<augmentationStat>();
+		_augAccStats[0] = new ArrayList<AugmentationStat>();
+		_augAccStats[1] = new ArrayList<AugmentationStat>();
+		_augAccStats[2] = new ArrayList<AugmentationStat>();
+		_augAccStats[3] = new ArrayList<AugmentationStat>();
 
 		// Lookup tables structure: STAT1 represent first stat, STAT2 - second.
 		// If both values are the same - use solo stat, if different - combined.
@@ -206,12 +206,12 @@ public class AugmentationData
 	// =========================================================
 	// Nested Class
 	
-	public class augmentationSkill
+	public class AugmentationSkill
 	{
 		private int _skillId;
 		private int _skillLevel;
 		
-		public augmentationSkill(int skillId, int skillLevel)
+		public AugmentationSkill(int skillId, int skillLevel)
 		{
 			_skillId = skillId;
 			_skillLevel = skillLevel;
@@ -223,7 +223,7 @@ public class AugmentationData
 		}
 	}
 	
-	public class augmentationStat
+	public class AugmentationStat
 	{
 		private final Stats _stat;
 		private final int _singleSize;
@@ -231,7 +231,7 @@ public class AugmentationData
 		private final float _singleValues[];
 		private final float _combinedValues[];
 		
-		public augmentationStat(Stats stat, float sValues[], float cValues[])
+		public AugmentationStat(Stats stat, float sValues[], float cValues[])
 		{
 			_stat = stat;
 			_singleSize = sValues.length;
@@ -350,7 +350,7 @@ public class AugmentationData
 							else
 								((ArrayList<Integer>)_redSkills[k]).add(augmentationId);
 
-							_allSkills.put(augmentationId, new augmentationSkill(skillId, skillLvL));
+							_allSkills.put(augmentationId, new AugmentationSkill(skillId, skillLvL));
 						}
 					}
 				}
@@ -424,7 +424,7 @@ public class AugmentationData
 									}
 								}
 								// store this stat
-								((ArrayList<augmentationStat>) _augStats[(i - 1)]).add(new augmentationStat(Stats.valueOfXml(statName), soloValues, combinedValues));
+								((ArrayList<AugmentationStat>) _augStats[(i - 1)]).add(new AugmentationStat(Stats.valueOfXml(statName), soloValues, combinedValues));
 							}
 						}
 					}
@@ -494,7 +494,7 @@ public class AugmentationData
 									}
 								}
 								// store this stat
-								((ArrayList<augmentationStat>) _augAccStats[(i - 1)]).add(new augmentationStat(Stats.valueOfXml(statName), soloValues, combinedValues));
+								((ArrayList<AugmentationStat>) _augAccStats[(i - 1)]).add(new AugmentationStat(Stats.valueOfXml(statName), soloValues, combinedValues));
 							}
 						}
 					}
@@ -793,14 +793,14 @@ public class AugmentationData
 				byte stat2 = STATS2_MAP[stat];
 				if (stat1 == stat2) // solo stat
 				{
-					augmentationStat as = ((augmentationStat) _augStats[color].get(stat1));
+					AugmentationStat as = ((AugmentationStat) _augStats[color].get(stat1));
 					temp.add(new AugStat(as.getStat(), as.getSingleStatValue(level)));
 				}
 				else // combined stat
 				{
-					augmentationStat as = ((augmentationStat) _augStats[color].get(stat1));					
+					AugmentationStat as = ((AugmentationStat) _augStats[color].get(stat1));					
 					temp.add(new AugStat(as.getStat(), as.getCombinedStatValue(level)));
-					as = ((augmentationStat) _augStats[color].get(stat2));
+					as = ((AugmentationStat) _augStats[color].get(stat2));
 					temp.add(new AugStat(as.getStat(), as.getCombinedStatValue(level)));
 				}
 			}
@@ -859,14 +859,14 @@ public class AugmentationData
 					byte stat2 = ACC_STATS2_MAP[stat];
 					if (stat1 == stat2) // solo
 					{
-						augmentationStat as = ((augmentationStat) _augAccStats[color].get(stat1));					
+						AugmentationStat as = ((AugmentationStat) _augAccStats[color].get(stat1));					
 						temp.add(new AugStat(as.getStat(), as.getSingleStatValue(level)));
 					}
 					else // combined
 					{
-						augmentationStat as = ((augmentationStat) _augAccStats[color].get(stat1));					
+						AugmentationStat as = ((AugmentationStat) _augAccStats[color].get(stat1));					
 						temp.add(new AugStat(as.getStat(), as.getCombinedStatValue(level)));
-						as = ((augmentationStat) _augAccStats[color].get(stat2));
+						as = ((AugmentationStat) _augAccStats[color].get(stat2));
 						temp.add(new AugStat(as.getStat(), as.getCombinedStatValue(level)));
 					}
 				}
@@ -881,7 +881,7 @@ public class AugmentationData
 	 */
 	public L2Skill getAugSkillById(int augmentationId)
 	{
-		final augmentationSkill temp = _allSkills.get(augmentationId); 
+		final AugmentationSkill temp = _allSkills.get(augmentationId); 
 		if (temp == null)
 			return null;
 

L2_GameServer/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -821,14 +821,14 @@ public class ItemTable
 				if (raid.getFirstCommandChannelAttacked() != null && !Config.AUTO_LOOT_RAIDS)
 				{
 					item.setOwnerId(raid.getFirstCommandChannelAttacked().getChannelLeader().getObjectId());
-					itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new resetOwner(item), Config.LOOT_RAIDS_PRIVILEGE_INTERVAL);
+					itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new ResetOwner(item), Config.LOOT_RAIDS_PRIVILEGE_INTERVAL);
 					item.setItemLootShedule(itemLootShedule);
 				}
 			}
 			else if (!Config.AUTO_LOOT) // other mobs loot privilege
 			{
 				item.setOwnerId(actor.getObjectId());
-				itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new resetOwner(item), 15000);
+				itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new ResetOwner(item), 15000);
 				item.setItemLootShedule(itemLootShedule);
 			}
 		}
@@ -991,11 +991,11 @@ public class ItemTable
 		load();
 	}
 	
-	protected class resetOwner implements Runnable
+	protected class ResetOwner implements Runnable
 	{
 		L2ItemInstance _item;
 		
-		public resetOwner(L2ItemInstance item)
+		public ResetOwner(L2ItemInstance item)
 		{
 			_item = item;
 		}

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -46,14 +46,14 @@ public class ItemsOnGroundManager
 	static final Logger _log = Logger.getLogger(ItemsOnGroundManager.class.getName());
 	
 	protected FastList<L2ItemInstance> _items = null;
-	private final storeInDb _task = new storeInDb();
+	private final StoreInDb _task = new StoreInDb();
 	
 	private ItemsOnGroundManager()
 	{
 		if (Config.SAVE_DROPPED_ITEM)
 			_items = new FastList<L2ItemInstance>();
 		if (Config.SAVE_DROPPED_ITEM_INTERVAL > 0)
-			ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new storeInDb(), Config.SAVE_DROPPED_ITEM_INTERVAL, Config.SAVE_DROPPED_ITEM_INTERVAL);
+			ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new StoreInDb(), Config.SAVE_DROPPED_ITEM_INTERVAL, Config.SAVE_DROPPED_ITEM_INTERVAL);
 		load();
 	}
 	
@@ -221,7 +221,7 @@ public class ItemsOnGroundManager
 		}
 	}
 	
-	protected class storeInDb extends Thread
+	protected class StoreInDb extends Thread
 	{
 		@Override
 		public synchronized void run()

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java

@@ -124,7 +124,7 @@ public class RaidBossPointsManager
     public final static void addPoints(L2PcInstance player, int bossId, int points)
     {
     	int ownerId = player.getObjectId();
-    	Map<Integer, Integer> tmpPoint = new FastMap<Integer, Integer>();
+    	Map<Integer, Integer> tmpPoint;
 		if (_list == null)
 			_list = new FastMap<Integer, Map<Integer, Integer>>();
     	tmpPoint = _list.get(ownerId);
@@ -147,7 +147,7 @@ public class RaidBossPointsManager
 
 	public final static int getPointsByOwnerId(int ownerId)
 	{
-		Map<Integer, Integer> tmpPoint = new FastMap<Integer, Integer>();
+		Map<Integer, Integer> tmpPoint;
 		if (_list == null)
 			_list = new FastMap<Integer, Map<Integer, Integer>>();
 		tmpPoint = _list.get(ownerId);

L2_GameServer/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -1418,7 +1418,7 @@ public class L2Clan
     		if(sk.getId() == id)
     		{
     			deleteSkill = sk;
-    			return;
+    			break;
     		}
     	}
     	_skillList.remove(deleteSkill);

L2_GameServer/java/com/l2jserver/gameserver/model/L2ItemInstance.java

@@ -900,7 +900,6 @@ public final class L2ItemInstance extends L2Object
 			PreparedStatement statement = con.prepareStatement("SELECT augAttributes,augSkillId,augSkillLevel,elemType,elemValue FROM item_attributes WHERE itemId=?");
 			statement.setInt(1, getObjectId());
 			ResultSet rs = statement.executeQuery();
-			rs = statement.executeQuery();
 			if (rs.next())
 			{
 				int aug_attributes = rs.getInt(1);
@@ -1434,13 +1433,13 @@ public final class L2ItemInstance extends L2Object
      * <li> Call Pet</li><BR>
      *
      */
-	public class doItemDropTask implements Runnable
+	public class ItemDropTask implements Runnable
 	{
 		private int _x,_y,_z;
 		private final L2Character _dropper;
 		private final L2ItemInstance _itm;
 
-		public doItemDropTask(L2ItemInstance item, L2Character dropper, int x, int y, int z)
+		public ItemDropTask(L2ItemInstance item, L2Character dropper, int x, int y, int z)
 		{
 			_x = x;
 			_y = y;
@@ -1492,7 +1491,7 @@ public final class L2ItemInstance extends L2Object
 
 	public final void dropMe(L2Character dropper, int x, int y, int z)
 	{
-		ThreadPoolManager.getInstance().executeTask(new doItemDropTask(this, dropper, x, y, z));
+		ThreadPoolManager.getInstance().executeTask(new ItemDropTask(this, dropper, x, y, z));
 	}
 
 	/**

L2_GameServer/java/com/l2jserver/gameserver/model/L2RecipeStatInstance.java

@@ -19,7 +19,7 @@ package com.l2jserver.gameserver.model;
  */
 public class L2RecipeStatInstance
 {
-    public static enum statType
+    public static enum StatType
     {
     	HP,
     	MP,
@@ -32,7 +32,7 @@ public class L2RecipeStatInstance
     }
 
 	/** The Identifier of the statType */
-    private statType _type;
+    private StatType _type;
 
 	/** The value of the statType */
     private int _value;
@@ -43,7 +43,7 @@ public class L2RecipeStatInstance
     public L2RecipeStatInstance(String type, int value)
     {
 		try {
-			_type = Enum.valueOf(statType.class, type);
+			_type = Enum.valueOf(StatType.class, type);
 		} catch (Exception e) {
 			throw new IllegalArgumentException();
 		}
@@ -53,7 +53,7 @@ public class L2RecipeStatInstance
 	/**
 	 * Return the the type of the L2RecipeStatInstance.<BR><BR>
 	 */
-    public statType getType()
+    public StatType getType()
     {
         return _type;
     }

L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1272,7 +1272,7 @@ public abstract class L2Character extends L2Object
 	 */
 	private boolean doAttackHitByPole(Attack attack, L2Character target, int sAtk)
 	{
-		double angleChar;
+		//double angleChar;
 		int maxRadius = getPhysicalAttackRange();
 		int maxAngleDiff = (int)getStat().calcStat(Stats.POWER_ATTACK_ANGLE, 120, null, null);
 
@@ -1304,12 +1304,12 @@ public abstract class L2Character extends L2Object
 		// Degree of o2 in respect to 01 = -40 (320) degree
 
 		// Get char's heading degree
-		angleChar = Util.convertHeadingToDegree(getHeading());
+		//angleChar = Util.convertHeadingToDegree(getHeading());
 		int attackRandomCountMax = (int)getStat().calcStat(Stats.ATTACK_COUNT_MAX, 3, null, null) - 1;
 		int attackcount = 0;
 
-		if (angleChar <= 0)
-            angleChar += 360;
+		/*if (angleChar <= 0)
+            angleChar += 360;*/
 		// ===========================================================
 
 		boolean hitted = doAttackHitSimple(attack, target, 100, sAtk);

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -908,9 +908,9 @@ public final class L2PcInstance extends L2Playable
     }
 
     //summon friend
-    private summonRequest _summonRequest = new summonRequest();
+    private SummonRequest _summonRequest = new SummonRequest();
 
-    public class summonRequest
+    public class SummonRequest
     {
     	private L2PcInstance _target = null;
     	private L2Skill _skill = null;
@@ -933,9 +933,9 @@ public final class L2PcInstance extends L2Playable
     }
     
     // open/close gates
-    private gatesRequest _gatesRequest = new gatesRequest();
+    private GatesRequest _gatesRequest = new GatesRequest();
     
-    public class gatesRequest
+    public class GatesRequest
     {
     	private L2DoorInstance _target = null;
     	public void setTarget(L2DoorInstance door)
@@ -6140,7 +6140,7 @@ public final class L2PcInstance extends L2Playable
 	/**
 	 * Return the L2PcInstance requester of a transaction (ex : FriendInvite, JoinAlly, JoinParty...).<BR><BR>
 	 */
-	public L2PcInstance getActiveRequester()
+	public synchronized L2PcInstance getActiveRequester()
 	{
 		if (_activeRequester != null)
 		{
@@ -9888,6 +9888,13 @@ public final class L2PcInstance extends L2Playable
 
 		broadcastUserInfo();
 	}
+	
+	public void setObserverCords(int x, int y, int z)
+	{
+		_obsX = getX();
+		_obsY = getY();
+		_obsZ = getZ();
+	}
 
 	public void enterOlympiadObserverMode(int x, int y, int z, int id, boolean storeCoords)
     {
@@ -9943,6 +9950,7 @@ public final class L2PcInstance extends L2Playable
 			getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 
         _observerMode = false;
+		setObserverCords(0, 0, 0);
 		sendPacket(new ObservationReturn(this));
 		broadcastUserInfo();
 	}
@@ -9963,6 +9971,7 @@ public final class L2PcInstance extends L2Playable
         Olympiad.removeSpectator(_olympiadGameId, this);
         _olympiadGameId = -1;
         _observerMode = false;
+        setObserverCords(0, 0, 0);
 		broadcastUserInfo();
     }
 
@@ -13666,7 +13675,7 @@ public final class L2PcInstance extends L2Playable
     	return _canFeed ? (getCurrentFeed() < (0.55 * getPetData(getMountNpcId()).getPetMaxFeed())):false;
     }
     
-	public class dismount implements Runnable
+	public class Dismount implements Runnable
 	{
 		public void run()
 		{
@@ -13683,7 +13692,7 @@ public final class L2PcInstance extends L2Playable
 
 	public void enteredNoLanding(int delay)
 	{
-		_dismountTask = ThreadPoolManager.getInstance().scheduleGeneral(new L2PcInstance.dismount(), delay * 1000);
+		_dismountTask = ThreadPoolManager.getInstance().scheduleGeneral(new L2PcInstance.Dismount(), delay * 1000);
 	}
 
 	public void exitedNoLanding()

L2_GameServer/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -524,7 +524,7 @@ public class Quest extends ManagedScript
 		return showResult(player, res);
 	}
 
-	public class tmpOnSkillSee implements Runnable
+	public class TmpOnSkillSee implements Runnable
 	{
 		private L2Npc _npc;
 		private L2PcInstance _caster;
@@ -532,7 +532,7 @@ public class Quest extends ManagedScript
 		private L2Object[] _targets;
 		private boolean _isPet;
 		
-		public tmpOnSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isPet)
+		public TmpOnSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isPet)
 		{
 			_npc = npc;
 			_caster = caster;
@@ -559,7 +559,7 @@ public class Quest extends ManagedScript
 	
 	public final boolean notifySkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isPet)
 	{
-		ThreadPoolManager.getInstance().executeAi(new tmpOnSkillSee(npc, caster, skill, targets, isPet));
+		ThreadPoolManager.getInstance().executeAi(new TmpOnSkillSee(npc, caster, skill, targets, isPet));
 		return true;
 	}
 	
@@ -577,13 +577,13 @@ public class Quest extends ManagedScript
 		return showResult(attacker, res);
 	}
 
-	public class tmpOnAggroEnter implements Runnable
+	public class TmpOnAggroEnter implements Runnable
 	{
 		private L2Npc _npc;
 		private L2PcInstance _pc;
 		private boolean _isPet;
 		
-		public tmpOnAggroEnter(L2Npc npc, L2PcInstance pc, boolean isPet)
+		public TmpOnAggroEnter(L2Npc npc, L2PcInstance pc, boolean isPet)
 		{
 			_npc = npc;
 			_pc = pc;
@@ -607,7 +607,7 @@ public class Quest extends ManagedScript
 	}
 	public final boolean notifyAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isPet)
 	{
-		ThreadPoolManager.getInstance().executeAi(new tmpOnAggroEnter(npc, player, isPet));
+		ThreadPoolManager.getInstance().executeAi(new TmpOnAggroEnter(npc, player, isPet));
 		return true;
 	}
 	

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java

@@ -132,14 +132,14 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 			boolean check = player.getStat().removeExpAndSp(0, requiredSp, false);
 			check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
 
+			check &= player.destroyItemByItemId("Consume", 57, requireditems, player, true);
+
 			if (!check)
 			{
 				player.sendPacket(new SystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
 				return;
 			}
-
-			check &= player.destroyItemByItemId("Consume", 57, requireditems, player, true);
-
+			
 			// ok. Destroy ONE copy of the book
 			if (Rnd.get(100) <= rate)
 			{

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendDel.java

@@ -97,7 +97,7 @@ public final class RequestFriendDel extends L2GameClientPacket{
 		    L2PcInstance player = L2World.getInstance().getPlayer(_name);
 		    if (player != null)
 		    {
-		    	player.getFriendList().remove(new Integer(activeChar.getObjectId()));
+		    	player.getFriendList().remove(Integer.valueOf(activeChar.getObjectId()));
 		    	player.sendPacket(new FriendPacket(false, activeChar.getObjectId()));
 		    }
 		}

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java

@@ -17,8 +17,6 @@ package com.l2jserver.gameserver.network.clientpackets;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.network.serverpackets.ListPartyWating;
 
 
 /**
@@ -33,16 +31,11 @@ public class RequestPartyMatchList extends L2GameClientPacket
 	private static Logger _log = Logger.getLogger(RequestPartyMatchList.class.getName());
 
 	private int _status;
-    @SuppressWarnings("unused")
-	private int _unk1;
-    @SuppressWarnings("unused")
-	private int _unk2;
-    @SuppressWarnings("unused")
-	private int _unk3;
-    @SuppressWarnings("unused")
-	private int _unk4;
-    @SuppressWarnings("unused")
-	private String _unk5;
+    /*private int _unk1;
+    private int _unk2;
+    private int _unk3;
+    private int _unk4;
+    private String _unk5;*/
 
 
 	@Override
@@ -70,9 +63,8 @@ public class RequestPartyMatchList extends L2GameClientPacket
 
 			//Collection<L2PcInstance> players = L2World.getInstance().getAllPlayers();
 			//L2PcInstance[] allPlayers = players.toArray(new L2PcInstance[players.size()]);
-			L2PcInstance[] empty = new L2PcInstance[] { };
-			@SuppressWarnings("unused")
-			ListPartyWating matchList = new ListPartyWating(empty);
+			//L2PcInstance[] empty = new L2PcInstance[] { };
+			//ListPartyWating matchList = new ListPartyWating(empty);
 			//sendPacket(matchList);
 		}
 		else if (_status == 3)

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -127,7 +127,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 					break;
 
 				case 3: // to fortress
-					fort = FortManager.getInstance().getFort(activeChar);
+					//fort = FortManager.getInstance().getFort(activeChar);
 
 					if ((activeChar.getClan() == null || activeChar.getClan().getHasFort() == 0) && !isInDefense)
 					{

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSkillList.java

@@ -25,31 +25,22 @@ public final class RequestSkillList extends L2GameClientPacket
 {
 	private static final String _C__3F_REQUESTSKILLLIST = "[C] 3F RequestSkillList";
 	//private static Logger _log = Logger.getLogger(RequestSkillList.class.getName());
-    @SuppressWarnings("unused")
-	private int _unk1;
-    @SuppressWarnings("unused")
-	private int _unk2;
-    @SuppressWarnings("unused")
-	private int _unk3;
-
-
+	
 	@Override
 	protected void readImpl()
 	{
 		// this is just a trigger packet. it has no content
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance cha = getClient().getActiveChar();
-        
-        if (cha == null)
-            return;
-
-        cha.sendSkillList(); 
+		
+		if (cha != null)
+			cha.sendSkillList(); 
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
 	 */

L2_GameServer/java/com/l2jserver/loginserver/GameServerThread.java

@@ -335,8 +335,7 @@ public class GameServerThread extends Thread
 			{
 				_log.info("ServerStatus received");
 			}
-			@SuppressWarnings("unused")
-			ServerStatus ss = new ServerStatus(data,getServerId()); //will do the actions by itself
+			new ServerStatus(data,getServerId()); //will do the actions by itself
 		}
 		else
 		{