master #7

Merged
BRNSystems merged 95 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-28 00:16:42 +01:00
Showing only changes of commit 13013d1b8b - Show all commits

@ -1743,7 +1743,7 @@ bool Game::getServerContent(bool *aborted)
// End condition // End condition
if (client->mediaReceived() && client->itemdefReceived() && if (client->mediaReceived() && client->itemdefReceived() &&
client->nodedefReceived()) { client->nodedefReceived()) {
break; return true;
} }
// Error conditions // Error conditions
@ -1802,7 +1802,9 @@ bool Game::getServerContent(bool *aborted)
} }
} }
return true; *aborted = true;
infostream << "Connect aborted [device]" << std::endl;
return false;
} }