Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -86,7 +86,6 @@ struct PacketWriter : SaveFilter {
|
||||
|
||||
/* This must all wait until the Destroy function is called. */
|
||||
|
||||
Debug(net, 0, "Destruct!");
|
||||
this->packets.clear();
|
||||
this->current = nullptr;
|
||||
}
|
||||
@@ -2213,9 +2212,6 @@ void NetworkServerNewCompany(const Company *c, NetworkClientInfo *ci)
|
||||
Command<CMD_RENAME_PRESIDENT>::SendNet(STR_NULL, c->index, ci->client_name);
|
||||
}
|
||||
|
||||
/* Announce new company on network. */
|
||||
NetworkAdminCompanyInfo(c, true);
|
||||
|
||||
if (ci != nullptr) {
|
||||
/* ci is nullptr when replaying, or for AIs. In neither case there is a client.
|
||||
We need to send Admin port update here so that they first know about the new company
|
||||
|
||||
Reference in New Issue
Block a user