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

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

1 files changed, 6 insertions, 4 deletions

diff --git a/Minecraft.World/Throwable.h b/Minecraft.World/Throwable.h
index 4d7daea0..217f2f1e 100644
--- a/Minecraft.World/Throwable.h
+++ b/Minecraft.World/Throwable.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include "Entity.h"
+#include "Projectile.h"
 
 class Mob;
 class HitResult;
 
-class Throwable : public Entity
+class Throwable : public Entity, public Projectile
 {
 private:
 	int xTile;
@@ -19,10 +20,10 @@ protected:
 public:
 	int shakeTime;
 
-protected:
-	shared_ptr<Mob> owner;
+	shared_ptr<LivingEntity> owner;
 
 private:
+	wstring ownerName;
 	int life;
 	int flightTime;
 
@@ -37,7 +38,7 @@ protected:
 public:
 	virtual bool shouldRenderAtSqrDistance(double distance);
 
-	Throwable(Level *level, shared_ptr<Mob> mob);
+	Throwable(Level *level, shared_ptr<LivingEntity> mob);
 	Throwable(Level *level, double x, double y, double z);
 
 protected:
@@ -57,4 +58,5 @@ public:
 	virtual void addAdditonalSaveData(CompoundTag *tag);
 	virtual void readAdditionalSaveData(CompoundTag *tag);
 	virtual float getShadowHeightOffs();
+	virtual shared_ptr<LivingEntity> getOwner();
 };
\ No newline at end of file