celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-17 20:10:23 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge devel into master (#78)

Browse Source 
* * Turn survival back on for now.

* * Add TP command.

* * Fix fall damage reset.

* * Mob hitting works.

I've disabled entity shading though. Will get back to it at some point, promise!

* * Knockback

* * Mobs now rotate when they die.

* * Fire fix
This commit is contained in:
iProgramInCpp
2023-09-17 12:47:09 +03:00
committed by GitHub
parent e9b00e6ba1
commit 350100ac48
15 changed files with 225 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/world/entity/Player.cpp
View File

@@ -39,6 +39,10 @@ Player::Player(Level* pLevel) : Mob(pLevel)
field_C4 = 20;
field_B5C = 180.0f;
// @TEST TEST TEST
field_F0 = false;
// @TEST TEST TEST
}
Player::~Player()
@@ -225,7 +229,9 @@ void Player::animateRespawn(Player*, Level*)
void Player::attack(Entity* pEnt)
{
int atkDmg = m_pInventory->getAttackDamage(pEnt);
if (atkDmg > 0)
pEnt->hurt(this, atkDmg);
}
bool Player::canDestroy(Tile* pTile)