mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-17 03:08:58 +00:00
Code Issues Projects Releases Wiki Activity

Send Entity motion, update on schedule

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-03-03 00:27:44 +01:00
parent c904e8bc0e
commit f6589db064
2 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/Entity.php
View File

@ -152,9 +152,9 @@ abstract class Entity extends Position{
if($this->closed !== false){ if($this->closed !== false){
return false; return false;
} }
$timeNow = microtime(true); $timeNow = microtime(true);
$this->ticksLived += ($now - $this->lastUpdate) * 20; $this->ticksLived += ($now - $this->lastUpdate) * 20;
$this->lastUpdate = $timeNow;
if($this->handleWaterMovement()){ if($this->handleWaterMovement()){
$this->fallDistance = 0; $this->fallDistance = 0;
@ -187,6 +187,48 @@ abstract class Entity extends Position{
if($this->y < -64){ if($this->y < -64){
$this->kill(); $this->kill();
} }
if($this->x !== $this->lastX or $this->y !== $this->lastY or $this->z !== $this->lastZ or $this->yaw !== $this->lastYaw or $this->pitch !== $this->lastPitch){
$this->lastX = $this->x;
$this->lastY = $this->y;
$this->lastZ = $this->z;
$this->lastYaw = $this->yaw;
$this->lastPitch = $this->pitch;
if($this instanceof HumanEntity){
$pk = new MovePlayerPacket;
$pk->eid = $this->id;
$pk->x = $this->x;
$pk->y = $this->y;
$pk->z = $this->z;
$pk->yaw = $this->yaw;
$pk->pitch = $this->pitch;
$pk->bodyYaw = $this->yaw;
}else{
$pk = new MoveEntityPacket_PosRot;
$pk->eid = $this->id;
$pk->x = $this->x;
$pk->y = $this->y;
$pk->z = $this->z;
$pk->yaw = $this->yaw;
$pk->pitch = $this->pitch;
}
Player::broadcastPacket($this->hasSpawned, $pk);
}
if($this->motionChanged === true){
$this->motionChanged = false;
$pk = new SetEntityMotionPacket;
$pk->eid = $this->id;
$pk->speedX = $this->motionX;
$pk->speedY = $this->motionY;
$pk->speedZ = $this->motionZ;
Player::broadcastPacket($this->hasSpawned, $pk);
}
$this->lastUpdate = $timeNow;
return false; return false;
} }
@ -207,10 +249,6 @@ abstract class Entity extends Position{
$this->fireTicks = 0; $this->fireTicks = 0;
} }
public function moveEntity(Vector3 $displacement){ //TODO
}
public function canTriggerWalking(){ public function canTriggerWalking(){
return true; return true;
} }
@ -254,15 +292,6 @@ abstract class Entity extends Position{
} }
public function setPositionAndRotation(Vector3 $pos, $yaw, $pitch){ //TODO
if($this->setPosition($pos) === true){
$this->yaw = $yaw;
$this->pitch = $pitch;
return true;
}
return false;
}
public function onCollideWithPlayer(EntityPlayer $entityPlayer){ public function onCollideWithPlayer(EntityPlayer $entityPlayer){
} }
@ -305,6 +334,31 @@ abstract class Entity extends Position{
return new Position($this->x, $this->y, $this->z, $this->level); return new Position($this->x, $this->y, $this->z, $this->level);
} }
public function move(Vector3 $displacement){
if($displacement->x == 0 and $displacement->y == 0 and $displacement->z == 0){
return;
}
$x = $this->x;
$y = $this->y;
$z = $this->z;
$this->scheduleUpdate();
}
public function setPositionAndRotation(Vector3 $pos, $yaw, $pitch){
if($this->setPosition($pos) === true){
$this->setRotation($yaw, $pitch);
return true;
}
return false;
}
public function setRotation($yaw, $pitch){
$this->yaw = $yaw;
$this->pitch = $pitch;
$this->scheduleUpdate();
}
public function setPosition(Vector3 $pos){ public function setPosition(Vector3 $pos){
if($pos instanceof Position and $pos->level instanceof Level and $pos->level !== $this->level){ if($pos instanceof Position and $pos->level instanceof Level and $pos->level !== $this->level){
if($this->switchLevel($pos->level) === false){ if($this->switchLevel($pos->level) === false){
@ -342,27 +396,7 @@ abstract class Entity extends Position{
} }
$this->boundingBox->setBounds($pos->x - $radius, $pos->y, $pos->z - $radius, $pos->x + $radius, $pos->y + $this->height, $pos->z + $radius); $this->boundingBox->setBounds($pos->x - $radius, $pos->y, $pos->z - $radius, $pos->x + $radius, $pos->y + $this->height, $pos->z + $radius);
if($this instanceof HumanEntity){ $this->scheduleUpdate();
$pk = new MovePlayerPacket;
$pk->eid = $this->id;
$pk->x = $this->x;
$pk->y = $this->y;
$pk->z = $this->z;
$pk->yaw = $this->yaw;
$pk->pitch = $this->pitch;
$pk->bodyYaw = $this->yaw;
}else{
$pk = new MoveEntityPacket_PosRot;
$pk->eid = $this->id;
$pk->x = $this->x;
$pk->y = $this->y;
$pk->z = $this->z;
$pk->yaw = $this->yaw;
$pk->pitch = $this->pitch;
}
foreach($this->hasSpawned as $p){
$p->dataPacket(clone $pk);
}
return true; return true;
} }
@ -377,6 +411,7 @@ abstract class Entity extends Position{
$this->motionX = $motion->x; $this->motionX = $motion->x;
$this->motionY = $motion->y; $this->motionY = $motion->y;
$this->motionZ = $motion->z; $this->motionZ = $motion->z;
$this->scheduleUpdate();
} }
public function isOnGround(){ public function isOnGround(){

13
src/entity/HumanEntity.php
View File

@ -48,16 +48,13 @@ class HumanEntity extends CreatureEntity implements ProjectileSourceEntity{
$pk->unknown2 = 0; $pk->unknown2 = 0;
$pk->metadata = $this->getMetadata(); $pk->metadata = $this->getMetadata();
$player->dataPacket($pk); $player->dataPacket($pk);
/*
$pk = new SetEntityMotionPacket; $pk = new SetEntityMotionPacket;
$pk->eid = $this->id; $pk->eid = $this->id;
$pk->speedX = $this->velocity->x; $pk->speedX = $this->motionX;
$pk->speedY = $this->velocity->y; $pk->speedY = $this->motionY;
$pk->speedZ = $this->velocity->z; $pk->speedZ = $this->motionZ;
$player->dataPacket($pk);*/ $player->dataPacket($pk);
//$this->sendMotion($player);
/* /*
$pk = new PlayerEquipmentPacket; $pk = new PlayerEquipmentPacket;