backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(TU31): Villagers turn into witches when struck by lightning (#83)

Browse source 
* Villagers turn into witches when struck by lightning

* fix: include statement for if a villager has a custom nametag

* fix: fix unneccesary line

* Build fix

---------

Co-authored-by: piebot <274605694+pieeebot@users.noreply.github.com>
This commit is contained in:
NSDeathman 2026-05-18 22:13:26 +04:00 committed by GitHub
parent 4cb96bcb44
commit d36a027e00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Minecraft.World/Villager.cpp
View file

@ -156,7 +156,7 @@ bool Villager::mobInteract(shared_ptr<Player> player)
shared_ptr<ItemInstance> item = player->inventory->getSelected(); shared_ptr<ItemInstance> item = player->inventory->getSelected();
bool holdingSpawnEgg = item != nullptr && item->id == Item::spawnEgg_Id; bool holdingSpawnEgg = item != nullptr && item->id == Item::spawnEgg_Id;
if (!holdingSpawnEgg && isAlive() && !isTrading() && !isBaby()) if (!player->isSneaking() && !holdingSpawnEgg && isAlive() && !isTrading() && !isBaby())
{ {
if (!level->isClientSide) if (!level->isClientSide)
{ {
@ -776,3 +776,19 @@ wstring Villager::getDisplayName()
}; };
return app.GetString(name); return app.GetString(name);
} }
void Villager::thunderHit(const LightningBolt *lightningBolt)
{
if (level->isClientSide) return;
shared_ptr<Witch> witch = std::make_shared<Witch>(level);
witch->moveTo(x, y, z, yRot, xRot);
if (this->hasCustomName())
witch->setCustomName(this->getCustomName());
if (this->isPersistenceRequired())
witch->setPersistenceRequired();
level->addEntity(witch);
remove();
}

1
Minecraft.World/Villager.h
View file

@ -147,4 +147,5 @@ public:
virtual shared_ptr<AgableMob> getBreedOffspring(shared_ptr<AgableMob> target); virtual shared_ptr<AgableMob> getBreedOffspring(shared_ptr<AgableMob> target);
virtual bool canBeLeashed(); virtual bool canBeLeashed();
virtual wstring getDisplayName(); virtual wstring getDisplayName();
virtual void thunderHit(const LightningBolt *lightningBolt);
}; };