Selaa lähdekoodia

fixed game time on map, thx jiv

janiii 15 vuotta sitten
vanhempi
sitoutus
827a9a124b

+ 0 - 4
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/EnterWorld.java

@@ -61,7 +61,6 @@ import net.sf.l2j.gameserver.model.olympiad.Olympiad;
 import net.sf.l2j.gameserver.model.quest.Quest;
 import net.sf.l2j.gameserver.model.quest.QuestState;
 import net.sf.l2j.gameserver.network.SystemMessageId;
-import net.sf.l2j.gameserver.network.serverpackets.ClientSetTime;
 import net.sf.l2j.gameserver.network.serverpackets.Die;
 import net.sf.l2j.gameserver.network.serverpackets.EtcStatusUpdate;
 import net.sf.l2j.gameserver.network.serverpackets.ExBasicActionList;
@@ -340,9 +339,6 @@ public class EnterWorld extends L2GameClientPacket
 
 		sendPacket(new SystemMessage(SystemMessageId.WELCOME_TO_LINEAGE));
 
-		// Send client time
-		sendPacket(ClientSetTime.STATIC_PACKET);
-
 		activeChar.sendMessage(getText("VGhpcyBzZXJ2ZXIgdXNlcyBMMkosIGEgcHJvamVjdCBmb3VuZGVkIGJ5IEwyQ2hlZg==\n"));
 		activeChar.sendMessage(getText("YW5kIGRldmVsb3BlZCBieSB0aGUgTDJKIERldiBUZWFtIGF0IGwyanNlcnZlci5jb20=\n"));
 

+ 31 - 30
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/CharSelected.java

@@ -1,33 +1,32 @@
 /*
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with this program. If
+ * not, see <http://www.gnu.org/licenses/>.
  */
 package net.sf.l2j.gameserver.network.serverpackets;
 
+import net.sf.l2j.gameserver.GameTimeController;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 
 /**
  * This class ...
- *
+ * 
  * @version $Revision: 1.4.2.5.2.6 $ $Date: 2005/03/27 15:29:39 $
  */
 public class CharSelected extends L2GameServerPacket
 {
-	//   SdSddddddddddffddddddddddddddddddddddddddddddddddddddddd d
+	// SdSddddddddddffddddddddddddddddddddddddddddddddddddddddd d
 	private static final String _S__21_CHARSELECTED = "[S] 0b CharSelected";
 	private L2PcInstance _activeChar;
 	private int _sessionId;
-
+	
 	/**
 	 * @param _characters
 	 */
@@ -36,32 +35,32 @@ public class CharSelected extends L2GameServerPacket
 		_activeChar = cha;
 		_sessionId = sessionId;
 	}
-
+	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x0b);
-
+		
 		writeS(_activeChar.getName());
 		writeD(_activeChar.getCharId()); // ??
 		writeS(_activeChar.getTitle());
 		writeD(_sessionId);
 		writeD(_activeChar.getClanId());
-		writeD(0x00);  //??
-		writeD(_activeChar.getAppearance().getSex()? 1 : 0);
+		writeD(0x00); // ??
+		writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
 		writeD(_activeChar.getRace().ordinal());
 		writeD(_activeChar.getClassId().getId());
 		writeD(0x01); // active ??
 		writeD(_activeChar.getX());
 		writeD(_activeChar.getY());
 		writeD(_activeChar.getZ());
-
+		
 		writeF(_activeChar.getCurrentHp());
 		writeF(_activeChar.getCurrentMp());
 		writeD(_activeChar.getSp());
 		writeQ(_activeChar.getExp());
 		writeD(_activeChar.getLevel());
-		writeD(_activeChar.getKarma());	// thx evill33t
+		writeD(_activeChar.getKarma()); // thx evill33t
 		writeD(_activeChar.getPkKills());
 		writeD(_activeChar.getINT());
 		writeD(_activeChar.getSTR());
@@ -69,22 +68,24 @@ public class CharSelected extends L2GameServerPacket
 		writeD(_activeChar.getMEN());
 		writeD(_activeChar.getDEX());
 		writeD(_activeChar.getWIT());
-        
-		writeD(2158); //?
+		
+		writeD(GameTimeController.getInstance().getGameTime());
 		writeD(0x00);
-
+		
 		writeD(_activeChar.getClassId().getId());
-
+		
+		writeD(0x00);
+		writeD(0x00);
 		writeD(0x00);
 		writeD(0x00);
+		
+		writeB(new byte[64]);
 		writeD(0x00);
-		writeD(0x00); 
-        
-        writeB(new byte[64]);
-        writeD(0x00);
 	}
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see net.sf.l2j.gameserver.serverpackets.ServerBasePacket#getType()
 	 */
 	@Override
@@ -92,5 +93,5 @@ public class CharSelected extends L2GameServerPacket
 	{
 		return _S__21_CHARSELECTED;
 	}
-
+	
 }