summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2016-02-04 20:51:44 +0100
committerJulian Laubstein <julianlaubstein@yahoo.de>2016-02-04 20:51:44 +0100
commitcb28aafaceb4e5f792593467d3ddc57424558b33 (patch)
treeee3a41a49c0a1dc99de216c366aab5ab70244f4b /src/Mobs
parentMerge pull request #2942 from mathias-github/master (diff)
parentPrevent interspecies breeding (diff)
downloadcuberite-cb28aafaceb4e5f792593467d3ddc57424558b33.tar
cuberite-cb28aafaceb4e5f792593467d3ddc57424558b33.tar.gz
cuberite-cb28aafaceb4e5f792593467d3ddc57424558b33.tar.bz2
cuberite-cb28aafaceb4e5f792593467d3ddc57424558b33.tar.lz
cuberite-cb28aafaceb4e5f792593467d3ddc57424558b33.tar.xz
cuberite-cb28aafaceb4e5f792593467d3ddc57424558b33.tar.zst
cuberite-cb28aafaceb4e5f792593467d3ddc57424558b33.zip
Diffstat (limited to 'src/Mobs')
-rw-r--r--src/Mobs/PassiveMonster.cpp36
1 files changed, 25 insertions, 11 deletions
diff --git a/src/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp
index 30b46500d..53288a54c 100644
--- a/src/Mobs/PassiveMonster.cpp
+++ b/src/Mobs/PassiveMonster.cpp
@@ -157,19 +157,33 @@ void cPassiveMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
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 ((a_Entity->GetEntityType() == m_Me->GetEntityType()) && (a_Entity != m_Me))
+ // If the entity is not a monster, don't breed with it
+ // Also, do not self-breed
+ if ((a_Entity->GetEntityType() != etMonster) || (a_Entity == m_Me))
{
- cPassiveMonster * Me = static_cast<cPassiveMonster*>(m_Me);
- cPassiveMonster * Partner = static_cast<cPassiveMonster*>(a_Entity);
- if (Partner->IsInLove() && (Partner->GetPartner() == nullptr))
- {
- Partner->EngageLoveMode(Me);
- Me->EngageLoveMode(Partner);
- return true;
- }
+ return false;
}
- 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);