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

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

1 files changed, 11 insertions, 10 deletions

diff --git a/Minecraft.World/Giant.cpp b/Minecraft.World/Giant.cpp
index 054394da..dbb790bf 100644
--- a/Minecraft.World/Giant.cpp
+++ b/Minecraft.World/Giant.cpp
@@ -1,5 +1,7 @@
 #include "stdafx.h"
 #include "net.minecraft.world.level.h"
+#include "net.minecraft.world.entity.ai.attributes.h"
+#include "net.minecraft.world.entity.monster.h"
 #include "Giant.h"
 #include "..\Minecraft.Client\Textures.h"
 
@@ -10,20 +12,19 @@ Giant::Giant(Level *level) : Monster( level )
 	// 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();
+	registerAttributes();
 
-	// 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
-	health = getMaxHealth();
-
-	this->textureIdx = TN_MOB_ZOMBIE;	// 4J was L"/mob/zombie.png";
-	runSpeed = 0.5f;
-	attackDamage = 50;
-	this->heightOffset*=6;
-	this->setSize(bbWidth * 6, bbHeight * 6);
+	heightOffset*=6;
+	setSize(bbWidth * 6, bbHeight * 6);
 }
 
-int Giant::getMaxHealth()
+void Giant::registerAttributes()
 {
-	return 100;
+	Monster::registerAttributes();
+
+	getAttribute(SharedMonsterAttributes::MAX_HEALTH)->setBaseValue(100);
+	getAttribute(SharedMonsterAttributes::MOVEMENT_SPEED)->setBaseValue(0.5f);
+	getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->setBaseValue(50);
 }
 
 float Giant::getWalkTargetValue(int x, int y, int z)