mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-21 12:09:43 +00:00
entity data packets are sent as ordered reliable packets in entity queue, explosions dont send what blocks they exploded in ExplosionPacket
This commit is contained in:
parent
d4036d8ac9
commit
37e2919f46
14 changed files with 166 additions and 136 deletions
|
|
@ -57,9 +57,6 @@ abstract class Creature extends Living{
|
|||
return 0;
|
||||
}
|
||||
public function spawn($player){
|
||||
if(!($player instanceof Player)){
|
||||
$player = $this->server->api->player->get($player);
|
||||
}
|
||||
if($player->eid === $this->eid or $this->closed !== false or ($player->level !== $this->level and $this->class !== ENTITY_PLAYER)){
|
||||
return false;
|
||||
}
|
||||
|
|
@ -72,18 +69,19 @@ abstract class Creature extends Living{
|
|||
$pk->yaw = $this->yaw;
|
||||
$pk->pitch = $this->pitch;
|
||||
$pk->metadata = $this->getMetadata();
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
|
||||
$pk = new SetEntityMotionPacket;
|
||||
$pk->eid = $this->eid;
|
||||
$pk->speedX = $this->speedX;
|
||||
$pk->speedY = $this->speedY;
|
||||
$pk->speedZ = $this->speedZ;
|
||||
$player->dataPacket($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
|
||||
if($this->linkedEntity != 0 && $this->isRider){
|
||||
$player->eventHandler(["rider" => $this->eid, "riding" => $this->linkedEntity, "type" => 0], "entity.link");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1132,11 +1132,12 @@ class Entity extends Position
|
|||
$this->server->api->dhandle("entity.metadata", $this);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Player $player
|
||||
* @return boolean
|
||||
*/
|
||||
public function spawn($player)
|
||||
{
|
||||
if(! ($player instanceof Player)){
|
||||
$player = $this->server->api->player->get($player);
|
||||
}
|
||||
if($player->eid === $this->eid or $this->closed !== false or ($player->level !== $this->level and $this->class !== ENTITY_PLAYER)){
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1160,14 +1161,14 @@ class Entity extends Position
|
|||
$pk->itemID = 0;
|
||||
$pk->itemAuxValue = 0;
|
||||
$pk->metadata = $this->getMetadata();
|
||||
$player->dataPacketAlwaysRecover($pk, 2, true);
|
||||
$player->entityQueueDataPacket($pk, 2, true);
|
||||
|
||||
$pk = new PlayerEquipmentPacket();
|
||||
$pk->eid = $this->eid;
|
||||
$pk->item = $this->player->getSlot($this->player->slot)->getID();
|
||||
$pk->meta = $this->player->getSlot($this->player->slot)->getMetadata();
|
||||
$pk->slot = 0;
|
||||
$player->dataPacket($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
$this->player->sendArmor($player);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1600,9 +1601,9 @@ class Entity extends Position
|
|||
if(($p->entity instanceof Entity) && $p->entity->eid == $this->eid){
|
||||
$pk2 = clone $pk;
|
||||
$pk2->eid = 0;
|
||||
$p->dataPacket($pk2);
|
||||
$p->entityQueueDataPacket($pk2);
|
||||
}else{
|
||||
$p->dataPacket(clone $pk);
|
||||
$p->entityQueueDataPacket(clone $pk);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1610,7 +1611,7 @@ class Entity extends Position
|
|||
if($this->player instanceof Player){
|
||||
$pk = new SetHealthPacket();
|
||||
$pk->health = $this->health;
|
||||
$this->player->dataPacket($pk);
|
||||
$this->player->entityQueueDataPacket($pk);
|
||||
}
|
||||
if($this->health <= 0 and $this->dead === false){
|
||||
$this->makeDead($cause);
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ abstract class Projectile extends Entity{
|
|||
|
||||
return $data;
|
||||
}
|
||||
|
||||
public function spawn($player)
|
||||
{
|
||||
$pk = new AddEntityPacket();
|
||||
|
|
@ -210,7 +211,8 @@ abstract class Projectile extends Entity{
|
|||
$pk->speedY = $this->speedY;
|
||||
$pk->speedZ = $this->speedZ;
|
||||
$pk->did = 0;
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -272,7 +272,7 @@ class Arrow extends Entity{
|
|||
$pk->speedX = $this->speedX;
|
||||
$pk->speedY = $this->speedY;
|
||||
$pk->speedZ = $this->speedZ;
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class FallingSand extends Entity{
|
|||
$pk->speedY = $this->speedY;
|
||||
$pk->speedZ = $this->speedZ;
|
||||
$pk->did = -$this->data["Tile"];
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
}
|
||||
|
||||
public function update($now){
|
||||
|
|
|
|||
|
|
@ -54,14 +54,14 @@ class ItemEntity extends Entity{
|
|||
$pk->roll = 0;
|
||||
$pk->item = BlockAPI::getItem($this->itemID, $this->meta, $this->stack);
|
||||
$pk->metadata = $this->getMetadata();
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
|
||||
$pk = new SetEntityMotionPacket();
|
||||
$pk->eid = $this->eid;
|
||||
$pk->speedX = $this->speedX;
|
||||
$pk->speedY = $this->speedY;
|
||||
$pk->speedZ = $this->speedZ;
|
||||
$player->dataPacket($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -435,14 +435,14 @@ class Minecart extends Vehicle{
|
|||
$pk->z = $this->z;
|
||||
$pk->yaw = $this->yaw;
|
||||
$pk->pitch = $this->pitch;
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
|
||||
$pk = new SetEntityMotionPacket;
|
||||
$pk->eid = $this->eid;
|
||||
$pk->speedX = $this->speedX;
|
||||
$pk->speedY = $this->speedY;
|
||||
$pk->speedZ = $this->speedZ;
|
||||
$player->dataPacket($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
}
|
||||
|
||||
public function interactWith(Entity $e, $action){
|
||||
|
|
|
|||
|
|
@ -205,6 +205,6 @@ class Painting extends Entity{
|
|||
$pk->z = (int) $this->zPos;
|
||||
$pk->direction = $this->direction;
|
||||
$pk->title = $this->motive;
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,6 +76,6 @@ class PrimedTNT extends Entity{
|
|||
$pk->speedX = $this->speedX;
|
||||
$pk->speedY = $this->speedY;
|
||||
$pk->speedZ = $this->speedZ;
|
||||
$player->dataPacketAlwaysRecover($pk);
|
||||
$player->entityQueueDataPacket($pk);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue