3 files changed, 30 insertions, 1 deletions

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index e5d21b2f2..76df76633 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -40,8 +40,10 @@ static const struct
 	{cMonster::mtCow,          "cow"},
 	{cMonster::mtCreeper,      "creeper"},
 	{cMonster::mtEnderman,     "enderman"},
+	{cMonster::mtEnderDragon,  "enderdragon"},
 	{cMonster::mtGhast,        "ghast"},
 	{cMonster::mtHorse,        "horse"},
+	{cMonster::mtIronGolem,    "irongolem"},
 	{cMonster::mtMagmaCube,    "magmacube"},
 	{cMonster::mtMooshroom,    "mooshroom"},
 	{cMonster::mtOcelot,       "ocelot"},
@@ -49,11 +51,13 @@ static const struct
 	{cMonster::mtSheep,        "sheep"},
 	{cMonster::mtSilverfish,   "silverfish"},
 	{cMonster::mtSkeleton,     "skeleton"},
+	{cMonster::mtSnowGolem,    "snowgolem"},
 	{cMonster::mtSlime,        "slime"},
 	{cMonster::mtSpider,       "spider"},
 	{cMonster::mtSquid,        "squid"},
 	{cMonster::mtVillager,     "villager"},
 	{cMonster::mtWitch,        "witch"},
+	{cMonster::mtWither,       "wither"},
 	{cMonster::mtWolf,         "wolf"},
 	{cMonster::mtZombie,       "zombie"},
 	{cMonster::mtZombiePigman, "zombiepigman"},
@@ -642,9 +646,10 @@ cMonster::eFamily cMonster::FamilyFromType(eType a_Type)
 		case mtEnderman:     return mfHostile;
 		case mtGhast:        return mfHostile;
 		case mtHorse:        return mfPassive;
+		case mtIronGolem:    return mfPassive;
 		case mtMagmaCube:    return mfHostile;
 		case mtMooshroom:    return mfHostile;
-		case mtOcelot:       return mfHostile;
+		case mtOcelot:       return mfPassive;
 		case mtPig:          return mfPassive;
 		case mtSheep:        return mfPassive;
 		case mtSilverfish:   return mfHostile;
@@ -739,16 +744,20 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
 		case mtChicken:       toReturn = new cChicken();                  break;
 		case mtCow:           toReturn = new cCow();                      break;
 		case mtCreeper:       toReturn = new cCreeper();                  break;
+		case mtEnderDragon:   toReturn = new cEnderDragon();              break;
 		case mtEnderman:      toReturn = new cEnderman();                 break;
 		case mtGhast:         toReturn = new cGhast();                    break;
+		case mtIronGolem:     toReturn = new cIronGolem();                break;
 		case mtMooshroom:     toReturn = new cMooshroom();                break;
 		case mtOcelot:        toReturn = new cOcelot();                   break;
 		case mtPig:           toReturn = new cPig();                      break;
 		case mtSheep:         toReturn = new cSheep (Random.NextInt(15)); break; // Colour parameter
 		case mtSilverfish:    toReturn = new cSilverfish();               break;
+		case mtSnowGolem:     toReturn = new cSnowGolem();                break;
 		case mtSpider:        toReturn = new cSpider();                   break;
 		case mtSquid:         toReturn = new cSquid();                    break;
 		case mtWitch:         toReturn = new cWitch();                    break;
+		case mtWither:	      toReturn = new cWither();                   break;
 		case mtWolf:          toReturn = new cWolf();                     break;
 		case mtZombie:        toReturn = new cZombie(false);              break; // TODO: Infected zombie parameter
 		case mtZombiePigman:  toReturn = new cZombiePigman();             break;
diff --git a/src/Mobs/SnowGolem.cpp b/src/Mobs/SnowGolem.cpp
index 9e199f87e..06021cca5 100644
--- a/src/Mobs/SnowGolem.cpp
+++ b/src/Mobs/SnowGolem.cpp
@@ -2,6 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "SnowGolem.h"
+#include "../World.h"
 
 
 
@@ -24,3 +25,21 @@ void cSnowGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cSnowGolem::Tick(float a_Dt, cChunk & a_Chunk)
+{
+	super::Tick(a_Dt, a_Chunk);
+	if (IsBiomeNoDownfall((EMCSBiome) m_World->GetBiomeAt((int) floor(GetPosX()), (int) floor(GetPosZ())) ))
+	{
+		TakeDamage(*this);
+	}
+	else
+	{
+		BLOCKTYPE BlockBelow = m_World->GetBlock((int) floor(GetPosX()), (int) floor(GetPosY()) - 1, (int) floor(GetPosZ()));
+		BLOCKTYPE Block = m_World->GetBlock((int) floor(GetPosX()), (int) floor(GetPosY()), (int) floor(GetPosZ()));
+		if (Block == E_BLOCK_AIR && g_BlockIsSolid[BlockBelow])
+		{
+			m_World->SetBlock((int) floor(GetPosX()), (int) floor(GetPosY()), (int) floor(GetPosZ()), E_BLOCK_SNOW, 0);
+		}
+	}
+}
diff --git a/src/Mobs/SnowGolem.h b/src/Mobs/SnowGolem.h
index d1344adfd..ff5e90da8 100644
--- a/src/Mobs/SnowGolem.h
+++ b/src/Mobs/SnowGolem.h
@@ -17,6 +17,7 @@ public:
 
 	CLASS_PROTODEF(cSnowGolem);
 	
+	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;