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

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

1 files changed, 12 insertions, 13 deletions

diff --git a/Minecraft.Client/RemotePlayer.cpp b/Minecraft.Client/RemotePlayer.cpp
index c1b72864..bea12842 100644
--- a/Minecraft.Client/RemotePlayer.cpp
+++ b/Minecraft.Client/RemotePlayer.cpp
@@ -3,7 +3,7 @@
 #include "..\Minecraft.World\net.minecraft.world.item.h"
 #include "..\Minecraft.World\Mth.h"
 
-RemotePlayer::RemotePlayer(Level *level, const wstring& name) : Player(level)
+RemotePlayer::RemotePlayer(Level *level, const wstring& name) : Player(level, name)
 {
 	// 4J - added initialisers
 	hasStartedUsingItem = false;
@@ -11,22 +11,16 @@ RemotePlayer::RemotePlayer(Level *level, const wstring& name) : Player(level)
 	lx = ly = lz = lyr = lxr = 0.0;
 	fallTime = 0.0f;
 
-    this->name = name;
-	m_UUID = name;
 	app.DebugPrintf("Created RemotePlayer with name %ls\n", name.c_str() );
 
     heightOffset = 0;
-    this->footSize = 0;
-    if (name.length() > 0)
-	{
-        customTextureUrl = L"";//L"http://s3.amazonaws.com/MinecraftSkins/" + name + L".png";
-    }
+    footSize = 0;
 
-	this->noPhysics = true;
+	noPhysics = true;
 
     bedOffsetY = 4 / 16.0f;
 
-    this->viewScale = 10;
+    viewScale = 10;
 }
 
 void RemotePlayer::setDefaultHeadHeight()
@@ -34,7 +28,7 @@ void RemotePlayer::setDefaultHeadHeight()
 	heightOffset = 0;
 }
 
-bool RemotePlayer::hurt(DamageSource *source, int dmg)
+bool RemotePlayer::hurt(DamageSource *source, float dmg)
 {
 	return true;
 }
@@ -113,8 +107,8 @@ void RemotePlayer::aiStep()
         xRot += (float)((lxr - xRot) / lSteps);
 
         lSteps--;
-        this->setPos(xt, yt, zt);
-        this->setRot(yRot, xRot);
+        setPos(xt, yt, zt);
+        setRot(yRot, xRot);
     }
     oBob = bob;
 
@@ -149,4 +143,9 @@ void RemotePlayer::animateRespawn()
 float RemotePlayer::getHeadHeight()
 {
 	return 1.82f;
+}
+
+Pos RemotePlayer::getCommandSenderWorldPosition()
+{
+    return new Pos(floor(x + .5), floor(y + .5), floor(z + .5));
 }
\ No newline at end of file