diff options
| author | Mattes D <github@xoft.cz> | 2014-12-19 23:37:35 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-12-19 23:37:35 +0100 |
| commit | ffd8356fc1b7a0222b622f14ea527bf33d1d3b89 (patch) | |
| tree | 9a70b99863a3ca039881c0e42d84d4b21a8b6e43 /src/Mobs/Monster.cpp | |
| parent | Merge pull request #1679 from SphinxC0re/master (diff) | |
| parent | Fixed Guardians size and health (diff) | |
| download | cuberite-ffd8356fc1b7a0222b622f14ea527bf33d1d3b89.tar cuberite-ffd8356fc1b7a0222b622f14ea527bf33d1d3b89.tar.gz cuberite-ffd8356fc1b7a0222b622f14ea527bf33d1d3b89.tar.bz2 cuberite-ffd8356fc1b7a0222b622f14ea527bf33d1d3b89.tar.lz cuberite-ffd8356fc1b7a0222b622f14ea527bf33d1d3b89.tar.xz cuberite-ffd8356fc1b7a0222b622f14ea527bf33d1d3b89.tar.zst cuberite-ffd8356fc1b7a0222b622f14ea527bf33d1d3b89.zip | |
Diffstat (limited to 'src/Mobs/Monster.cpp')
| -rw-r--r-- | src/Mobs/Monster.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 7b8f763af..3d174677c 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 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; @@ -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; |