summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-23 09:27:46 +0100
committerMattes D <github@xoft.cz>2014-11-23 09:27:46 +0100
commitdea8b684b2fad095c8d9d57111a3dce420b585af (patch)
tree2f414117376cbe8e6f72584885803290f9f46016 /src
parentMerge pull request #1610 from p-mcgowan/villagersIntoWitchOnLightning (diff)
parentformatting - newline at EOF inserted: Pig.cpp (diff)
downloadcuberite-dea8b684b2fad095c8d9d57111a3dce420b585af.tar
cuberite-dea8b684b2fad095c8d9d57111a3dce420b585af.tar.gz
cuberite-dea8b684b2fad095c8d9d57111a3dce420b585af.tar.bz2
cuberite-dea8b684b2fad095c8d9d57111a3dce420b585af.tar.lz
cuberite-dea8b684b2fad095c8d9d57111a3dce420b585af.tar.xz
cuberite-dea8b684b2fad095c8d9d57111a3dce420b585af.tar.zst
cuberite-dea8b684b2fad095c8d9d57111a3dce420b585af.zip
Diffstat (limited to 'src')
-rw-r--r--src/Mobs/Pig.cpp20
-rw-r--r--src/Mobs/Pig.h3
2 files changed, 23 insertions, 0 deletions
diff --git a/src/Mobs/Pig.cpp b/src/Mobs/Pig.cpp
index 55a4412ca..50b69e44f 100644
--- a/src/Mobs/Pig.cpp
+++ b/src/Mobs/Pig.cpp
@@ -98,3 +98,23 @@ void cPig::Tick(float a_Dt, cChunk & a_Chunk)
+
+bool cPig::DoTakeDamage(TakeDamageInfo & a_TDI)
+{
+ if (!super::DoTakeDamage(a_TDI))
+ {
+ return false;
+ }
+
+ if (a_TDI.DamageType == dtLightning)
+ {
+ Destroy();
+ m_World->SpawnMob(GetPosX(), GetPosY(), GetPosZ(), mtZombiePigman);
+ return true;
+ }
+ return true;
+}
+
+
+
+
diff --git a/src/Mobs/Pig.h b/src/Mobs/Pig.h
index 953850b3a..0e026933a 100644
--- a/src/Mobs/Pig.h
+++ b/src/Mobs/Pig.h
@@ -17,6 +17,9 @@ public:
CLASS_PROTODEF(cPig)
+ // cEntity overrides
+ virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
+
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override;
virtual void OnRightClicked(cPlayer & a_Player) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;