DMs and oerkkis spawn with only_peaceful_monsters = true

[jn]

I made this simple, obvious (EDIT: slightly buggy, see below) patch, but we should probably use obj->isPeaceful().
Complaints appreciated. :-)

Your phone or window isn't wide enough to display the code box. If it's a phone, try rotating it to landscape mode.

Code: Select all

commit 9ba566da754b869b31348849ead22f0e19afa5d4
Author: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Date:   Wed Jan 11 19:19:36 2012 +0100

    content_abm: don't spawn oerkkis and DMs with only_peaceful_monsters set

diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 63867b7..5e6a6a4 100644
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -26,6 +26,7 @@
 #include "settings.h"
 #include "mapblock.h" // For getNodeBlockPos
 #include "mapgen.h" // For mapgen::make_tree
+#include "main.h" // For g_settings
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -173,7 +174,10 @@ class SpawnInCavesABM : public ActiveBlockModifier
             {
                 v3f pos = intToFloat(p1, BS);
                 int i = myrand()%5;
-                if(i == 0 || i == 1){
+                bool peaceful_only = g_settings
+                    ->getBool("only_peaceful_mobs");
+
+                if((i == 0 || i == 1) && !peaceful_only){
                     actionstream<<"A dungeon master spawns at "
                             <<PP(p1)<<std::endl;
                     Settings properties;
@@ -181,7 +185,13 @@ class SpawnInCavesABM : public ActiveBlockModifier
                     ServerActiveObject *obj = new MobV2SAO(
                             env, pos, &properties);
                     env->addActiveObject(obj);
-                } else if(i == 2 || i == 3){
+                } else if(i == 2 && !peaceful_only) {
+                    actionstream<<"An oerkki spawns at "
+                            <<PP(p1)<<std::endl;
+                    ServerActiveObject *obj = new Oerkki1SAO(
+                            env, pos);
+                    env->addActiveObject(obj);
+                } else {
                     actionstream<<"Rats spawn at "
                             <<PP(p1)<<std::endl;
                     for(int j=0; j<3; j++){
@@ -189,12 +199,6 @@ class SpawnInCavesABM : public ActiveBlockModifier
                                 env, pos);
                         env->addActiveObject(obj);
                     }
-                } else {
-                    actionstream<<"An oerkki spawns at "
-                            <<PP(p1)<<std::endl;
-                    ServerActiveObject *obj = new Oerkki1SAO(
-                            env, pos);
-                    env->addActiveObject(obj);
                 }
             }
         }



Version 2: http://paste.opensuse.org/view/raw/57678777

[dannydark]

With "one_peaceful_monsters = true" set DM's and oerkkis still spawn but should immediately de-spawn...well at least that's how I thought it worked although I don't have peaceful mode set so I could be wrong.

[Jordach]

this also despawns rats.

[IPushButton2653]

I have the same problem. I go into the minetest.conf and set it to despawn non-peaceful mobs, but they still spawn.

[jn]

With "one_peaceful_monsters = true" set DM's and oerkkis still spawn but should immediately de-spawn...well at least that's how I thought it worked although I don't have peaceful mode set so I could be wrong.

Yes, that's how it is. But I felt that preventing them from being spawned in the first place was a good idea.

this also despawns rats.

Really? This patch?

I have the same problem. I go into the minetest.conf and set it to despawn non-peaceful mobs, but they still spawn.

And do they survive the despawning of non-peaceful mobs that happens every tick, which is about five times a second at least?
If so, there's a bug somewhere else. If you just want to get rid of DMs and oerkkis in the server log, feel free to try my half-baked patch.

[IPushButton2653]

They never disappear. I made my house out of a cave, and when I return, dm griefs it :(

[jn]

@IPushBotton: are you sure you spelled the option right?

[Jordach]

@jn: heres what i mean:

Your phone or window isn't wide enough to display the code box. If it's a phone, try rotating it to landscape mode.

Code: Select all

+                    actionstream<<"An oerkki spawns at "
+                            <<PP(p1)<<std::endl;
+                    ServerActiveObject *obj = new Oerkki1SAO(
+                            env, pos);
+                    env->addActiveObject(obj);
+                } else {
                     actionstream<<"Rats spawn at "

[jn]

@Jordach: No, it doesn't (I tested it), you must have misread the patch. The block/hunk you posted stems from the fact that I reordered some of the code.
But I just noticed an actual bug in it: With one_peaceful_monsters set 2.5 times as many rats are spawned (got to fix this).

[Jordach]

maybe enforce a population check?

[jn]

A simpler second version: http://paste.opensuse.org/view/raw/57678777