phaneron/smartcmd-MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-23 09:23:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'smartcmd/main' into feature/plugin-api

Browse source
This commit is contained in:
sylvessa 2026-04-05 12:59:27 -05:00
commit 7251a8419f
9 changed files with 154 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Minecraft.Client/EnderDragonRenderer.cpp
View file

@ -89,6 +89,11 @@ void EnderDragonRenderer::render(shared_ptr<Entity> _mob, double x, double y, do
// 4J - dynamic cast required because we aren't using templates/generics in our version
shared_ptr<EnderDragon> mob = dynamic_pointer_cast<EnderDragon>(_mob);
BossMobGuiInfo::setBossHealth(mob, false);
if (!mob->getCustomName().empty())
{
BossMobGuiInfo::name = mob->getCustomName();
}
MobRenderer::render(mob, x, y, z, rot, a);
if (mob->nearestCrystal != nullptr)
{

1
Minecraft.Client/MinecraftServer.cpp
View file

@ -1795,7 +1795,6 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
chunkPacketManagement_PostTick();
}
//lastTime = getCurrentTimeMillis();
// int64_t afterall = System::currentTimeMillis();
// PIXReportCounter(L"Server time all",(float)(afterall-beforeall));
// PIXReportCounter(L"Server ticks",(float)tickcount);

4
Minecraft.Client/WitherBossRenderer.cpp
View file

@ -20,6 +20,10 @@ void WitherBossRenderer::render(shared_ptr<Entity> entity, double x, double y, d
shared_ptr<WitherBoss> mob = dynamic_pointer_cast<WitherBoss>(entity);
BossMobGuiInfo::setBossHealth(mob, true);
if (!mob->getCustomName().empty())
{
BossMobGuiInfo::name = mob->getCustomName();
}
int modelVersion = dynamic_cast<WitherBossModel*>(model)->modelVersion();
if (modelVersion != this->modelVersion)