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

Merge branch 'master' into 0.10

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-10-18 16:54:03 +02:00
commit 4c0daa462d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/Skeleton.php
View File

@ -25,6 +25,6 @@ use pocketmine\nbt\tag\String;
class Skeleton extends Monster implements ProjectileSource{
protected function initEntity(){
$this->namedtag->id = new String("id", "Chicken");
$this->namedtag->id = new String("id", "Skeleton");
}
}
}

4
src/pocketmine/inventory/BaseInventory.php
View File

@ -388,8 +388,6 @@ abstract class BaseInventory implements Inventory{
for($i = 0; $i < $this->getSize(); ++$i){
$pk->slots[$i] = $this->getItem($i);
}
$pk->isEncoded = true;
$pk->encode();
foreach($target as $player){
if(($id = $player->getWindowId($this)) === -1 or $player->spawned !== true){
@ -413,8 +411,6 @@ abstract class BaseInventory implements Inventory{
$pk = new ContainerSetSlotPacket;
$pk->slot = $index;
$pk->item = clone $this->getItem($index);
$pk->encode();
$pk->isEncoded = true;
foreach($target as $player){
if(($id = $player->getWindowId($this)) === -1){