Set server_announce to world.mt and respect modes when changing subgame

[minetest.git] / src / treegen.cpp

diff --git a/src/treegen.cpp b/src/treegen.cpp
index 1c915ca39052dfbf32654112e67dc203675f1912..a85d88815357ba55d5917b380ad81261ea32f7a8 100644 (file)
--- a/src/treegen.cpp
+++ b/src/treegen.cpp
@@ -656,15 +656,8 @@ void make_jungletree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, int seed
                and in games that have saplings; both are deprecated but not
                replaced yet
        */
-       content_t c_tree   = ndef->getId("mapgen_jungletree");
-       content_t c_leaves = ndef->getId("mapgen_jungleleaves");
-       if (c_tree == CONTENT_IGNORE)
-               c_tree = ndef->getId("mapgen_tree");
-       if (c_leaves == CONTENT_IGNORE)
-               c_leaves = ndef->getId("mapgen_leaves");
-
-       MapNode treenode(c_tree);
-       MapNode leavesnode(c_leaves);
+       MapNode treenode(ndef->getId("mapgen_jungletree"));
+       MapNode leavesnode(ndef->getId("mapgen_jungleleaves"));
 
        PseudoRandom pr(seed);
        for (s16 x= -1; x <= 1; x++)