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

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

1 files changed, 8 insertions, 10 deletions

diff --git a/Minecraft.World/Blaze.cpp b/Minecraft.World/Blaze.cpp
index 57726363..d87a83b2 100644
--- a/Minecraft.World/Blaze.cpp
+++ b/Minecraft.World/Blaze.cpp
@@ -5,6 +5,8 @@
 #include "net.minecraft.world.phys.h"
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.entity.h"
+#include "net.minecraft.world.entity.ai.attributes.h"
+#include "net.minecraft.world.entity.monster.h"
 #include "net.minecraft.world.entity.projectile.h"
 #include "SharedConstants.h"
 #include "..\Minecraft.Client\Textures.h"
@@ -18,16 +20,11 @@ Blaze::Blaze(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();
-
-	// 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_BLAZE; // 4J Was "/mob/fire.png";
+	registerAttributes();
+	setHealth(getMaxHealth());
 
 	fireImmune = true;
-	attackDamage = 6;
 	xpReward = XP_REWARD_LARGE;
-	//        this.setSize(1.2f, 1.8f);
 
 	// 4J Default inits
 	allowedHeightOffset = 0.5f;
@@ -35,9 +32,10 @@ Blaze::Blaze(Level *level) : Monster(level)
 	attackCounter = 0;
 }
 
-int Blaze::getMaxHealth()
+void Blaze::registerAttributes()
 {
-	return 20;
+	Monster::registerAttributes();
+	getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->setBaseValue(6);
 }
 
 void Blaze::defineSynchedData()
@@ -89,7 +87,7 @@ void Blaze::aiStep()
 			allowedHeightOffset = .5f + (float) random->nextGaussian() * 3;
 		}
 
-		if (getAttackTarget() != NULL && (getAttackTarget()->y + getAttackTarget()->getHeadHeight()) > (this->y + getHeadHeight() + allowedHeightOffset))
+		if (getAttackTarget() != NULL && (getAttackTarget()->y + getAttackTarget()->getHeadHeight()) > (y + getHeadHeight() + allowedHeightOffset))
 		{
 			yd = yd + (.3f - yd) * .3f;
 		}