diff --git a/Minecraft.Client/CreeperModel.cpp b/Minecraft.Client/CreeperModel.cpp index 066e0b55..14c7e55f 100644 --- a/Minecraft.Client/CreeperModel.cpp +++ b/Minecraft.Client/CreeperModel.cpp @@ -6,7 +6,7 @@ // 4J - added void CreeperModel::_init(float g) { - int yo = 4; + int yo = 6; head = new ModelPart(this, 0, 0); head->addBox(-4, - 8, -4, 8, 8, 8, g); // Head diff --git a/Minecraft.Client/LivingEntityRenderer.cpp b/Minecraft.Client/LivingEntityRenderer.cpp index 9e8682c7..7f4a3258 100644 --- a/Minecraft.Client/LivingEntityRenderer.cpp +++ b/Minecraft.Client/LivingEntityRenderer.cpp @@ -491,7 +491,7 @@ void LivingEntityRenderer::renderNameTag(shared_ptr mob, const wst float s = 1 / 60.0f * size; glPushMatrix(); - glTranslatef((float) x, (float) y + 2.3f, (float) z); + glTranslatef((float) x, (float) y + mob->bbHeight + 0.5f, (float) z); glNormal3f(0, 1, 0); glRotatef(-this->entityRenderDispatcher->playerRotY, 0, 1, 0); diff --git a/Minecraft.World/AttackDamageMobEffect.cpp b/Minecraft.World/AttackDamageMobEffect.cpp index 483c9a72..00ab0f95 100644 --- a/Minecraft.World/AttackDamageMobEffect.cpp +++ b/Minecraft.World/AttackDamageMobEffect.cpp @@ -1,19 +1,19 @@ -#include "stdafx.h" - -#include "AttackDamageMobEffect.h" - -AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) : MobEffect(id, isHarmful, color) -{ -} - -double AttackDamageMobEffect::getAttributeModifierValue(int amplifier, AttributeModifier *original) -{ - if (id == MobEffect::weakness->id) - { - return -0.5f * (amplifier + 1); - } - else - { - return 1.3 * (amplifier + 1); - } +#include "stdafx.h" + +#include "AttackDamageMobEffect.h" + +AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful, eMinecraftColour color) : MobEffect(id, isHarmful, color) +{ +} + +double AttackDamageMobEffect::getAttributeModifierValue(int amplifier, AttributeModifier *original) +{ + if (id == MobEffect::weakness->id) + { + return -0.5f * (amplifier + 1); + } + else + { + return 1.3 * (amplifier + 1); + } } \ No newline at end of file