diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-07-30 23:33:57 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-30 23:33:57 +0300 |
| commit | 8e1eacf3a87a0cee39c8c27c3846828c12e73f9d (patch) | |
| tree | 0863d9782fa44d73ae25867aba1edacae6f15252 /src/server.cpp | |
| parent | 4ccc99b291d7aa9ccb3e3c56f9d63bf30e02b0b9 (diff) | |
| download | minetest-8e1eacf3a87a0cee39c8c27c3846828c12e73f9d.tar.gz minetest-8e1eacf3a87a0cee39c8c27c3846828c12e73f9d.tar.bz2 minetest-8e1eacf3a87a0cee39c8c27c3846828c12e73f9d.zip | |
Fixed handling of inventory in creative mode (normal inventory is not trashed anymore), fixed mese pick speed, added some forgotten stuff
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/server.cpp b/src/server.cpp index 07f9875c4..503d60b84 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -4130,6 +4130,11 @@ Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id // Reset inventory to creative if in creative mode if(g_settings.getBool("creative_mode")) { + // Warning: double code below + // Backup actual inventory + player->inventory_backup = new Inventory(); + *(player->inventory_backup) = player->inventory; + // Set creative inventory craft_set_creative_inventory(player); } @@ -4183,6 +4188,11 @@ Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id if(g_settings.getBool("creative_mode")) { + // Warning: double code above + // Backup actual inventory + player->inventory_backup = new Inventory(); + *(player->inventory_backup) = player->inventory; + // Set creative inventory craft_set_creative_inventory(player); } else if(g_settings.getBool("give_initial_stuff")) |