mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-20 16:00:20 +00:00
Code Issues Projects Releases Wiki Activity

Added individual object timings to Entities / Tile Entities

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-30 16:09:21 +02:00
parent f8378c09ba
commit 539fa232f8
8 changed files with 167 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Player.php
View File

@ -1167,6 +1167,8 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
return true;
}
$this->timings->startTiming();
$this->processMovement();
$hasUpdate = $this->entityBaseTick();
@ -1232,6 +1234,8 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
}
}
$this->timings->stopTiming();
return true;
}

132
src/pocketmine/entity/Arrow.php
View File

@ -65,87 +65,97 @@ class Arrow extends Projectile{
}
public function onUpdate(){
$this->entityBaseTick();
if($this->closed !== false){
if($this->closed){
return false;
}
$movingObjectPosition = null;
$this->timings->startTiming();
$this->motionY -= $this->gravity;
$this->entityBaseTick();
$this->inBlock = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
if(!$this->dead){
$moveVector = new Vector3($this->x + $this->motionX, $this->y + $this->motionY, $this->z + $this->motionZ);
$movingObjectPosition = null;
$list = $this->getLevel()->getCollidingEntities($this->boundingBox->addCoord($this->motionX, $this->motionY, $this->motionZ)->expand(1, 1, 1), $this);
$this->motionY -= $this->gravity;
$nearDistance = PHP_INT_MAX;
$nearEntity = null;
$this->inBlock = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
foreach($list as $entity){
if(/*!$entity->canCollideWith($this) or */($entity === $this->shootingEntity and $this->ticksLived < 5)){
continue;
}
$moveVector = new Vector3($this->x + $this->motionX, $this->y + $this->motionY, $this->z + $this->motionZ);
$axisalignedbb = $entity->boundingBox->grow(0.3, 0.3, 0.3);
$ob = $axisalignedbb->calculateIntercept($this, $moveVector);
$list = $this->getLevel()->getCollidingEntities($this->boundingBox->addCoord($this->motionX, $this->motionY, $this->motionZ)->expand(1, 1, 1), $this);
if($ob === null){
continue;
}
$nearDistance = PHP_INT_MAX;
$nearEntity = null;
$distance = $this->distance($ob->hitVector);
foreach($list as $entity){
if(/*!$entity->canCollideWith($this) or */
($entity === $this->shootingEntity and $this->ticksLived < 5)
){
continue;
}
if($distance < $nearDistance){
$nearDistance = $distance;
$nearEntity = $entity;
}
}
$axisalignedbb = $entity->boundingBox->grow(0.3, 0.3, 0.3);
$ob = $axisalignedbb->calculateIntercept($this, $moveVector);
if($nearEntity !== null){
$movingObjectPosition = MovingObjectPosition::fromEntity($nearEntity);
}
if($ob === null){
continue;
}
if($movingObjectPosition !== null){
if($movingObjectPosition->entityHit !== null){
$motion = sqrt($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2);
$damage = ceil($motion * $this->damage);
$distance = $this->distance($ob->hitVector);
$ev = new EntityDamageByEntityEvent($this->shootingEntity === null ? $this : $this->shootingEntity, $movingObjectPosition->entityHit, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
$this->server->getPluginManager()->callEvent($ev);
if(!$ev->isCancelled()){
$movingObjectPosition->entityHit->attack($damage, $ev);
if($this->fireTicks > 0){
$movingObjectPosition->entityHit->setOnFire(5);
}
$this->kill();
if($distance < $nearDistance){
$nearDistance = $distance;
$nearEntity = $entity;
}
}
if($nearEntity !== null){
$movingObjectPosition = MovingObjectPosition::fromEntity($nearEntity);
}
if($movingObjectPosition !== null){
if($movingObjectPosition->entityHit !== null){
$motion = sqrt($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2);
$damage = ceil($motion * $this->damage);
$ev = new EntityDamageByEntityEvent($this->shootingEntity === null ? $this : $this->shootingEntity, $movingObjectPosition->entityHit, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
$this->server->getPluginManager()->callEvent($ev);
if(!$ev->isCancelled()){
$movingObjectPosition->entityHit->attack($damage, $ev);
if($this->fireTicks > 0){
$movingObjectPosition->entityHit->setOnFire(5);
}
$this->kill();
}
}
}
$this->move($this->motionX, $this->motionY, $this->motionZ);
if($this->onGround){
$this->motionX = 0;
$this->motionY = 0;
$this->motionZ = 0;
}
if($this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0){
$f = sqrt(($this->motionX ** 2) + ($this->motionZ ** 2));
$this->yaw = (atan2($this->motionX, $this->motionZ) * 180 / M_PI);
$this->pitch = (atan2($this->motionY, $f) * 180 / M_PI);
}
if($this->age > 1200){
$this->kill();
}
$this->updateMovement();
}
$this->move($this->motionX, $this->motionY, $this->motionZ);
if($this->onGround){
$this->motionX = 0;
$this->motionY = 0;
$this->motionZ = 0;
}
if($this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0){
$f = sqrt(($this->motionX ** 2) + ($this->motionZ ** 2));
$this->yaw = (atan2($this->motionX, $this->motionZ) * 180 / M_PI);
$this->pitch = (atan2($this->motionY, $f) * 180 / M_PI);
}
if($this->age > 1200){
$this->kill();
}
$this->updateMovement();
$this->timings->stopTiming();
return !$this->onGround or ($this->motionX == 0 and $this->motionY == 0 and $this->motionZ == 0);
}

63
src/pocketmine/entity/DroppedItem.php
View File

@ -66,40 +66,47 @@ class DroppedItem extends Entity{
}
public function onUpdate(){
$this->entityBaseTick();
if($this->closed !== false){
return false;
}
if($this->pickupDelay > 0 and $this->pickupDelay < 32767){ //Infinite delay
--$this->pickupDelay;
$this->timings->startTiming();
$this->entityBaseTick();
if(!$this->dead){
if($this->pickupDelay > 0 and $this->pickupDelay < 32767){ //Infinite delay
--$this->pickupDelay;
}
$this->motionY -= $this->gravity;
$this->inBlock = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
$this->move($this->motionX, $this->motionY, $this->motionZ);
$friction = 1 - $this->drag;
if($this->onGround){
$friction = $this->getLevel()->getBlock(new Vector3($this->getFloorX(), $this->getFloorY() - 1, $this->getFloorZ()))->frictionFactor * $friction;
}
$this->motionX *= $friction;
$this->motionY *= 1 - $this->drag;
$this->motionZ *= $friction;
if($this->onGround){
$this->motionY *= -0.5;
}
if($this->age > 6000){
$this->kill();
}
$this->updateMovement();
}
$this->motionY -= $this->gravity;
$this->inBlock = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
$this->move($this->motionX, $this->motionY, $this->motionZ);
$friction = 1 - $this->drag;
if($this->onGround){
$friction = $this->getLevel()->getBlock(new Vector3($this->getFloorX(), $this->getFloorY() - 1, $this->getFloorZ()))->frictionFactor * $friction;
}
$this->motionX *= $friction;
$this->motionY *= 1 - $this->drag;
$this->motionZ *= $friction;
if($this->onGround){
$this->motionY *= -0.5;
}
if($this->age > 6000){
$this->kill();
}
$this->updateMovement();
$this->timings->stopTiming();
return !$this->onGround or ($this->motionX == 0 and $this->motionY == 0 and $this->motionZ == 0);
}

10
src/pocketmine/entity/Entity.php
View File

@ -152,12 +152,17 @@ abstract class Entity extends Position implements Metadatable{
public $closed = false;
/** @var \pocketmine\event\TimingsHandler */
protected $timings;
public function __construct(FullChunk $chunk, Compound $nbt){
if($chunk === null or $chunk->getProvider() === null){
throw new \Exception("Invalid garbage Chunk given to Entity");
}
$this->timings = Timings::getEntityTimings($this);
if($this->eyeHeight === null){
$this->eyeHeight = $this->height;
}
@ -533,7 +538,7 @@ abstract class Entity extends Position implements Metadatable{
}
foreach($this->hasSpawned as $player){
$player->directDataPacket($pk);
$player->dataPacket($pk);
}
}
@ -575,11 +580,14 @@ abstract class Entity extends Position implements Metadatable{
if($this->closed !== false){
return false;
}
$this->timings->startTiming();
$hasUpdate = $this->entityBaseTick();
$this->updateMovement();
$this->timings->stopTiming();
//if($this->isStatic())
return true;
//return !($this instanceof Player);

66
src/pocketmine/entity/FallingBlock.php
View File

@ -63,45 +63,51 @@ class FallingBlock extends Entity{
}
public function onUpdate(){
$this->entityBaseTick();
if($this->closed or $this->dead){
if($this->closed){
return false;
}
if($this->ticksLived === 1){
$block = $this->level->getBlock($this->floor());
if($block->getID() != $this->blockId){
$this->timings->startTiming();
$this->entityBaseTick();
if(!$this->dead){
if($this->ticksLived === 1){
$block = $this->level->getBlock($this->floor());
if($block->getID() != $this->blockId){
$this->kill();
return true;
}
$this->level->setBlock($this->floor(), Block::get(0, true));
}
$this->motionY -= $this->gravity;
$this->move($this->motionX, $this->motionY, $this->motionZ);
$friction = 1 - $this->drag;
$this->motionX *= $friction;
$this->motionY *= 1 - $this->drag;
$this->motionZ *= $friction;
$pos = $this->floor();
if($this->onGround){
$this->kill();
return true;
$block = $this->level->getBlock($pos);
if(!$block->isFullBlock){
$this->getLevel()->dropItem($this, Item::get($this->getBlock(), 0, 1));
}else{
$this->getLevel()->setBlock($pos, Block::get($this->getBlock(), 0), true);
}
}
$this->level->setBlock($this->floor(), Block::get(0, true));
$this->updateMovement();
}
$this->motionY -= $this->gravity;
$this->move($this->motionX, $this->motionY, $this->motionZ);
$friction = 1 - $this->drag;
$this->motionX *= $friction;
$this->motionY *= 1 - $this->drag;
$this->motionZ *= $friction;
$pos = $this->floor();
if($this->onGround){
$this->kill();
$block = $this->level->getBlock($pos);
if(!$block->isFullBlock){
$this->getLevel()->dropItem($this, Item::get($this->getBlock(), 0, 1));
}else{
$this->getLevel()->setBlock($pos, Block::get($this->getBlock(), 0), true);
}
}
$this->updateMovement();
return !$this->onGround or ($this->motionX == 0 and $this->motionY == 0 and $this->motionZ == 0);
}

6
src/pocketmine/level/Level.php
View File

@ -742,7 +742,11 @@ class Level implements ChunkManager, Metadatable{
* @return bool
*/
public function isFullBlock(Vector3 $pos){
$bb = $this->getBlock($pos)->getBoundingBox();
if($pos instanceof Block){
$bb = $pos->getBoundingBox();
}else{
$bb = $this->getBlock($pos)->getBoundingBox();
}
return $bb instanceof AxisAlignedBB and $bb->getAverageEdgeLength() >= 1;
}

4
src/pocketmine/tile/Furnace.php
View File

@ -170,6 +170,8 @@ class Furnace extends Tile implements InventoryHolder, Container{
return false;
}
$this->timings->startTiming();
$ret = false;
$fuel = $this->inventory->getFuel();
@ -248,6 +250,8 @@ class Furnace extends Tile implements InventoryHolder, Container{
$this->lastUpdate = microtime(true);
$this->timings->stopTiming();
return $ret;
}
}

3
src/pocketmine/tile/Tile.php
View File

@ -54,6 +54,7 @@ abstract class Tile extends Position{
public $namedtag;
protected $lastUpdate;
protected $server;
protected $timings;
/** @var \pocketmine\event\TimingsHandler */
public $tickTimer;
@ -63,6 +64,8 @@ abstract class Tile extends Position{
throw new \Exception("Invalid garbage Chunk given to Tile");
}
$this->timings = Timings::getTileEntityTimings($this);
$this->server = $chunk->getProvider()->getLevel()->getServer();
$this->chunk = $chunk;
$this->setLevel($chunk->getProvider()->getLevel());