merge upstream

This commit is contained in:
Fireblade
2026-07-07 00:45:55 +01:00
5 changed files with 19 additions and 15 deletions
+1 -1
View File
@@ -175,7 +175,7 @@ int PlayerRenderer::prepareArmor(shared_ptr<LivingEntity> _player, int layer, fl
case SkullTileEntity::TYPE_CHAR:
{
armor = armorParts3;
auto t = new SkeletonHeadModel(0, 0, 64, 64, 1);
auto t = new SkeletonHeadModel(0, 0, 64, 32, 1);
armor->head = t->head;
bindTexture(&PlayerRenderer::DEFAULT_LOCATION);
break;
+1 -1
View File
@@ -16,7 +16,7 @@ ResourceLocation SkullTileRenderer::CREEPER_LOCATION = ResourceLocation(TN_MOB_C
SkullTileRenderer::SkullTileRenderer()
{
skeletonModel = new SkeletonHeadModel(0, 0, 64, 32);
zombieModel = new SkeletonHeadModel(0, 0, 64, 64);
zombieModel = new SkeletonHeadModel(0, 0, 64, 32);
}
SkullTileRenderer::~SkullTileRenderer()