diff options
| author | Masy98 <masy@antheruscraft.de> | 2014-12-18 20:44:39 +0100 |
|---|---|---|
| committer | Masy98 <masy@antheruscraft.de> | 2014-12-18 20:44:39 +0100 |
| commit | f09c6701eb9126b627503bc301084ffb4039fabd (patch) | |
| tree | b58887c0f106d0c39290036ebb7850181c5092d8 /src | |
| parent | Merge branch 'master' into entities (diff) | |
| download | cuberite-f09c6701eb9126b627503bc301084ffb4039fabd.tar cuberite-f09c6701eb9126b627503bc301084ffb4039fabd.tar.gz cuberite-f09c6701eb9126b627503bc301084ffb4039fabd.tar.bz2 cuberite-f09c6701eb9126b627503bc301084ffb4039fabd.tar.lz cuberite-f09c6701eb9126b627503bc301084ffb4039fabd.tar.xz cuberite-f09c6701eb9126b627503bc301084ffb4039fabd.tar.zst cuberite-f09c6701eb9126b627503bc301084ffb4039fabd.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Mobs/Monster.cpp | 2 | ||||
| -rw-r--r-- | src/World.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 963ca628c..3d174677c 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -844,7 +844,7 @@ cMonster::eFamily cMonster::FamilyFromType(eMonsterType a_Type) case mtEnderman: return mfHostile; case mtGhast: return mfHostile; case mtGiant: return mfNoSpawn; - case mtGuardian: return mfNoSpawn; // Just because they have special spawning conditions. If Watertemples have been added, this needs to be edited! + case mtGuardian: return mfWater; // Just because they have special spawning conditions. If Watertemples have been added, this needs to be edited! case mtHorse: return mfPassive; case mtIronGolem: return mfPassive; case mtMagmaCube: return mfHostile; diff --git a/src/World.cpp b/src/World.cpp index b3d34b48c..69b39f831 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -776,7 +776,7 @@ void cWorld::InitialiseAndLoadMobSpawningValues(cIniFile & a_IniFile) AString DefaultMonsters; switch (m_Dimension) { - case dimOverworld: DefaultMonsters = "bat, cavespider, chicken, cow, creeper, enderman, guardian, horse, mooshroom, ocelot, pig, sheep, silverfish, skeleton, slime, spider, squid, wolf, zombie"; break; + case dimOverworld: DefaultMonsters = "bat, cavespider, chicken, cow, creeper, enderman, horse, mooshroom, ocelot, pig, sheep, silverfish, skeleton, slime, spider, squid, wolf, zombie"; break; case dimNether: DefaultMonsters = "blaze, ghast, magmacube, skeleton, zombie, zombiepigman"; break; case dimEnd: DefaultMonsters = "enderman"; break; case dimNotSet: ASSERT(!"Dimension not set"); break; |