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

Added Inventory interfaces and types, updated long array() to []

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-05-22 18:59:16 +02:00
parent 0be679c9d5
commit 6cbd39de9b
102 changed files with 637 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,17 +53,17 @@ abstract class Entity extends Position implements Metadatable{
/**
* @var Entity[]
*/
public static $list = array();
public static $list = [];
/**
* @var Entity[]
*/
public static $needUpdate = array();
public static $needUpdate = [];
/**
* @var Player[]
*/
protected $hasSpawned = array();
protected $hasSpawned = [];
protected $id;
@@ -424,7 +424,7 @@ abstract class Entity extends Position implements Metadatable{
$this->setLevel($targetLevel, true); //Hard reference
$this->getLevel()->entities[$this->id] = $this; //Oops, TODO!!
if($this instanceof Player){
$this->chunksLoaded = array();
$this->chunksLoaded = [];
$pk = new SetTimePacket();
$pk->time = $this->getLevel()->getTime();
$pk->started = $this->getLevel()->stopTime == false;

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

@@ -42,10 +42,10 @@ use pocketmine\Server;
class Human extends Creature implements ProjectileSource, InventorySource{
protected $nameTag = "TESTIFICATE";
protected $inventory = array();
protected $inventory = [];
public $slot;
protected $hotbar = array();
protected $armor = array();
protected $hotbar = [];
protected $armor = [];
protected function initEntity(){
if(isset($this->namedtag->NameTag)){
@@ -76,7 +76,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{
public function saveNBT(){
parent::saveNBT();
$this->namedtag->Inventory = new Enum("Inventory", array());
$this->namedtag->Inventory = new Enum("Inventory", []);
$this->namedtag->Inventory->setTagType(NBT::TAG_Compound);
for($slot = 0; $slot < 9; ++$slot){
if(isset($this->hotbar[$slot]) and $this->hotbar[$slot] !== -1){
@@ -240,7 +240,7 @@ class Human extends Creature implements ProjectileSource, InventorySource{
}
public function sendArmor($player = null){
$slots = array();
$slots = [];
for($i = 0; $i < 4; ++$i){
if(isset($this->armor[$i]) and ($this->armor[$i] instanceof Item) and $this->armor[$i]->getID() > Item::AIR){
$slots[$i] = $this->armor[$i]->getID() !== Item::AIR ? $this->armor[$i]->getID() - 256 : 0;