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

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

1 files changed, 5 insertions, 3 deletions

diff --git a/Minecraft.World/EntityDamageSource.h b/Minecraft.World/EntityDamageSource.h
index bdbe36e7..3df654fd 100644
--- a/Minecraft.World/EntityDamageSource.h
+++ b/Minecraft.World/EntityDamageSource.h
@@ -13,14 +13,16 @@ protected:
 
 public:
 	//EntityDamageSource(const wstring &msgId, shared_ptr<Entity> entity);
-	EntityDamageSource(ChatPacket::EChatPacketMessage msgId, shared_ptr<Entity> entity);
+	EntityDamageSource(ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId, shared_ptr<Entity> entity);
 	virtual ~EntityDamageSource() { }
 
-    shared_ptr<Entity> getEntity();
+	shared_ptr<Entity> getEntity();
 
 	// 4J Stu - Made return a packet
 	//virtual wstring getLocalizedDeathMessage(shared_ptr<Player> player);
-	virtual shared_ptr<ChatPacket> getDeathMessagePacket(shared_ptr<Player> player);
+	virtual shared_ptr<ChatPacket> getDeathMessagePacket(shared_ptr<LivingEntity> player);
 
 	virtual bool scalesWithDifficulty();
+
+	virtual DamageSource *copy();
 };
\ No newline at end of file