summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-23 12:33:04 +0100
committerMattes D <github@xoft.cz>2014-11-23 12:33:04 +0100
commite9797c6a2a78d1caedc6cc2b6620b34e18a8b41f (patch)
tree2aabeb2ff85f9d8951b9837e132e4dabed9d6108 /src/Mobs
parentcWorld: Changed generator defaults. (diff)
parentMerge pull request #1612 from p-mcgowan/pigsIntoZombiePigmenOnLightning (diff)
downloadcuberite-e9797c6a2a78d1caedc6cc2b6620b34e18a8b41f.tar
cuberite-e9797c6a2a78d1caedc6cc2b6620b34e18a8b41f.tar.gz
cuberite-e9797c6a2a78d1caedc6cc2b6620b34e18a8b41f.tar.bz2
cuberite-e9797c6a2a78d1caedc6cc2b6620b34e18a8b41f.tar.lz
cuberite-e9797c6a2a78d1caedc6cc2b6620b34e18a8b41f.tar.xz
cuberite-e9797c6a2a78d1caedc6cc2b6620b34e18a8b41f.tar.zst
cuberite-e9797c6a2a78d1caedc6cc2b6620b34e18a8b41f.zip
Diffstat (limited to 'src/Mobs')
-rw-r--r--src/Mobs/Pig.cpp20
-rw-r--r--src/Mobs/Pig.h3
-rw-r--r--src/Mobs/Villager.cpp7
3 files changed, 30 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;
diff --git a/src/Mobs/Villager.cpp b/src/Mobs/Villager.cpp
index 5c9999a59..963595347 100644
--- a/src/Mobs/Villager.cpp
+++ b/src/Mobs/Villager.cpp
@@ -37,6 +37,13 @@ bool cVillager::DoTakeDamage(TakeDamageInfo & a_TDI)
m_World->BroadcastEntityStatus(*this, esVillagerAngry);
}
}
+
+ if (a_TDI.DamageType == dtLightning)
+ {
+ Destroy();
+ m_World->SpawnMob(GetPosX(), GetPosY(), GetPosZ(), mtWitch);
+ return true;
+ }
return true;
}