From b362f262f4262c4dde259d4f7e9bee7344b4e901 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 28 Oct 2023 16:20:13 +0300 Subject: [PATCH] minecart entity tweaks --- src/Player.php | 3 --- src/astarnavigator/TileNavigator.php | 14 +++++++------- .../providers/MCDiagonalProvider.php | 10 +++++++--- src/entity/Entity.php | 7 +++++-- src/entity/ai/path/PathFollower.php | 2 +- src/entity/object/Minecart.php | 2 +- src/material/item/generic/MinecartItem.php | 4 ++-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/Player.php b/src/Player.php index 29e2b59c..38ad41e7 100755 --- a/src/Player.php +++ b/src/Player.php @@ -779,9 +779,6 @@ class Player{ $pk->speedY = $data->speedY; $pk->speedZ = $data->speedZ; $this->dataPacket($pk); - $data->lastSpeedZ = $data->speedZ; - $data->lastSpeedY = $data->speedY; - $data->lastSpeedX = $data->speedX; break; case "entity.animate": diff --git a/src/astarnavigator/TileNavigator.php b/src/astarnavigator/TileNavigator.php index c8b70c97..84c2932f 100644 --- a/src/astarnavigator/TileNavigator.php +++ b/src/astarnavigator/TileNavigator.php @@ -26,8 +26,8 @@ class TileNavigator implements ITileNavigator public function navigate(PathTile $from, PathTile $to, $maxDist) { - $open = new SplPriorityQueue(); - $open->insert($from, 0); + $open = [0 => $from]; + //$open->insert(, 0); $path = []; $gScore = []; $gScore[(string) $from] = 0; @@ -37,16 +37,16 @@ class TileNavigator implements ITileNavigator } $visited = []; $maxDist*=$maxDist; //no square root - while(!$open->isEmpty()) + while(count($open) > 0) { - $current = $open->top(); - $open->next(); + $current = array_pop($open); if ($current == $to){ return $this->reconstructPath($path, $current); } foreach($this->neighborProvider->getNeighbors($current) as $neighbor) { - if(!Utils::in_range(($from->x - $neighbor->x)*($from->x - $neighbor->x) + ($from->y - $neighbor->y)*($from->y - $neighbor->y) + ($from->z - $neighbor->z)*($from->z - $neighbor->z), -$maxDist, $maxDist)){ //Utils::distance_noroot($neighbor->asArray(), $from->asArray()) + $dist = ($from->x - $neighbor->x)*($from->x - $neighbor->x) + ($from->y - $neighbor->y)*($from->y - $neighbor->y) + ($from->z - $neighbor->z)*($from->z - $neighbor->z); + if($dist < -$maxDist || $dist > $maxDist){ //Utils::distance_noroot($neighbor->asArray(), $from->asArray()) continue; } if(isset($visited[(string)$neighbor])){ @@ -58,7 +58,7 @@ class TileNavigator implements ITileNavigator $tentativeG = $gScore[(string) $current] + $distbetweenCost; if (!isset($has[(string)$neighbor])) { - $open->insert($neighbor, -$tentativeG); + $open[-$tentativeG] = $neighbor; $has[(string)$neighbor] = true; } elseif ($tentativeG >= $gScore[(string) $neighbor]) diff --git a/src/astarnavigator/providers/MCDiagonalProvider.php b/src/astarnavigator/providers/MCDiagonalProvider.php index d9f69c44..63399046 100644 --- a/src/astarnavigator/providers/MCDiagonalProvider.php +++ b/src/astarnavigator/providers/MCDiagonalProvider.php @@ -2,7 +2,11 @@ class MCDiagonalProvider implements INeighborProvider { - private static $neighbors = array([ 0, 0, -1 ], [ 1, 0, 0 ], [ 0, 0, 1 ], [ -1, 0, 0 ]); + private static $neighbors = array( + [ -1, 0, -1 ], [-1, 0, 0], [-1, 0, 1], + [0, 0, -1], [0, 0, 1], + [1, 0, -1], [1, 0, 0], [1, 0, -1] + ); private static $jumpOffset = [0, 1, 0]; private static $moveDownOffset = [0, -1, 0]; public function getNeighbors(PathTile $tile) @@ -12,12 +16,12 @@ class MCDiagonalProvider implements INeighborProvider foreach(MCDiagonalProvider::$neighbors as $offset){ $pnt = $tile->addOffset($offset); if(!StaticBlock::getIsSolid($tile->level->level->getBlockID($pnt->x, $pnt->y, $pnt->z))){ - if(!StaticBlock::getIsSolid($tile->level->level->getBlockID($pnt->x, $pnt->y - 1, $pnt->z, false))){ + if(!StaticBlock::getIsSolid($tile->level->level->getBlockID($pnt->x, $pnt->y - 1, $pnt->z))){ --$pnt->y; } $pnts[] = $pnt; }else{ - if(!StaticBlock::getIsSolid($tile->level->level->getBlockID($pnt->x, $pnt->y + 1, $pnt->z, false))){ + if(!StaticBlock::getIsSolid($tile->level->level->getBlockID($pnt->x, $pnt->y + 1, $pnt->z))){ ++$pnt->y; $pnts[] = $pnt; } diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 2ec9d15d..a85e869a 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -625,6 +625,9 @@ class Entity extends Position $hasUpdate = true; if(($this->server->ticks % 4 === 0 && $this->class === ENTITY_ITEM) || $this->class != ENTITY_ITEM){ //update item speed every 4 ticks $this->server->api->handle("entity.motion", $this); + $this->lastSpeedZ = $this->speedZ; + $this->lastSpeedY = $this->speedY; + $this->lastSpeedX = $this->speedX; } } $this->updateFallState($this->speedY); @@ -1316,7 +1319,7 @@ class Entity extends Position public function moveEntityWithOffset($oX, $oY, $oZ) { $oX = $oX === 0 ? $this->speedX : ($this->getSpeedModifer() * $oX * $this->getSpeed()); - $oY = $oY <= 0 ? $this->speedY : (0.42); + $oY = $oY <= 0 ? $this->speedY : (0.40); $oZ = $oZ === 0 ? $this->speedZ : ($this->getSpeedModifer() * $oZ * $this->getSpeed()); $this->setVelocity($oX, $oY, $oZ); } @@ -1436,7 +1439,7 @@ class Entity extends Position $this->server->api->ban->ban($this->player->username); } } else{ - if($this instanceof Painting){ //TODO better fix + if($this instanceof Painting || $this instanceof Minecart){ //TODO better fix $this->close(); } else{ diff --git a/src/entity/ai/path/PathFollower.php b/src/entity/ai/path/PathFollower.php index 2212a630..24545186 100644 --- a/src/entity/ai/path/PathFollower.php +++ b/src/entity/ai/path/PathFollower.php @@ -18,7 +18,7 @@ class PathFollower{ $this->entity->path = null; $this->entity->currentIndex = 0; $this->entity->currentNode = false; - }elseif($this->entity->path != null && ($this->entity->currentNode == false || $this->entity->ai->mobController->moveTo($this->entity->currentNode->x, $this->entity->currentNode->y, $this->entity->currentNode->z) === false)){ + }elseif($this->entity->path != null && ($this->entity->currentNode == false || $this->entity->boundingBox->isXYZInside($this->entity->currentNode->x, $this->entity->currentNode->y, $this->entity->currentNode->z) || $this->entity->ai->mobController->moveTo($this->entity->currentNode->x, $this->entity->currentNode->y, $this->entity->currentNode->z) === false)){ $this->entity->currentNode = $this->entity->path[$this->entity->currentIndex++]; } } diff --git a/src/entity/object/Minecart.php b/src/entity/object/Minecart.php index f154bf25..c257fcf4 100644 --- a/src/entity/object/Minecart.php +++ b/src/entity/object/Minecart.php @@ -62,7 +62,7 @@ class Minecart extends Vehicle{ $this->x = isset($this->data["TileX"]) ? $this->data["TileX"]:$this->x; $this->y = isset($this->data["TileY"]) ? $this->data["TileY"]:$this->y; $this->z = isset($this->data["TileZ"]) ? $this->data["TileZ"]:$this->z; - $this->setHealth(3, "generic"); + $this->setHealth(1, "generic"); //orig: 3 $this->width = 0.98; $this->height = 0.7; $this->update(); diff --git a/src/material/item/generic/MinecartItem.php b/src/material/item/generic/MinecartItem.php index a82cee48..d1fd8104 100755 --- a/src/material/item/generic/MinecartItem.php +++ b/src/material/item/generic/MinecartItem.php @@ -12,9 +12,9 @@ class MinecartItem extends Item{ } $server = ServerAPI::request(); $data = [ - "x" => $target->getX(), + "x" => $target->getX() + 0.5, "y" => $target->getY() + 0.8, - "z" => $target->getZ(), + "z" => $target->getZ() + 0.5, ]; $e = $server->api->entity->add($level, ENTITY_OBJECT, OBJECT_MINECART, $data); $server->api->entity->spawnToAll($e);