mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
3 small fixes
This commit is contained in:
parent
7768ad03a9
commit
39bfa7115d
5 changed files with 23 additions and 2 deletions
|
|
@ -128,6 +128,7 @@ class Player{
|
|||
$this->isSleeping = $pos;
|
||||
$this->sleepingTime = 0;
|
||||
$this->teleport(new Position($pos->x + 0.5, $pos->y + 1, $pos->z + 0.5, $this->level), false, false, false, false);
|
||||
//TODO change player hitbox size after he starts sleeping
|
||||
if($this->entity instanceof Entity){
|
||||
$this->entity->updateMetadata();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -408,7 +408,7 @@ class Entity extends Position
|
|||
$endZ = ceil($this->boundingBox->maxZ);
|
||||
$waterDone = false;
|
||||
//$bup = new AxisAlignedBB($startX, $startY + 1, $startZ, $endX, $endY, $endZ);
|
||||
if(!($this instanceof Painting)){ //TODO better way to fix
|
||||
if(!($this instanceof Painting) && !($this->isPlayer() && $this->player->isSleeping !== false)){ //TODO better way to fix
|
||||
for($i = 0; $i < 8; ++$i){
|
||||
$x = ((($i >> 0) % 2) - 0.5) * $this->width * 0.8;
|
||||
$y= ((($i >> 1) % 2) - 0.5) * 0.1;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class SignPostBlock extends TransparentBlock{
|
|||
}
|
||||
|
||||
public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
|
||||
if($target->isSolid && $face !== 0){
|
||||
if(($target->isSolid || $target->getID() === SIGN_POST || $target->getID() === WALL_SIGN) && $face !== 0){
|
||||
if(!isset(self::$faces[$face])){
|
||||
$this->meta = floor((($player->entity->yaw + 180) * 16 / 360) + 0.5) & 0x0F;
|
||||
$this->level->setBlock($block, BlockAPI::get(SIGN_POST, $this->meta), true, false, true);
|
||||
|
|
|
|||
|
|
@ -5,11 +5,27 @@ require_once("SignPostBlock.php");
|
|||
/***REM_END***/
|
||||
|
||||
class WallSignBlock extends SignPostBlock{
|
||||
|
||||
public static $meta2side = [
|
||||
2 => 3,
|
||||
3 => 2,
|
||||
4 => 5,
|
||||
5 => 4
|
||||
];
|
||||
|
||||
|
||||
public function __construct($meta = 0){
|
||||
TransparentBlock::__construct(WALL_SIGN, $meta, "Wall Sign");
|
||||
$this->isSolid = false;
|
||||
}
|
||||
|
||||
public function onUpdate($type){
|
||||
$attached = $this->getSide(self::$meta2side[$this->meta] ?? -1);
|
||||
if(!($attached instanceof Block) || (!$attached->isSolid && $attached->getID() != SIGN_POST && $attached->getID() != WALL_SIGN)){
|
||||
$this->level->setBlock($this, new AirBlock(), true, true, true);
|
||||
(ServerAPI::request())->api->entity->drop(new Position($this->x + 0.5, $this->y + 0.5, $this->z + 0.5, $this->level), BlockAPI::getItem(SIGN, 0, 1));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -15,4 +15,8 @@ class GlowstoneBlock extends TransparentBlock implements LightingBlock{
|
|||
array(GLOWSTONE_DUST, 0, mt_rand(2, 4)),
|
||||
);
|
||||
}
|
||||
|
||||
public static function getCollisionBoundingBoxes(Level $level, $x, $y, $z, Entity $entity){
|
||||
return [new AxisAlignedBB($x, $y, $z, $x + 1, $y + 1, $z + 1)];
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue