lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a little regression on SendActiveObjectMessages which send all TOCLIENT_ACTIVE_OBJECT_MESSAGES as reliable

master
Loic Blot 2015-03-17 09:16:39 +01:00
parent dbe5a446c3
commit bfc4652c66
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.cpp
View File

@ -845,7 +845,7 @@ void Server::AsyncRunStep(bool initial_step)
} }
if(unreliable_data.size() > 0) { if(unreliable_data.size() > 0) {
SendActiveObjectMessages(client->peer_id, unreliable_data); SendActiveObjectMessages(client->peer_id, unreliable_data, false);
} }
} }
m_clients.Unlock(); m_clients.Unlock();
@ -1893,13 +1893,17 @@ u32 Server::SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas)
return pkt.getSize(); return pkt.getSize();
} }
void Server::SendActiveObjectMessages(u16 peer_id, const std::string &datas) void Server::SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable)
{ {
NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_MESSAGES, NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_MESSAGES,
0, peer_id); 0, peer_id);
pkt.putRawString(datas.c_str(), datas.size()); pkt.putRawString(datas.c_str(), datas.size());
Send(&pkt);
m_clients.send(pkt.getPeerId(),
clientCommandFactoryTable[pkt.getCommand()].channel,
&pkt, reliable);
} }
s32 Server::playSound(const SimpleSoundSpec &spec, s32 Server::playSound(const SimpleSoundSpec &spec,

2
src/server.h
View File

@ -464,7 +464,7 @@ private:
bool collisiondetection, bool vertical, std::string texture); bool collisiondetection, bool vertical, std::string texture);
u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas); u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
void SendActiveObjectMessages(u16 peer_id, const std::string &datas); void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);
/* /*
Something random Something random
*/ */