From cd0019acd28bf7d2b6de44fc366804f0d17c80b2 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 2 Jan 2012 17:44:00 +0200 Subject: Fix server sending stuff before textures have been sent --- src/server.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/server.cpp') diff --git a/src/server.cpp b/src/server.cpp index 5bd072d02..b76d0e41a 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2140,9 +2140,6 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) m_con.Send(peer_id, 0, data, true); } - // Now the client should know about everything - getClient(peer_id)->definitions_sent = true; - // Send information about server to player in chat SendChatMessage(peer_id, getStatusString()); @@ -2849,6 +2846,10 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) } SendTexturesRequested(peer_id, tosend); + + // Now the client should know about everything + // (definitions and textures) + getClient(peer_id)->definitions_sent = true; } else if(command == TOSERVER_INTERACT) { -- cgit v1.2.3