mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-22 12:39:43 +00:00
paintings are separated from Entity.php, removed Moved too Quickly warning, small fixes with commands
This commit is contained in:
parent
218dd4ffa4
commit
af79b29f26
7 changed files with 49 additions and 28 deletions
|
|
@ -1520,16 +1520,7 @@ class Player{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$speed = $this->entity->getSpeedMeasure();
|
$speed = $this->entity->getSpeedMeasure();
|
||||||
if($this->blocked === true or ($this->server->api->getProperty("allow-flight") !== true and (($speed > 9 and ($this->gamemode & 0x01) === 0x00) or $speed > 20 or $this->entity->distance($newPos) > 7)) or $this->server->api->handle("player.move", $this->entity) === false){
|
$this->entity->setPosition($newPos, $packet->yaw, $packet->pitch);
|
||||||
if($this->lastCorrect instanceof Vector3){
|
|
||||||
$this->teleport($this->lastCorrect, $this->entity->yaw, $this->entity->pitch, false);
|
|
||||||
}
|
|
||||||
if($this->blocked !== true){
|
|
||||||
console("[WARNING] ".$this->username." moved too quickly!");
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
$this->entity->setPosition($newPos, $packet->yaw, $packet->pitch);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ProtocolInfo::PLAYER_EQUIPMENT_PACKET:
|
case ProtocolInfo::PLAYER_EQUIPMENT_PACKET:
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?php
|
||||||
|
//Useless Interface
|
||||||
|
interface Attachable{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -124,9 +124,7 @@ class Entity extends Position{
|
||||||
$this->setHealth(1, "generic");
|
$this->setHealth(1, "generic");
|
||||||
//$this->setName((isset($objects[$this->type]) ? $objects[$this->type]:$this->type));
|
//$this->setName((isset($objects[$this->type]) ? $objects[$this->type]:$this->type));
|
||||||
$this->size = 1;
|
$this->size = 1;
|
||||||
if($this->type === OBJECT_PAINTING){
|
if($this->type === OBJECT_SNOWBALL){
|
||||||
$this->isStatic = true;
|
|
||||||
}elseif($this->type === OBJECT_SNOWBALL){
|
|
||||||
$this->server->schedule(1210, array($this, "update")); //Despawn
|
$this->server->schedule(1210, array($this, "update")); //Despawn
|
||||||
$this->update();
|
$this->update();
|
||||||
}elseif($this->type == OBJECT_MINECART){
|
}elseif($this->type == OBJECT_MINECART){
|
||||||
|
|
@ -161,10 +159,6 @@ class Entity extends Position{
|
||||||
return $inv;
|
return $inv;
|
||||||
}elseif($this->class === ENTITY_OBJECT){
|
}elseif($this->class === ENTITY_OBJECT){
|
||||||
switch($this->type){
|
switch($this->type){
|
||||||
case OBJECT_PAINTING:
|
|
||||||
return array(
|
|
||||||
array(PAINTING, 0, 1),
|
|
||||||
);
|
|
||||||
case OBJECT_MINECART:
|
case OBJECT_MINECART:
|
||||||
return array(
|
return array(
|
||||||
array(MINECART, 0, 1),
|
array(MINECART, 0, 1),
|
||||||
|
|
@ -672,16 +666,7 @@ class Entity extends Position{
|
||||||
$player->dataPacket($pk);
|
$player->dataPacket($pk);
|
||||||
break;
|
break;
|
||||||
case ENTITY_OBJECT:
|
case ENTITY_OBJECT:
|
||||||
if($this->type === OBJECT_PAINTING){
|
if($this->type === OBJECT_MINECART){
|
||||||
$pk = new AddPaintingPacket;
|
|
||||||
$pk->eid = $this->eid;
|
|
||||||
$pk->x = (int) $this->x;
|
|
||||||
$pk->y = (int) $this->y;
|
|
||||||
$pk->z = (int) $this->z;
|
|
||||||
$pk->direction = $this->getDirection();
|
|
||||||
$pk->title = $this->data["Motive"];
|
|
||||||
$player->dataPacket($pk);
|
|
||||||
}elseif($this->type === OBJECT_MINECART){
|
|
||||||
$pk = new AddEntityPacket;
|
$pk = new AddEntityPacket;
|
||||||
$pk->eid = $this->eid;
|
$pk->eid = $this->eid;
|
||||||
$pk->type = $this->type;
|
$pk->type = $this->type;
|
||||||
|
|
@ -698,7 +683,6 @@ class Entity extends Position{
|
||||||
$pk->speedY = $this->speedY;
|
$pk->speedY = $this->speedY;
|
||||||
$pk->speedZ = $this->speedZ;
|
$pk->speedZ = $this->speedZ;
|
||||||
$player->dataPacket($pk);
|
$player->dataPacket($pk);
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ENTITY_FALLING:
|
case ENTITY_FALLING:
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ class EntityRegistry{
|
||||||
self::registerEntity(Zombie::class);
|
self::registerEntity(Zombie::class);
|
||||||
self::registerEntity(Arrow::class);
|
self::registerEntity(Arrow::class);
|
||||||
self::registerEntity(PrimedTNT::class);
|
self::registerEntity(PrimedTNT::class);
|
||||||
|
self::registerEntity(Painting::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*Register an Entity*/
|
/*Register an Entity*/
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?php
|
||||||
|
//Useless Class(or not so usless =D?)
|
||||||
|
abstract class Hanging extends Entity implements Attachable{
|
||||||
|
const CLASS_TYPE = ENTITY_OBJECT;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
class Painting extends Hanging{
|
||||||
|
const TYPE = OBJECT_PAINTING;
|
||||||
|
public function __construct(Level $level, $eid, $class, $type = 0, $data = array()){
|
||||||
|
parent::__construct($level, $eid, $class, $type, $data);
|
||||||
|
$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(1, "generic");
|
||||||
|
$this->size = 1;
|
||||||
|
$this->isStatic = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDrops(){
|
||||||
|
return array(array(PAINTING, 0, 1));
|
||||||
|
}
|
||||||
|
public function spawn($player){
|
||||||
|
$pk = new AddPaintingPacket;
|
||||||
|
$pk->eid = $this->eid;
|
||||||
|
$pk->x = (int) $this->x;
|
||||||
|
$pk->y = (int) $this->y;
|
||||||
|
$pk->z = (int) $this->z;
|
||||||
|
$pk->direction = $this->getDirection();
|
||||||
|
$pk->title = $this->data["Motive"];
|
||||||
|
$player->dataPacket($pk);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -20,10 +20,17 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class BucketItem extends Item{
|
class BucketItem extends Item{
|
||||||
|
private static $possiblenames = array(
|
||||||
|
0 => "Bucket",
|
||||||
|
1 => "Milk Bucket",
|
||||||
|
8 => "Water Bucket",
|
||||||
|
10 => "Lava Bucket"
|
||||||
|
);
|
||||||
public function __construct($meta = 0, $count = 1){
|
public function __construct($meta = 0, $count = 1){
|
||||||
parent::__construct(BUCKET, $meta, $count, "Bucket");
|
parent::__construct(BUCKET, $meta, $count, "Bucket");
|
||||||
$this->isActivable = true;
|
$this->isActivable = true;
|
||||||
$this->maxStackSize = 1;
|
$this->maxStackSize = 1;
|
||||||
|
$this->name = BucketItem::$possiblenames[$this->meta];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
|
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue