Co-authored-by: DrPerkyLegit <116128211+DrPerkyLegit@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Anaël <60509176+Bakoubak@users.noreply.github.com>
Reviewed-on: https://git.neolegacy.dev/neoStudiosLCE/neoLegacy/pulls/4205
This commit is contained in:
committed 2026-11-11 18:46:44 +00:00
1 parent 880566324a
commit b75adc25aa
668 files changed
+19082 -5289

No files matched your search

+14 -4
View File
@@ -2,6 +2,7 @@
#include "SkeletonModel.h"
#include "../Minecraft.World/Mth.h"
#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
#include "../Minecraft.World/net.minecraft.world.item.h"
#include "ModelPart.h"
void SkeletonModel::_init(float g)
@@ -44,12 +45,21 @@ SkeletonModel::SkeletonModel(float g) : ZombieModel(g, 0, 64, 32)
void SkeletonModel::prepareMobModel(shared_ptr<LivingEntity> mob, float time, float r, float a)
{
ZombieModel::prepareMobModel(mob, time, r, a);
bowAndArrow = dynamic_pointer_cast<Skeleton>(mob)->getSkeletonType() == Skeleton::TYPE_WITHER;
}
void SkeletonModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
{
bowAndArrow=true;
ZombieModel::setupAnim(time, r, bob, yRot, xRot, scale, entity, uiBitmaskOverrideAnim);
shared_ptr<Skeleton> skeleton = dynamic_pointer_cast<Skeleton>(entity);
shared_ptr<ItemInstance> carried = skeleton != nullptr ? skeleton->getCarriedItem() : nullptr;
bool holdingBow = carried != nullptr && carried->id == Item::bow_Id;
bool aggressive = skeleton != nullptr && skeleton->isAggressive();
bowAndArrow = holdingBow && aggressive;
if (aggressive && !holdingBow)
{
ZombieModel::setupAnim(time, r, bob, yRot, xRot, scale, entity, uiBitmaskOverrideAnim);
}
else
{
HumanoidModel::setupAnim(time, r, bob, yRot, xRot, scale, entity, uiBitmaskOverrideAnim);
}
}