mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +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-12 01:03:09 +02:00
parent 922e9d93d5 a1a1327415
commit 29a5012c02
7 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/utils/BinaryStream.php
View File

@ -105,14 +105,22 @@ class BinaryStream extends \stdClass{
$this->buffer .= Binary::writeLInt($v);
}
public function getShort($signed = true){
return $signed ? Binary::readSignedShort($this->get(2)) : Binary::readShort($this->get(2));
public function getSignedShort(){
return Binary::readSignedShort($this->get(2));
}
public function putShort($v){
$this->buffer .= Binary::writeShort($v);
}
public function getShort(){
return Binary::readShort($this->get(2));
}
public function putSignedShort($v){
$this->buffer .= Binary::writeShort($v);
}
public function getFloat(){
return Binary::readFloat($this->get(4));
}
@ -188,7 +196,7 @@ class BinaryStream extends \stdClass{
}
public function getSlot(){
$id = $this->getShort(true);
$id = $this->getSignedShort();
if($id <= 0){
return Item::get(0, 0, 0);

4
src/pocketmine/utils/ServerKiller.php
View File

@ -33,11 +33,11 @@ class ServerKiller extends Thread{
public function run(){
sleep($this->time);
echo "\nTook to long to stop, server was killed forcefully!\n";
echo "\nTook too long to stop, server was killed forcefully!\n";
@\pocketmine\kill(getmypid());
}
public function getThreadName(){
return "Server Killer";
}
}
}