mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
swimming fixed
This commit is contained in:
parent
3d1dba6b86
commit
6eb13e5bd4
16 changed files with 170 additions and 16 deletions
|
|
@ -319,7 +319,19 @@ class Entity extends Position
|
|||
$this->server->api->entity->drop($this, BlockAPI::getItem($drop[0] & 0xFFFF, $drop[1] & 0xFFFF, $drop[2] & 0xFF), true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function handleWaterMovement(){
|
||||
if($this->level->handleMaterialAcceleration($this->boundingBox->expand(0, -0.4, 0)->contract(0.001, 0.001, 0.001), 0, $this)){
|
||||
$this->fallDistance = 0;
|
||||
$this->inWater = true;
|
||||
$this->fire = 0;
|
||||
}else{
|
||||
$this->inWater = false;
|
||||
}
|
||||
|
||||
return $this->inWater;
|
||||
}
|
||||
|
||||
public function environmentUpdate($time)
|
||||
{
|
||||
$hasUpdate = $this->class === ENTITY_MOB; // force true for mobs
|
||||
|
|
@ -372,7 +384,10 @@ class Entity extends Position
|
|||
$this->outOfWorld();
|
||||
$hasUpdate = true;
|
||||
}
|
||||
|
||||
if(!$this->isPlayer()){
|
||||
$this->handleWaterMovement();
|
||||
}
|
||||
|
||||
if($this->fire > 0){
|
||||
if(($this->fire % 20) === 0){
|
||||
$this->harm(1, "burning");
|
||||
|
|
@ -411,6 +426,8 @@ class Entity extends Position
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//air damage
|
||||
if($this->isPlayer() || $this instanceof Living){
|
||||
$d = $this->y + $this->getEyeHeight();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue