diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2018-07-30 13:49:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 13:49:46 +0200 |
| commit | 1e014a54dc4a9298b407a83146940cf5118f89a9 (patch) | |
| tree | 10295987f6d20fe4fa625bf61da1230474f46c4b | |
| parent | Add new flow direction calculating algorithm (#4160) (diff) | |
| download | cuberite-1e014a54dc4a9298b407a83146940cf5118f89a9.tar cuberite-1e014a54dc4a9298b407a83146940cf5118f89a9.tar.gz cuberite-1e014a54dc4a9298b407a83146940cf5118f89a9.tar.bz2 cuberite-1e014a54dc4a9298b407a83146940cf5118f89a9.tar.lz cuberite-1e014a54dc4a9298b407a83146940cf5118f89a9.tar.xz cuberite-1e014a54dc4a9298b407a83146940cf5118f89a9.tar.zst cuberite-1e014a54dc4a9298b407a83146940cf5118f89a9.zip | |
| -rw-r--r-- | src/Mobs/Ocelot.cpp | 23 | ||||
| -rw-r--r-- | src/Mobs/Ocelot.h | 1 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/Mobs/Ocelot.cpp b/src/Mobs/Ocelot.cpp index 7ebe37d20..02af45a7d 100644 --- a/src/Mobs/Ocelot.cpp +++ b/src/Mobs/Ocelot.cpp @@ -11,6 +11,15 @@ +// TODO: Ocelots should have a chance of spawning with two kittens +/* + if (!IsBaby() && GetRandomProvider().RandBool(1.0 / 7.0)) + { + m_World->SpawnMob(GetPosX(), GetPosY(), GetPosZ(), m_MobType, true); + m_World->SpawnMob(GetPosX(), GetPosY(), GetPosZ(), m_MobType, true); + } +*/ + cOcelot::cOcelot(void) : super("Ocelot", mtOcelot, "entity.cat.hurt", "entity.cat.death", 0.6, 0.8), m_IsSitting(false), @@ -185,20 +194,6 @@ void cOcelot::OnRightClicked(cPlayer & a_Player) -void cOcelot::SpawnOn(cClientHandle & a_ClientHandle) -{ - super::SpawnOn(a_ClientHandle); - if (!IsBaby() && GetRandomProvider().RandBool(1.0 / 7.0)) - { - m_World->SpawnMob(GetPosX(), GetPosY(), GetPosZ(), m_MobType, true); - m_World->SpawnMob(GetPosX(), GetPosY(), GetPosZ(), m_MobType, true); - } -} - - - - - bool cOcelot::IsCatSittingOnBlock(cWorld * a_World, Vector3d a_BlockPosition) { return a_World->ForEachEntityInBox( diff --git a/src/Mobs/Ocelot.h b/src/Mobs/Ocelot.h index b8efc60ee..226da228d 100644 --- a/src/Mobs/Ocelot.h +++ b/src/Mobs/Ocelot.h @@ -30,7 +30,6 @@ public: virtual void OnRightClicked(cPlayer & a_Player) override; virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; virtual void TickFollowPlayer(); - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; virtual void GetBreedingItems(cItems & a_Items) override { a_Items.Add(E_ITEM_RAW_FISH); |