Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
proller committed Nov 24, 2024
1 parent a218f55 commit 089612c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/client/content_cao.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,6 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
updateAnimation();
updateBones(.0f);
updateAttachments();

setNodeLight(m_last_light);
updateMeshCulling();

Expand Down
2 changes: 1 addition & 1 deletion src/client/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2590,7 +2590,7 @@ void Game::openInventory()
*/

LocalPlayer *player = client->getEnv().getLocalPlayer();
if (!player || !player->getCAO())
if (!player)
return;

infostream << "Game: Launching inventory" << std::endl;
Expand Down
2 changes: 1 addition & 1 deletion src/defaultsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void fm_set_default_settings(Settings *settings) {
settings->setDefault("reconnects", win ? "1" : "10"); // TODO: wix windows

// Map generation
settings->setDefault("mg_name", "indev"); // "v6"
//settings->setDefault("mg_name", "indev"); // "v6"
//settings->setDefault("mg_flags", "trees, caves, dungeons"); // "dungeons"
//settings->setDefault("mgv6_spflags", "jungles, biome_blend, snowbiomes"); // "jungles, snowbiomes"
settings->setDefault("mg_math", ""); // configuration in json struct
Expand Down
1 change: 1 addition & 0 deletions src/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2493,6 +2493,7 @@ void Server::SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersa
}

#if MINETEST_PROTO
Send(&pkt);
#else
MSGPACK_PACKET_INIT(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD, 2);
PACK(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD_REMOVE, removed_objects_data);
Expand Down
2 changes: 1 addition & 1 deletion src/threading/async.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class async_step_runner
DUMP("Async steps end", (long)this, runs, skips);
#endif
}
int wait(const int ms = 60000, const int step_ms = 100)
int wait(const int ms = 300000, const int step_ms = 100)
{
int i = 0;
for (; i < ms / step_ms; ++i) { // 10s max
Expand Down

0 comments on commit 089612c

Please sign in to comment.