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

Merge pull request #2960 from LogicParrot/interspecies

Browse Source 
Prevent interspecies breeding
This commit is contained in:
Julian Laubstein 2016-02-04 20:51:44 +01:00
commit cb28aaface
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Mobs/PassiveMonster.cpp
View File

@ -157,19 +157,33 @@ void cPassiveMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
virtual bool Item(cEntity * a_Entity) override virtual bool Item(cEntity * a_Entity) override
{ {
// if we're the same species as someone around and they don't have a partner, start mating with them // If the entity is not a monster, don't breed with it
if ((a_Entity->GetEntityType() == m_Me->GetEntityType()) && (a_Entity != m_Me)) // Also, do not self-breed
if ((a_Entity->GetEntityType() != etMonster) || (a_Entity == m_Me))
{ {
cPassiveMonster * Me = static_cast<cPassiveMonster*>(m_Me); return false;
cPassiveMonster * Partner = static_cast<cPassiveMonster*>(a_Entity);
if (Partner->IsInLove() && (Partner->GetPartner() == nullptr))
{
Partner->EngageLoveMode(Me);
Me->EngageLoveMode(Partner);
return true;
}
} }
return false;
cPassiveMonster * Me = static_cast<cPassiveMonster*>(m_Me);
cPassiveMonster * PotentialPartner = static_cast<cPassiveMonster*>(a_Entity);
// If the potential partner is not of the same species, don't breed with it
if (PotentialPartner->GetMobType() != Me->GetMobType())
{
return false;
}
// If the potential partner is not in love
// Or they already have a mate, do not breed with them
if ((!PotentialPartner->IsInLove()) || (PotentialPartner->GetPartner() != nullptr))
{
return false;
}
// All conditions met, let's breed!
PotentialPartner->EngageLoveMode(Me);
Me->EngageLoveMode(PotentialPartner);
return true;
} }
} Callback(this); } Callback(this);