summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Monster.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-12-21 15:18:42 +0100
committerMattes D <github@xoft.cz>2014-12-21 15:18:42 +0100
commitd4c9daddb89cc8066f3fe36939447acbcf6c7400 (patch)
treeaf1a179ba5ac87c652b6e271c99628dee1ceb920 /src/Mobs/Monster.cpp
parentMerge branch 'master' of https://github.com/mc-server/MCServer (diff)
parentFixed damn empty line with no use (diff)
downloadcuberite-d4c9daddb89cc8066f3fe36939447acbcf6c7400.tar
cuberite-d4c9daddb89cc8066f3fe36939447acbcf6c7400.tar.gz
cuberite-d4c9daddb89cc8066f3fe36939447acbcf6c7400.tar.bz2
cuberite-d4c9daddb89cc8066f3fe36939447acbcf6c7400.tar.lz
cuberite-d4c9daddb89cc8066f3fe36939447acbcf6c7400.tar.xz
cuberite-d4c9daddb89cc8066f3fe36939447acbcf6c7400.tar.zst
cuberite-d4c9daddb89cc8066f3fe36939447acbcf6c7400.zip
Diffstat (limited to 'src/Mobs/Monster.cpp')
-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 3d174677c..a02ea357e 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -45,6 +45,7 @@ static const struct
{mtMooshroom, "mooshroom", "MushroomCow"},
{mtOcelot, "ocelot", "Ozelot"},
{mtPig, "pig", "Pig"},
+ {mtRabbit, "rabbit", "Rabbit"},
{mtSheep, "sheep", "Sheep"},
{mtSilverfish, "silverfish", "Silverfish"},
{mtSkeleton, "skeleton", "Skeleton"},
@@ -499,6 +500,7 @@ void cMonster::KilledBy(TakeDamageInfo & a_TDI)
case mtCow:
case mtHorse:
case mtPig:
+ case mtRabbit:
case mtSheep:
case mtSquid:
case mtMooshroom:
@@ -851,6 +853,7 @@ cMonster::eFamily cMonster::FamilyFromType(eMonsterType a_Type)
case mtMooshroom: return mfHostile;
case mtOcelot: return mfPassive;
case mtPig: return mfPassive;
+ case mtRabbit: return mfPassive;
case mtSheep: return mfPassive;
case mtSilverfish: return mfHostile;
case mtSkeleton: return mfHostile;
@@ -963,6 +966,7 @@ cMonster * cMonster::NewMonsterFromType(eMonsterType a_MobType)
case mtMooshroom: toReturn = new cMooshroom(); break;
case mtOcelot: toReturn = new cOcelot(); break;
case mtPig: toReturn = new cPig(); break;
+ case mtRabbit: toReturn = new cRabbit(); break;
case mtSheep: toReturn = new cSheep(); break;
case mtSilverfish: toReturn = new cSilverfish(); break;
case mtSnowGolem: toReturn = new cSnowGolem(); break;