flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Ocelots no longer multiply exponentially (#4272)

Browse Source 
Along with a call to `destroyentities`, this fixes #4271

I'm guessing the intention of this code was to modify the normal spawning of ocelots. However, `cEntity::SpawnOn` is actually called to send the entity to an individual client. That means this code was run for every single player, every time they were sent a chunk with ocelots in it. Thus, the ocelots population would grow exponentially as players log in and move around.
This commit is contained in:
peterbell10 2018-07-30 12:49:46 +01:00 committed by GitHub
parent 90d552a702
commit 1e014a54dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mobs/Ocelot.cpp
View File

@ -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(

1
src/Mobs/Ocelot.h
View File

@ -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);