From 755276193ce580280c3fcf9413899abfd02938e3 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Wed, 8 Nov 2023 15:00:28 +0300 Subject: [PATCH] ew --- src/Player.php | 4 ++-- src/entity/object/ItemEntity.php | 2 +- src/material/block/nonfull/FarmlandBlock.php | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Player.php b/src/Player.php index e9c120f6..d0d31740 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1156,7 +1156,7 @@ class Player{ $motionSent = false; $moveSent = false; $headSent = false; - if($e->speedX != 0 || $e->speedY != 0 || $e->speedZ != 0){ + if($e->speedX != 0 || $e->speedY != 0 || $e->speedZ != 0 || $e->speedY != $e->lastSpeedY || $e->speedX != $e->lastSpeedX || $e->speedZ != $e->lastSpeedZ){ $motion = new SetEntityMotionPacket(); $motion->eid = $e->eid; $motion->speedX = $e->speedX; @@ -1171,7 +1171,7 @@ class Player{ $move = new MoveEntityPacket_PosRot(); $move->eid = $e->eid; $move->x = $e->x; - $move->y = $e->y; + $move->y = $e instanceof ItemEntity ? $e->boundingBox->maxY : $e->y; //TODO fix items getting into farmland in client side somehow else $move->z = $e->z; $move->yaw = $e->yaw; $move->pitch = $e->pitch; diff --git a/src/entity/object/ItemEntity.php b/src/entity/object/ItemEntity.php index ed93d184..c4d36e31 100644 --- a/src/entity/object/ItemEntity.php +++ b/src/entity/object/ItemEntity.php @@ -9,6 +9,7 @@ class ItemEntity extends Entity{ public function __construct(Level $level, $eid, $class, $type = 0, $data = array()) { parent::__construct($level, $eid, $class, $type, $data); + $this->setSize(0.25, 0.25); if(isset($data["item"]) and ($data["item"] instanceof Item)){ $this->meta = $this->data["item"]->getMetadata(); $this->stack = $this->data["item"]->count; @@ -18,7 +19,6 @@ class ItemEntity extends Entity{ } $this->hasGravity = true; $this->setHealth(5, "generic"); - $this->setSize(0.25, 0.25); $this->gravity = 0.04; $this->delayBeforePickup = 20; } diff --git a/src/material/block/nonfull/FarmlandBlock.php b/src/material/block/nonfull/FarmlandBlock.php index 3c0974cf..fc18b8d9 100644 --- a/src/material/block/nonfull/FarmlandBlock.php +++ b/src/material/block/nonfull/FarmlandBlock.php @@ -16,6 +16,10 @@ class FarmlandBlock extends TransparentBlock{ return $b->isTransparent && $b->id != 0; } + public static function getCollisionBoundingBoxes(Level $level, $x, $y, $z, Entity $entity){ + return [new AxisAlignedBB($x, $y, $z, $x + 1, $y + 0.9375, $z + 1)]; + } + public static function fallOn(Level $level, $x, $y, $z, Entity $entity, $fallDistance){ $rv = lcg_value(); console("rv: $rv, fd: ".($fallDistance - 0.5));