Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 42 insertions, 0 deletions

diff --git a/Minecraft.World/MultiEntityMobPart.cpp b/Minecraft.World/MultiEntityMobPart.cpp
new file mode 100644
index 00000000..dfca1b2f
--- /dev/null
+++ b/Minecraft.World/MultiEntityMobPart.cpp
@@ -0,0 +1,42 @@
+#include "stdafx.h"
+#include "BossMob.h"
+#include "MultiEntityMob.h"
+#include "MultiEntityMobPart.h"
+
+MultiEntityMobPart::MultiEntityMobPart(shared_ptr<MultiEntityMob>parentMob, const wstring &id, float w, float h) : Entity(parentMob->getLevel()), parentMob( parentMob ), id( id )
+{
+	// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
+	// the derived version of the function is called
+	this->defineSynchedData();
+
+	setSize(w, h);
+}
+
+
+void MultiEntityMobPart::defineSynchedData()
+{
+}
+
+void MultiEntityMobPart::readAdditionalSaveData(CompoundTag *tag)
+{
+}
+
+void MultiEntityMobPart::addAdditonalSaveData(CompoundTag *tag)
+{
+}
+
+
+bool MultiEntityMobPart::isPickable()
+{
+	return true;
+}
+
+bool MultiEntityMobPart::hurt(DamageSource *source, float damage)
+{
+	return parentMob.lock()->hurt( dynamic_pointer_cast<MultiEntityMobPart>( shared_from_this() ), source, damage);
+}
+
+bool MultiEntityMobPart::is(shared_ptr<Entity> other)
+{
+	return shared_from_this() == other || parentMob.lock() == dynamic_pointer_cast<MultiEntityMob>(other);
+}
\ No newline at end of file