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

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

1 files changed, 27 insertions, 0 deletions

diff --git a/Minecraft.World/MultiEntityMobPart.h b/Minecraft.World/MultiEntityMobPart.h
new file mode 100644
index 00000000..b5322317
--- /dev/null
+++ b/Minecraft.World/MultiEntityMobPart.h
@@ -0,0 +1,27 @@
+#pragma once
+using namespace std;
+#include "Entity.h"
+
+class Level;
+class MultiEntityMob;
+
+class MultiEntityMobPart : public Entity
+{
+public:
+	eINSTANCEOF GetType() { return eTYPE_MULTIENTITY_MOB_PART; };
+public:
+	weak_ptr<MultiEntityMob> parentMob;
+	const wstring id;
+
+	MultiEntityMobPart(shared_ptr<MultiEntityMob> parentMob, const wstring &id, float w, float h);
+
+protected:
+	virtual void defineSynchedData();
+	virtual void readAdditionalSaveData(CompoundTag *tag);
+	virtual void addAdditonalSaveData(CompoundTag *tag);
+
+public:
+	virtual bool isPickable();
+	virtual bool hurt(DamageSource *source, float damage);
+	virtual bool is(shared_ptr<Entity> other);
+};
\ No newline at end of file