diff --git a/src/Player.php b/src/Player.php index 08a46b7e..e9c120f6 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1190,7 +1190,7 @@ class Player{ $headSent = true; } if($packets <= 0) return; - + //console("Update {$e}: $packets, mot: $motionSent, mov: $moveSent, hed: $headSent"); $MTU = $this->MTU - 24; if(($this->entityMovementQueueLength + $len) >= $MTU){ $this->sendEntityMovementUpdateQueue(); diff --git a/src/entity/Entity.php b/src/entity/Entity.php index a081c0a1..58a5895b 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -565,6 +565,10 @@ class Entity extends Position $savedSpeedY = $this->speedY; if($this->class === ENTITY_MOB || $this->class === ENTITY_ITEM || ($this->class === ENTITY_OBJECT && $this->type === OBJECT_PRIMEDTNT) || $this->class === ENTITY_FALLING){ $water = false; + if($this->hasGravity){ + $this->speedY -= $this->inWater ? 0.02 : ($this->gravity); + } + $savedSpeedY = $this->speedY; $aABB = $this->boundingBox->addCoord($this->speedX, $this->speedY, $this->speedZ); $x0 = floor($aABB->minX); $x1 = ceil($aABB->maxX); @@ -573,8 +577,6 @@ class Entity extends Position $z0 = floor($aABB->minZ); $z1 = ceil($aABB->maxZ); - $ywMin = floor($aABB->minY + 0.4); - $ywMax = ceil($aABB->maxY - 0.4); for($x = $x0; $x <= $x1; ++$x){ for($y = $y0; $y <= $y1; ++$y){ for($z = $z0; $z <= $z1; ++$z){ @@ -621,10 +623,7 @@ class Entity extends Position $this->onGround = $support; - if($this->hasGravity){ //TODO causes setEntityMotion packet flood, fix - $this->speedY -= $this->inWater ? 0.02 : ($this->gravity); - $update = true; - }elseif($this->lastX != $this->x || $this->lastZ != $this->z || $this->lastY != $this->z){ + if($this->lastX != $this->x || $this->lastZ != $this->z || $this->lastY != $this->z){ // $this->speedX = 0; // $this->speedY = 0; // $this->speedZ = 0; diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php index 7626512c..6310663e 100644 --- a/src/entity/object/PrimedTNT.php +++ b/src/entity/object/PrimedTNT.php @@ -8,9 +8,10 @@ class PrimedTNT extends Entity{ if(!isset($this->data["fuse"])){ $this->data["fuse"] = 0; } + $this->hasGravity = true; + $this->gravity = 0.04; $this->setHealth(10000000, "generic"); $this->server->schedule(5, [$this, "updateFuse"], [], true); - $this->update(); } public function getMetadata(){ @@ -18,7 +19,14 @@ class PrimedTNT extends Entity{ $d[16]["value"] = (int) max(0, $this->data["fuse"] - (microtime(true) - $this->spawntime) * 20); return $d; } - + public function createSaveData(){ + $data = parent::createSaveData(); + + $data["fuse"] = $this->data["fuse"]; + $data["power"] = $this->data["power"]; + + return $data; + } public function updateFuse(){ if($this->closed === true){ return false; diff --git a/src/world/Explosion.php b/src/world/Explosion.php index e329204f..dfe66662 100644 --- a/src/world/Explosion.php +++ b/src/world/Explosion.php @@ -1,7 +1,7 @@ DIRT, STONE => COBBLESTONE, @@ -18,7 +18,7 @@ class Explosion{ private $rays = 16; private $air; private $nullPlayer; - + public function __construct(Position $center, $size){ $this->level = $center->level; $this->source = $center; @@ -26,7 +26,43 @@ class Explosion{ $this->air = BlockAPI::getItem(AIR, 0, 1); $this->nullPlayer = new PlayerNull(); } - + + public function sub_expl(&$visited, $i, $mRays, $j, $k){ + $vector = new Vector3($i / $mRays * 2 - 1, $j / $mRays * 2 - 1, $k / $mRays * 2 - 1); //($i / $mRays) * 2 - 1 + $vector = $vector->normalize()->multiply($this->stepLen); + $pointer = clone $this->source; + + for($blastForce = $this->size * (mt_rand(700, 1300) / 1000); $blastForce > 0; $blastForce -= $this->stepLen * 0.75){ + $vBlock = $pointer->floor(); + $BIDM = $this->level->level->getBlock($vBlock->x, $vBlock->y, $vBlock->z); + $blockID = $BIDM[0]; + $blockMeta = $BIDM[1]; + if($blockID > 0){ + $index = ($vBlock->x << 15) + ($vBlock->z << 7) + $vBlock->y; + + if(StaticBlock::getIsLiquid($blockID) && !isset($visited[$index])){ + ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($vBlock->x, $vBlock->y, $vBlock->z, $this->level), 5, BLOCK_UPDATE_NORMAL); + $visited[$index] = true; + } + + $blastForce -= (StaticBlock::getHardness($blockID) / 5 + 0.3) * $this->stepLen; + if($blastForce > 0){ + $index = ($vBlock->x << 15) + ($vBlock->z << 7) + $vBlock->y; + if(!isset($this->affectedBlocks[$index])){ + $this->affectedBlocks[$index] = [ + "x" => $vBlock->x, + "y" => $vBlock->y, + "z" => $vBlock->z, + "id" => $blockID, + "meta" => $blockMeta + ]; + } + } + } + $pointer = $pointer->add($vector); + } + } + public function explode(){ $radius = 2 * $this->size; $server = ServerAPI::request(); @@ -54,48 +90,48 @@ class Explosion{ } $visited = []; $mRays = $this->rays - 1; - for($i = 0; $i < $this->rays; ++$i){ - for($j = 0; $j < $this->rays; ++$j){ - for($k = 0; $k < $this->rays; ++$k){ - if($i == 0 or $i == $mRays or $j == 0 or $j == $mRays or $k == 0 or $k == $mRays){ - $vector = new Vector3($i / $mRays * 2 - 1, $j / $mRays * 2 - 1, $k / $mRays * 2 - 1); //($i / $mRays) * 2 - 1 - $vector = $vector->normalize()->multiply($this->stepLen); - $pointer = clone $this->source; - - for($blastForce = $this->size * (mt_rand(700, 1300) / 1000); $blastForce > 0; $blastForce -= $this->stepLen * 0.75){ - $vBlock = $pointer->floor(); - $BIDM = $this->level->level->getBlock($vBlock->x, $vBlock->y, $vBlock->z); - $blockID = $BIDM[0]; - $blockMeta = $BIDM[1]; - if($blockID > 0){ - $index = ($vBlock->x << 15) + ($vBlock->z << 7) + $vBlock->y; - - if(StaticBlock::getIsLiquid($blockID) && !isset($visited[$index])){ - ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($vBlock->x, $vBlock->y, $vBlock->z, $this->level), 5, BLOCK_UPDATE_NORMAL); - $visited[$index] = true; - } - - $blastForce -= (StaticBlock::getHardness($blockID) / 5 + 0.3) * $this->stepLen; - if($blastForce > 0){ - $index = ($vBlock->x << 15) + ($vBlock->z << 7) + $vBlock->y; - if(!isset($this->affectedBlocks[$index])){ - $this->affectedBlocks[$index] = [ - "x" => $vBlock->x, - "y" => $vBlock->y, - "z" => $vBlock->z, - "id" => $blockID, - "meta" => $blockMeta - ]; - } - } - } - $pointer = $pointer->add($vector); - } - } - } + $i = 0; + for($j = 0; $j <= $mRays; ++$j){ + for($k = 0; $k <= $mRays; ++$k){ + $this->sub_expl($visited, $i, $mRays, $j, $k); //i wish there was #define or inline } } - + $i = $mRays; + for($j = 0; $j <= $mRays; ++$j){ + for($k = 0; $k <= $mRays; ++$k){ + $this->sub_expl($visited, $i, $mRays, $j, $k); + } + } + + $j = 0; + for($i = 1; $i < $mRays; ++$i){ + for($k = 0; $k <= $mRays; ++$k){ + $this->sub_expl($visited, $i, $mRays, $j, $k); + } + } + + $j = $mRays; + for($i = 1; $i < $mRays; ++$i){ + for($k = 0; $k <= $mRays; ++$k){ + $this->sub_expl($visited, $i, $mRays, $j, $k); + } + } + + $k = 0; + for($i = 1; $i < $mRays; ++$i){ + for($j = 1; $j < $mRays; ++$j){ + $this->sub_expl($visited, $i, $mRays, $j, $k); + } + } + $k = $mRays; + for($i = 1; $i < $mRays; ++$i){ + for($j = 1; $j < $mRays; ++$j){ + $this->sub_expl($visited, $i, $mRays, $j, $k); + } + } + //if($i == 0 or $i == $mRays or $j == 0 or $j == $mRays or $k == 0 or $k == $mRays){ + + $send = []; $source = $this->source->floor(); foreach($server->api->entity->getRadius($this->source, $radius) as $entity){ @@ -103,7 +139,7 @@ class Explosion{ $damage = (int) (($impact * $impact + $impact) * 8 * $this->size + 1); $entity->harm($damage, "explosion"); } - + foreach($this->affectedBlocks as $blockA){ if($blockA["id"] === TNT){ $data = [