mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 11:39:43 +00:00
everlasting fire fix, small bugfixes
This commit is contained in:
parent
4b17c605b4
commit
4e4c392ade
4 changed files with 14 additions and 5 deletions
|
|
@ -167,6 +167,9 @@ class LevelAPI{
|
|||
break;
|
||||
case "save-all":
|
||||
$output .= "Saving...\n";
|
||||
foreach($this->server->clients as $p){
|
||||
$p->sendChat("Saving world, server might lag a bit...");
|
||||
}
|
||||
$save = $this->server->saveEnabled;
|
||||
$this->server->saveEnabled = true;
|
||||
$this->saveAll();
|
||||
|
|
|
|||
|
|
@ -395,9 +395,6 @@ class Entity extends Position
|
|||
} else{
|
||||
$hasUpdate = true;
|
||||
}
|
||||
if(($this->player instanceof Player) and ($this->player->gamemode & 0x01) === CREATIVE){ // Remove fire effects in next tick
|
||||
$this->fire = 1;
|
||||
}
|
||||
}
|
||||
|
||||
$startX = floor($this->boundingBox->minX);
|
||||
|
|
@ -470,6 +467,9 @@ class Entity extends Position
|
|||
if ($this->inBlock(new Vector3($x, $y, $z))) {
|
||||
$this->harm(5, "lava");
|
||||
$this->fire = 300;
|
||||
if($this->isPlayer() and ($this->player->gamemode & 0x01) === CREATIVE){
|
||||
$this->fire = 1;
|
||||
}
|
||||
$this->updateMetadata();
|
||||
$hasUpdate = true;
|
||||
}
|
||||
|
|
@ -478,6 +478,9 @@ class Entity extends Position
|
|||
if ($this->inBlock(new Vector3($x, $y, $z))) {
|
||||
$this->harm(1, "fire");
|
||||
$this->fire = 300;
|
||||
if($this->isPlayer() and ($this->player->gamemode & 0x01) === CREATIVE){
|
||||
$this->fire = 1;
|
||||
}
|
||||
$this->updateMetadata();
|
||||
$hasUpdate = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,9 +69,12 @@ class LavaBlock extends LiquidBlock implements LightingBlock{
|
|||
/*if($this->checkWater()){
|
||||
return;
|
||||
}*/
|
||||
|
||||
$falling = $this->meta >> 3;
|
||||
$down = $this->getSide(0);
|
||||
if($down instanceof WaterBlock) {
|
||||
$this->level->fastSetBlockUpdate($down->x, $down->y, $down->z, STONE, 0, true);
|
||||
return;
|
||||
}
|
||||
|
||||
$from = $this->getFrom();
|
||||
if($from !== null || $level == 0x00){
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class WaterBlock extends LiquidBlock{
|
|||
}
|
||||
$b = $this->getSide($side);
|
||||
if($b instanceof LavaBlock){
|
||||
$level = $b->meta & 0x06;
|
||||
$level = $b->meta & 0x07;
|
||||
if($level == 0x00){
|
||||
$this->level->setBlock($b, new ObsidianBlock(), false, false, true);
|
||||
}else{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue