Browse Source

fix olympiad user info packet

janiii 15 năm trước cách đây
mục cha
commit
6bfeed3830

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

@@ -4380,7 +4380,7 @@ public final class L2PcInstance extends L2Playable
         	//synchronized (getKnownList().getKnownPlayers())
         	//synchronized (getKnownList().getKnownPlayers())
         	if (players != null && !players.isEmpty())
         	if (players != null && !players.isEmpty())
 			{
 			{
-            	ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this, 2);
+            	ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this);
 
 
             	for (L2PcInstance player : players)
             	for (L2PcInstance player : players)
 				{
 				{
@@ -4396,7 +4396,7 @@ public final class L2PcInstance extends L2Playable
         	players = Olympiad.getInstance().getSpectators(_olympiadGameId);
         	players = Olympiad.getInstance().getSpectators(_olympiadGameId);
             if(players != null && !players.isEmpty())
             if(players != null && !players.isEmpty())
             {
             {
-            	ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this, getOlympiadSide());
+            	ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this);
 
 
             	for(L2PcInstance spectator : players)
             	for(L2PcInstance spectator : players)
                 {
                 {

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -1692,8 +1692,8 @@ public class Olympiad
 					|| !game._playerTwo.isOlympiadStart())
 					|| !game._playerTwo.isOlympiadStart())
 				return;
 				return;
 
 
-			player.sendPacket(new ExOlympiadUserInfo(game._playerOne, 1));
-			player.sendPacket(new ExOlympiadUserInfo(game._playerTwo, 2));
+			player.sendPacket(new ExOlympiadUserInfo(game._playerOne));
+			player.sendPacket(new ExOlympiadUserInfo(game._playerTwo));
 		}
 		}
 	}
 	}
 	
 	

+ 6 - 6
L2_GameServer/java/com/l2jserver/gameserver/model/olympiad/OlympiadGame.java

@@ -1168,18 +1168,18 @@ class OlympiadGameTask implements Runnable
 			return false;
 			return false;
 		}
 		}
 
 
-		_game._playerOne.sendPacket(new ExOlympiadUserInfo(_game._playerOne, 1));
-		_game._playerOne.sendPacket(new ExOlympiadUserInfo(_game._playerTwo, 2));
-		_game._playerTwo.sendPacket(new ExOlympiadUserInfo(_game._playerTwo, 1));
-		_game._playerTwo.sendPacket(new ExOlympiadUserInfo(_game._playerOne, 2));
+		_game._playerOne.sendPacket(new ExOlympiadUserInfo(_game._playerOne));
+		_game._playerOne.sendPacket(new ExOlympiadUserInfo(_game._playerTwo));
+		_game._playerTwo.sendPacket(new ExOlympiadUserInfo(_game._playerTwo));
+		_game._playerTwo.sendPacket(new ExOlympiadUserInfo(_game._playerOne));
 		if (OlympiadManager.STADIUMS[_game._stadiumID].getSpectators() != null)
 		if (OlympiadManager.STADIUMS[_game._stadiumID].getSpectators() != null)
 		{
 		{
 			for (L2PcInstance spec : OlympiadManager.STADIUMS[_game._stadiumID].getSpectators())
 			for (L2PcInstance spec : OlympiadManager.STADIUMS[_game._stadiumID].getSpectators())
 			{
 			{
 				if (spec != null)
 				if (spec != null)
 				{
 				{
-					spec.sendPacket(new ExOlympiadUserInfo(_game._playerOne, 1));
-					spec.sendPacket(new ExOlympiadUserInfo(_game._playerTwo, 2));
+					spec.sendPacket(new ExOlympiadUserInfo(_game._playerOne));
+					spec.sendPacket(new ExOlympiadUserInfo(_game._playerTwo));
 				}
 				}
 			}
 			}
 		}
 		}

+ 2 - 4
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadUserInfo.java

@@ -28,7 +28,6 @@ public class ExOlympiadUserInfo extends L2GameServerPacket
 {
 {
 	// chcdSddddd
 	// chcdSddddd
 	private static final String _S__FE_29_OLYMPIADUSERINFO = "[S] FE:7A ExOlympiadUserInfo";
 	private static final String _S__FE_29_OLYMPIADUSERINFO = "[S] FE:7A ExOlympiadUserInfo";
-	private int _side;
 	private L2PcInstance _player;
 	private L2PcInstance _player;
 
 
 
 
@@ -36,10 +35,9 @@ public class ExOlympiadUserInfo extends L2GameServerPacket
 	 * @param _player
 	 * @param _player
 	 * @param _side (1 = right, 2 = left)
 	 * @param _side (1 = right, 2 = left)
 	 */
 	 */
-	public ExOlympiadUserInfo(L2PcInstance player, int side)
+	public ExOlympiadUserInfo(L2PcInstance player)
 	{
 	{
 		_player = player;
 		_player = player;
-		_side = side;
 	}
 	}
 
 
 
 
@@ -48,7 +46,7 @@ public class ExOlympiadUserInfo extends L2GameServerPacket
 	{
 	{
 		writeC(0xfe);
 		writeC(0xfe);
 		writeH(0x7a);
 		writeH(0x7a);
-		writeC(_side);
+		writeC(_player.getOlympiadSide());
 		writeD(_player.getObjectId());
 		writeD(_player.getObjectId());
 		writeS(_player.getName());
 		writeS(_player.getName());
 		writeD(_player.getClassId().getId());
 		writeD(_player.getClassId().getId());