fix(TU22): Boat, Baby zombie and Texture changes.
TU22: - Corrected baby zombie hit boxes size. - Fix for players sometimes taking fall damage while in a boat. - Updated Lapis Lazuli's block texture
This commit is contained in:
1 parent
2eaa1dc9b6
commit
d68f152e41
6 files changed
+32
No files matched your search
Binary file not shown.
|
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 153 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 57 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 27 KiB |
@@ -48,6 +48,35 @@ bool Boat::makeStepSound()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Boat::checkFallDamage(int result, int onGround, double ya)
|
||||||
|
{
|
||||||
|
if (fallDistance <= 3.0) return;
|
||||||
|
|
||||||
|
if ( !onGround )
|
||||||
|
{
|
||||||
|
int t = level->getTile(x, (floor(y) - 1.0), z);
|
||||||
|
if ((!t || Tile::tiles[t]->material != Material::water) && ya < 0.0 )
|
||||||
|
fallDistance -= ya;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
causeFallDamage(fallDistance);
|
||||||
|
if (!level->isClientSide && !removed)
|
||||||
|
{
|
||||||
|
remove();
|
||||||
|
for (int i = 0; i < 3; i++)
|
||||||
|
{
|
||||||
|
spawnAtLocation(Tile::wood_Id, 1, 0);
|
||||||
|
}
|
||||||
|
for (int i = 0; i < 2; i++)
|
||||||
|
{
|
||||||
|
spawnAtLocation(Item::stick->id, 1, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fallDistance = 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
void Boat::defineSynchedData()
|
void Boat::defineSynchedData()
|
||||||
{
|
{
|
||||||
entityData->define(DATA_ID_HURT, 0);
|
entityData->define(DATA_ID_HURT, 0);
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ public:
|
|||||||
Boat(Level *level);
|
Boat(Level *level);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
virtual void checkFallDamage(int result, int onGround, double ya);
|
||||||
virtual bool makeStepSound();
|
virtual bool makeStepSound();
|
||||||
virtual void defineSynchedData();
|
virtual void defineSynchedData();
|
||||||
|
|
||||||
|
|||||||
@@ -147,6 +147,8 @@ void Zombie::aiStep()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Monster::aiStep();
|
Monster::aiStep();
|
||||||
|
if (isBaby())
|
||||||
|
setSize(0.3f, 0.9f);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Zombie::hurt(DamageSource *source, float dmg)
|
bool Zombie::hurt(DamageSource *source, float dmg)
|
||||||
|
|||||||
Reference in new issue
Block a user