backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-17 04:22:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge cc910b9b7b into 5e5b685c72

Browse source
This commit is contained in:
jckitkat 2026-04-22 06:00:45 +03:00 committed by GitHub
parent 5e5b685c72 cc910b9b7b
commit 241f022ee2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.World/PigZombie.cpp
View file

@ -105,7 +105,7 @@ shared_ptr<Entity> PigZombie::findAttackTarget()
bool PigZombie::hurt(DamageSource *source, float dmg)
{
shared_ptr<Entity> sourceEntity = source->getEntity();
if ( sourceEntity != nullptr && sourceEntity->instanceof(eTYPE_PLAYER) )
if ( sourceEntity != nullptr && sourceEntity->instanceof(eTYPE_PLAYER) && !sourceEntity->isInvulnerable())
{
vector<shared_ptr<Entity> > *nearby = level->getEntities( shared_from_this(), bb->grow(32, 32, 32));
for (auto& e : *nearby)

5
Minecraft.World/Player.cpp
View file

@ -195,6 +195,11 @@ bool Player::isUsingItem()
return useItem != nullptr;
}
bool Player::isInvulnerable()
{
return abilities.invulnerable || hasInvulnerablePrivilege();
}
int Player::getTicksUsingItem()
{
if (isUsingItem())

2
Minecraft.World/Player.h
View file

@ -495,6 +495,8 @@ public:
void setPlayerGamePrivilege(EPlayerGamePrivileges privilege, unsigned int value);
static void setPlayerGamePrivilege(unsigned int &uiGamePrivileges, EPlayerGamePrivileges privilege, unsigned int value);
virtual bool isInvulnerable();
bool isAllowedToUse(Tile *tile);
bool isAllowedToUse(shared_ptr<ItemInstance> item);
bool isAllowedToInteract(shared_ptr<Entity> target);