summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Monster.cpp
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-12-18 19:30:32 +0100
committerMasy98 <masy@antheruscraft.de>2014-12-18 19:30:32 +0100
commitc836b52dd1b8d6a2999721f235e6c2b6079b266c (patch)
treeae04bd279e3bddb94119ce0b9f9aed9344f8f140 /src/Mobs/Monster.cpp
parentClang needs the libstdc++ that comes with gcc-4.8 (diff)
downloadcuberite-c836b52dd1b8d6a2999721f235e6c2b6079b266c.tar
cuberite-c836b52dd1b8d6a2999721f235e6c2b6079b266c.tar.gz
cuberite-c836b52dd1b8d6a2999721f235e6c2b6079b266c.tar.bz2
cuberite-c836b52dd1b8d6a2999721f235e6c2b6079b266c.tar.lz
cuberite-c836b52dd1b8d6a2999721f235e6c2b6079b266c.tar.xz
cuberite-c836b52dd1b8d6a2999721f235e6c2b6079b266c.tar.zst
cuberite-c836b52dd1b8d6a2999721f235e6c2b6079b266c.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Monster.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 7b8f763af..963ca628c 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -38,6 +38,7 @@ static const struct
{mtEnderman, "enderman", "Enderman"},
{mtEnderDragon, "enderdragon", "EnderDragon"},
{mtGhast, "ghast", "Ghast"},
+ {mtGuardian, "guardian", "Guardian"},
{mtHorse, "horse", "EntityHorse"},
{mtIronGolem, "irongolem", "VillagerGolem"},
{mtMagmaCube, "magmacube", "LavaSlime"},
@@ -513,6 +514,7 @@ void cMonster::KilledBy(TakeDamageInfo & a_TDI)
case mtCreeper:
case mtEnderman:
case mtGhast:
+ case mtGuardian:
case mtSilverfish:
case mtSkeleton:
case mtSpider:
@@ -842,6 +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 mtHorse: return mfPassive;
case mtIronGolem: return mfPassive;
case mtMagmaCube: return mfHostile;
@@ -955,6 +958,7 @@ cMonster * cMonster::NewMonsterFromType(eMonsterType a_MobType)
case mtEnderman: toReturn = new cEnderman(); break;
case mtGhast: toReturn = new cGhast(); break;
case mtGiant: toReturn = new cGiant(); break;
+ case mtGuardian: toReturn = new cGuardian(); break;
case mtIronGolem: toReturn = new cIronGolem(); break;
case mtMooshroom: toReturn = new cMooshroom(); break;
case mtOcelot: toReturn = new cOcelot(); break;