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

Merge remote-tracking branch 'origin/mcpe-0.12' into php7

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-09-27 14:31:28 +02:00
parent 606948ef8e a7e5e33db8
commit f560d07c97
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/Player.php
View File

@ -1836,7 +1836,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
break;
}
if(strlen($packet->skin) !== 64 * 32 * 4 and strlen($packet->skin) !== 64 * 64 * 4){
$this->close("", "disconnectionScreen.invalidSkin");
break;
@ -2692,7 +2692,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
break;
}
$this->server->getPluginManager()->callEvent($ev = new CraftItemEvent($ingredients, $recipe));
$this->server->getPluginManager()->callEvent($ev = new CraftItemEvent($this, $ingredients, $recipe));
if($ev->isCancelled()){
$this->inventory->sendContents($this);
@ -2958,7 +2958,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
}
$this->dataPacket($pk);
}
public function sendPopup($message, $subtitle = ""){
$pk = new TextPacket();
$pk->type = TextPacket::TYPE_POPUP;
@ -2990,7 +2990,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$pk->message = $reason;
$this->directDataPacket($pk);
}
$this->connected = false;
if(strlen($this->getName()) > 0){
$this->server->getPluginManager()->callEvent($ev = new PlayerQuitEvent($this, $message, true));