mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
fixed skeletons and zombies burning in water during daytime
This commit is contained in:
parent
17c2fdb046
commit
7bc464d45e
3 changed files with 32 additions and 11 deletions
|
|
@ -395,7 +395,13 @@ class Entity extends Position
|
|||
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;
|
||||
if($this->fire > 0){
|
||||
$this->fire = 0;
|
||||
$this->updateMetadata();
|
||||
}else{
|
||||
$this->fire = 0;
|
||||
}
|
||||
|
||||
}else{
|
||||
$this->inWater = false;
|
||||
}
|
||||
|
|
@ -454,7 +460,6 @@ class Entity extends Position
|
|||
}
|
||||
|
||||
$this->handleWaterMovement();
|
||||
|
||||
if($this->fire > 0){ //TODO move somewhere
|
||||
if(!$this->isImmuneToFire){
|
||||
if(($this->fire % 20) == 0){
|
||||
|
|
|
|||
|
|
@ -20,11 +20,19 @@ class Skeleton extends Monster{
|
|||
}
|
||||
|
||||
public function updateBurning(){
|
||||
if($this->fire > 0 or !$this->level->isDay() || $this->inWater){ //TODO fix burning in water
|
||||
if($this->fire > 0 || !$this->level->isDay() || $this->inWater){
|
||||
return false;
|
||||
}
|
||||
//bad fix for burning in water
|
||||
[$block, $meta] = $this->level->level->getBlock((int)$this->x, (int)$this->y, (int)$this->z);
|
||||
if($block == WATER || $block == STILL_WATER){
|
||||
$v16 = ((int)$this->y + 1) - LiquidBlock::getPercentAir($meta);
|
||||
if($this->boundingBox->intersectsWith(new AxisAlignedBB((int)$this->x, (int)$this->y, (int)$this->z, (int)$this->x + 1, $v16, (int)$this->z + 1))){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
for($y = $this->y; $y < 129; $y++){
|
||||
for($y = (int)$this->y; $y < 129; $y++){
|
||||
$block = $this->level->level->getBlockID($this->x, $y, $this->z);
|
||||
if(StaticBlock::getIsSolid($block)){
|
||||
return false;
|
||||
|
|
@ -42,9 +50,9 @@ class Skeleton extends Monster{
|
|||
}
|
||||
}
|
||||
|
||||
public function update($now){
|
||||
public function updateEntityMovement(){
|
||||
$this->updateBurning();
|
||||
parent::update($now);
|
||||
return parent::updateEntityMovement();
|
||||
}
|
||||
|
||||
public function getDrops(){
|
||||
|
|
|
|||
|
|
@ -19,11 +19,19 @@ class Zombie extends Monster{
|
|||
}
|
||||
|
||||
public function updateBurning(){
|
||||
if($this->fire > 0 || !$this->level->isDay() || $this->inWater){ //TODO fix burning in water
|
||||
if($this->fire > 0 || !$this->level->isDay() || $this->inWater){
|
||||
return false;
|
||||
}
|
||||
//bad fix for burning in water
|
||||
[$block, $meta] = $this->level->level->getBlock((int)$this->x, (int)$this->y, (int)$this->z);
|
||||
if($block == WATER || $block == STILL_WATER){
|
||||
$v16 = ((int)$this->y + 1) - LiquidBlock::getPercentAir($meta);
|
||||
if($this->boundingBox->intersectsWith(new AxisAlignedBB((int)$this->x, (int)$this->y, (int)$this->z, (int)$this->x + 1, $v16, (int)$this->z + 1))){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
for($y = $this->y; $y < 129; $y++){
|
||||
for($y = (int)$this->y; $y < 129; $y++){
|
||||
$block = $this->level->level->getBlockID($this->x, $y, $this->z);
|
||||
if(StaticBlock::getIsSolid($block)){
|
||||
return false;
|
||||
|
|
@ -44,10 +52,10 @@ class Zombie extends Monster{
|
|||
public function getAttackDamage(){
|
||||
return 4;
|
||||
}
|
||||
|
||||
public function update($now){
|
||||
|
||||
public function updateEntityMovement(){
|
||||
$this->updateBurning();
|
||||
parent::update($now);
|
||||
return parent::updateEntityMovement();
|
||||
}
|
||||
|
||||
public function getDrops(){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue