fishing packet fix, luminous lure fix, protocol 152 Die packet update, cleanup, thx pixie

L2_GameServer/java/com/l2jserver/Config.java

@@ -1778,7 +1778,7 @@ public final class Config
 					DEEPBLUE_DROP_RULES_RAID = Boolean.parseBoolean(NPC.getProperty("UseDeepBlueDropRulesRaid", "True"));
 					SHOW_NPC_LVL = Boolean.parseBoolean(NPC.getProperty("ShowNpcLevel", "False"));
 					SHOW_CREST_WITHOUT_QUEST = Boolean.parseBoolean(NPC.getProperty("ShowCrestWithoutQuest", "False"));
-					ENABLE_RANDOM_ENCHANT_EFFECT = Boolean.parseBoolean(NPC.getProperty("EnableRandomEnchantEffect", "False"));;
+					ENABLE_RANDOM_ENCHANT_EFFECT = Boolean.parseBoolean(NPC.getProperty("EnableRandomEnchantEffect", "False"));
 					MIN_NPC_LVL_DMG_PENALTY = Integer.parseInt(NPC.getProperty("MinNPCLevelForDmgPenalty", "78"));
 					MIN_NPC_LVL_MAGIC_PENALTY = Integer.parseInt(NPC.getProperty("MinNPCLevelForMagicPenalty", "78"));
 					ENABLE_DROP_VITALITY_HERBS = Boolean.parseBoolean(NPC.getProperty("EnableVitalityHerbs", "True"));

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

@@ -389,7 +389,7 @@ public class MapRegionTable
 					}
 					
 					if (castle != null && castle.getCastleId() > 0)
-						return castle.getZone().getSpawnLoc();;
+						return castle.getZone().getSpawnLoc();
 				}
 				
 				// If teleport to fortress

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

@@ -23,6 +23,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PenaltyMonsterInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExFishingHpRegen;
 import com.l2jserver.gameserver.network.serverpackets.ExFishingStartCombat;
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
@@ -91,7 +92,7 @@ public class L2Fishing implements Runnable
 
 		ExFishingStartCombat efsc = new ExFishingStartCombat(_fisher, _time, _fishMaxHp, _mode, _lureType, _deceptiveMode);
 		_fisher.broadcastPacket(efsc);
-
+		_fisher.sendPacket(new PlaySound(1, "SF_S_01", 0, 0, 0, 0, 0));
 		// Succeeded in getting a bite
 		_fisher.sendPacket(new SystemMessage(SystemMessageId.GOT_A_BITE));
 

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

@@ -195,6 +195,7 @@ import com.l2jserver.gameserver.network.serverpackets.ObservationMode;
 import com.l2jserver.gameserver.network.serverpackets.ObservationReturn;
 import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowUpdate;
 import com.l2jserver.gameserver.network.serverpackets.PetInventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
 import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListDelete;
 import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
 import com.l2jserver.gameserver.network.serverpackets.PrivateStoreListBuy;
@@ -4893,7 +4894,7 @@ public final class L2PcInstance extends L2Playable
 	}
     
     @Override
-	public boolean isTransformed()
+    public boolean isTransformed()
     {
         return _transformation != null && !_transformation.isStance();
     }
@@ -4927,7 +4928,7 @@ public final class L2PcInstance extends L2Playable
     }
     
     @Override
-	public void untransform()
+    public void untransform()
     {
         if (_transformation != null)
         {
@@ -11905,7 +11906,7 @@ public final class L2PcInstance extends L2Playable
         _fishx = _x;
         _fishy = _y;
         _fishz = _z;
-        broadcastUserInfo();
+        //broadcastUserInfo();
         //Starts fishing
     	int lvl = GetRandomFishLvl();
 		int group = GetRandomGroup();
@@ -11923,12 +11924,11 @@ public final class L2PcInstance extends L2Playable
 		fishs.clear();
 		fishs = null;
         sendPacket(new SystemMessage(SystemMessageId.CAST_LINE_AND_START_FISHING));
-        ExFishingStart efs = null;
         if (!GameTimeController.getInstance().isNowNight() && _lure.isNightLure())
         	_fish.setType(-1);
 		//sendMessage("Hook x,y: " + _x + "," + _y + " - Water Z, Player Z:" + _z + ", " + getZ()); //debug line, uncoment to show coordinates used in fishing.
-    	efs = new ExFishingStart(this,_fish.getType(),_x,_y,_z,_lure.isNightLure());
-        broadcastPacket(efs);
+        broadcastPacket(new ExFishingStart(this,_fish.getType(),_x,_y,_z,_lure.isNightLure()));
+        sendPacket(new PlaySound(1, "SF_P_01", 0, 0, 0, 0, 0));
         startLookingForFishTask();
     }
     public void stopLookingForFishTask()
@@ -12156,18 +12156,17 @@ public final class L2PcInstance extends L2Playable
     
 	public void endFishing(boolean win)
     {
-        ExFishingEnd efe = new ExFishingEnd(win, this);
-        broadcastPacket(efe);
         _fishing = false;
         _fishx = 0;
         _fishy = 0;
         _fishz = 0;
-        broadcastUserInfo();
+        //broadcastUserInfo();
         if (_fishCombat == null)
             sendPacket(new SystemMessage(SystemMessageId.BAIT_LOST_FISH_GOT_AWAY));
         _fishCombat = null;
         _lure = null;
         //Ends fishing
+        broadcastPacket(new ExFishingEnd(win, this));
         sendPacket(new SystemMessage(SystemMessageId.REEL_LINE_AND_STOP_FISHING));
         setIsImmobilized(false);
         stopLookingForFishTask();

L2_GameServer/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java

@@ -120,7 +120,7 @@ public class DimensionalRift
 			public void run()
 			{
 				if (_choosenRoom > -1)
-					DimensionalRiftManager.getInstance().getRoom(_type, _choosenRoom).unspawn().setpartyInside(false);;
+					DimensionalRiftManager.getInstance().getRoom(_type, _choosenRoom).unspawn().setpartyInside(false);
 				
 				if (reasonTP && jumps_current < getMaxJumps() && _party.getMemberCount() > deadPlayers.size())
 				{
@@ -231,7 +231,7 @@ public class DimensionalRift
 		else
 			_hasJumped = true;
 		
-		DimensionalRiftManager.getInstance().getRoom(_type, _choosenRoom).unspawn().setpartyInside(false);;
+		DimensionalRiftManager.getInstance().getRoom(_type, _choosenRoom).unspawn().setpartyInside(false);
 		_completedRooms.add(_choosenRoom);
 		_choosenRoom = -1;
 		

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

@@ -60,7 +60,7 @@ public final class RequestGMCommand extends L2GameClientPacket
 
 		L2PcInstance player = L2World.getInstance().getPlayer(_targetName);
 
-		L2Clan clan = ClanTable.getInstance().getClanByName(_targetName);;
+		L2Clan clan = ClanTable.getInstance().getClanByName(_targetName);
 		
 		// player name was incorrect?
 		if (player == null && (clan == null || _command != 6))

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

@@ -170,7 +170,8 @@ public final class RequestRestartPoint extends L2GameClientPacket
 					instanceId = activeChar.getInstanceId();
 					loc = new Location(activeChar.getX(), activeChar.getY(), activeChar.getZ()); // spawn them where they died
 					break;
-
+				case 6: // TODO: agathion ress
+					break;
 				case 27: // to jail
 					if (!activeChar.isInJail()) return;
 					loc = new Location(-114356, -249645, -2984);

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/Die.java

@@ -118,7 +118,6 @@ public class Die extends L2GameServerPacket
             writeD(_sweepable ? 0x01 : 0x00);                               // sweepable  (blue glow)
             writeD(_access.allowFixedRes() ? 0x01: 0x00);                  // 6d 04 00 00 00 - to FIXED
             writeD(_clan.getHasFort() > 0  || isInFortDefense? 0x01 : 0x00);    // 6d 05 00 00 00 - to fortress
-
         }
         else
         {
@@ -129,7 +128,12 @@ public class Die extends L2GameServerPacket
             writeD(_access.allowFixedRes() ? 0x01: 0x00);                  // 6d 04 00 00 00 - to FIXED
             writeD(0x00);    // 6d 05 00 00 00 - to fortress
         }
-
+        //TODO: protocol 152
+        /*
+        writeC(0); //?
+        writeD(0); //agathion ress button
+        writeD(0); //?
+        */
     }
 
     /* (non-Javadoc)

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExFishingStart.java

@@ -26,7 +26,6 @@ public class ExFishingStart extends L2GameServerPacket
 	private static final String _S__FE_13_EXFISHINGSTART = "[S] FE:1e ExFishingStart";
 	private L2Character _activeChar;
 	private int _x,_y,_z, _fishType;
-	@SuppressWarnings("unused")
 	private boolean _isNightLure;
 
 	public ExFishingStart(L2Character character, int fishType, int x, int y,int z, boolean isNightLure)
@@ -49,13 +48,11 @@ public class ExFishingStart extends L2GameServerPacket
 		writeH(0x1e);
 		writeD(_activeChar.getObjectId());
 		writeD(_fishType); // fish type
-		writeD(_x); // x poisson
-		writeD(_y); // y poisson
-		writeD(_z); // z poisson
-		writeC(0x00); // night lure
-		writeC(0x00); //??
-		writeC((_fishType >= 7 && _fishType <= 9) ? 0x01 : 0x00); // 0 = day lure  1 = night lure
-		writeC(0x00);
+		writeD(_x); // x position
+		writeD(_y); // y position
+		writeD(_z); // z position
+		writeC(_isNightLure ? 0x01 : 0x00); // night lure
+		writeC(0x00); //show fish rank result button
 	}
 
 	/* (non-Javadoc)

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/MonRaceInfo.java

@@ -53,7 +53,7 @@ public class MonRaceInfo extends L2GameServerPacket
         _speeds     = speeds;
     }
 
-//  0xf3;;EtcStatusUpdatePacket;ddddd
+//  0xf3;EtcStatusUpdatePacket;ddddd
 
 
     @Override

L2_GameServer/java/com/l2jserver/gameserver/util/Util.java

@@ -105,7 +105,7 @@ public final class Util
 		return (int) (angleTarget * 182.044444444);
 	}
 	
-	public static double calculateDistance(int x1, int y1, int z1, int x2, int y2)
+	public static double calculateDistance(int x1, int y1, int x2, int y2)
 	{
 		return calculateDistance(x1, y1, 0, x2, y2, 0, false);
 	}