diff options
| author | Kahrl <kahrl@gmx.net> | 2012-01-23 15:28:57 +0100 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-01-25 20:18:20 +0200 |
| commit | 0e8bd531c243c4e19217ef249c2316710cee44cc (patch) | |
| tree | e677a8d48cf38c3f87f743aeb3061ff4dfff96e4 | |
| parent | 24b1008d5634eb0941a6f97743dbbf1f8c353baf (diff) | |
| download | minetest-0e8bd531c243c4e19217ef249c2316710cee44cc.tar.gz minetest-0e8bd531c243c4e19217ef249c2316710cee44cc.tar.bz2 minetest-0e8bd531c243c4e19217ef249c2316710cee44cc.zip | |
Fix craftresult_is_preview flood in log and remove unnecessary debug output
| -rw-r--r-- | data/builtin.lua | 1 | ||||
| -rw-r--r-- | src/player.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/data/builtin.lua b/data/builtin.lua index 2e31c43b8..3a38b60ad 100644 --- a/data/builtin.lua +++ b/data/builtin.lua @@ -159,7 +159,6 @@ function minetest.get_node_drops(nodename, toolname) local drop = ItemStack({name=nodename}):get_definition().drop if drop == nil then -- default drop - print("default drop: " .. nodename) return {ItemStack({name=nodename})} elseif type(drop) == "string" then -- itemstring drop diff --git a/src/player.cpp b/src/player.cpp index 688be5d98..6506c43c3 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -156,10 +156,6 @@ void Player::deSerialize(std::istream &is) setPitch(args.getFloat("pitch")); setYaw(args.getFloat("yaw")); setPosition(args.getV3F("position")); - bool craftresult_is_preview = true; - try{ - craftresult_is_preview = args.getBool("craftresult_is_preview"); - }catch(SettingNotFoundException &e){} try{ hp = args.getS32("hp"); }catch(SettingNotFoundException &e){ @@ -173,6 +169,9 @@ void Player::deSerialize(std::istream &is) // Convert players without craftpreview inventory.addList("craftpreview", 1); + bool craftresult_is_preview = true; + if(args.exists("craftresult_is_preview")) + craftresult_is_preview = args.getBool("craftresult_is_preview"); if(craftresult_is_preview) { // Clear craftresult |