mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-16 02:38:54 +00:00
Code Issues Projects Releases Wiki Activity

Fixed binary reading/writing of longs

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-04-07 21:54:23 +02:00
parent 669401afd4
commit 8d14c98da9
2 changed files with 21 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/build/compile.sh
View File

@ -3,7 +3,7 @@ PHP_VERSION="5.5.11"
ZEND_VM="GOTO" ZEND_VM="GOTO"
ZLIB_VERSION="1.2.8" ZLIB_VERSION="1.2.8"
OPENSSL_VERSION="1.0.0l" OPENSSL_VERSION="1.0.1g"
CURL_VERSION="curl-7_36_0" CURL_VERSION="curl-7_36_0"
READLINE_VERSION="6.3" READLINE_VERSION="6.3"
NCURSES_VERSION="5.9" NCURSES_VERSION="5.9"

114
src/pocketmine/utils/Binary.php
View File

@ -24,9 +24,6 @@
*/ */
namespace pocketmine\utils; namespace pocketmine\utils;
use pocketmine\item\Item;
/** /**
* WARNING: This class is available on the PocketMine-MP Zephir project. * WARNING: This class is available on the PocketMine-MP Zephir project.
* If this class is modified, remember to modify the PHP C extension. * If this class is modified, remember to modify the PHP C extension.
@ -94,9 +91,9 @@ class Binary{
$m .= self::writeLShort($d[1][2]); $m .= self::writeLShort($d[1][2]);
break; break;
case 6: case 6:
for($i = 0; $i < 3; ++$i){ $m .= self::writeLInt($d[1][0]);
$m .= self::writeLInt($d[1][$i]); $m .= self::writeLInt($d[1][1]);
} $m .= self::writeLInt($d[1][2]);
break; break;
} }
} }
@ -105,36 +102,6 @@ class Binary{
return $m; return $m;
} }
/**
* Writes a Item to binary (short id, byte Count, short Damage)
*
* @param Item $item
*
* @return string
*/
public static function writeSlot(Item $item){
return self::writeShort($item->getID()) . chr($item->getCount()) . self::writeShort($item->getMetadata());
}
/**
* Reads a binary Item, returns an Item object
*
* @param object $ob
*
* @return Item
*/
public static function readSlot($ob){
$id = self::readShort($ob->get(2));
$cnt = ord($ob->get(1));
return Item::get(
$id,
self::readShort($ob->get(2)),
$cnt
);
}
/** /**
* Reads a metadata coded string * Reads a metadata coded string
* TODO: Change * TODO: Change
@ -204,30 +171,6 @@ class Binary{
return $m; return $m;
} }
public static function readDataArray($str, $len = 10, &$offset = null){
$data = array();
$offset = 0;
for($i = 1; $i <= $len and isset($str{$offset}); ++$i){
$l = self::readTriad(substr($str, $offset, 3));
$offset += 3;
$data[] = substr($str, $offset, $l);
$offset += $l;
}
return $data;
}
public static function writeDataArray($data){
$raw = "";
foreach($data as $v){
$raw .= self::writeTriad(strlen($v));
$raw .= $v;
}
return $raw;
}
/** /**
* Reads a byte boolean * Reads a byte boolean
* *
@ -253,7 +196,7 @@ class Binary{
/** /**
* Reads an unsigned/signed byte * Reads an unsigned/signed byte
* *
* @param $c * @param string $c
* @param bool $signed * @param bool $signed
* *
* @return int * @return int
@ -272,12 +215,9 @@ class Binary{
* *
* @param $c * @param $c
* *
* @return bool|string * @return string
*/ */
public static function writeByte($c){ public static function writeByte($c){
if($c > 0xff){
return false;
}
if($c < 0 and $c >= -0x80){ if($c < 0 and $c >= -0x80){
$c = 0xff + $c + 1; $c = 0xff + $c + 1;
} }
@ -396,7 +336,7 @@ class Binary{
} }
public static function printFloat($value){ public static function printFloat($value){
return preg_replace("/(\.\d+?)0+$/", "$1", sprintf("%F", $value)); return preg_replace("/(\\.\\d+?)0+$/", "$1", sprintf("%F", $value));
} }
public static function readDouble($str){ public static function readDouble($str){
@ -421,44 +361,30 @@ class Binary{
public static function readLong($x, $signed = true){ public static function readLong($x, $signed = true){
$value = "0"; $value = "0";
if($signed === true){ for($i = 0; $i < 8; $i += 2){
$negative = ((ord($x{0}) & 0x80) === 0x80) ? true : false; $value = bcmul($value, "65536", 0);
if($negative){ $value = bcadd($value, self::readShort(substr($x, $i, 2), false), 0);
$x = ~$x;
}
}else{
$negative = false;
} }
for($i = 0; $i < 8; $i += 4){ if($signed === true and bccomp($value, "9223372036854775807") == 1){
$value = bcmul($value, "4294967296", 0); //4294967296 == 2^32 $value = bcadd($value, "-18446744073709551616");
$value = bcadd($value, 0x1000000 * ord(@$x{$i}) + ((ord(@$x{$i + 1}) << 16) | (ord(@$x{$i + 2}) << 8) | ord(@$x{$i + 3})), 0);
} }
return ($negative === true ? "-" . $value : $value); return $value;
} }
public static function writeLong($value){ public static function writeLong($value){
$x = ""; $x = "";
if($value{0} === "-"){
$negative = true; if(bccomp($value, "0") == -1){
$value = bcadd($value, "1"); $value = bcadd($value, "18446744073709551616");
if($value{0} === "-"){
$value = substr($value, 1);
}
}else{
$negative = false;
}
while(bccomp($value, "0", 0) > 0){
$temp = bcmod($value, "16777216");
$x = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $x;
$value = bcdiv($value, "16777216", 0);
}
$x = str_pad(substr($x, 0, 8), 8, "\x00", STR_PAD_LEFT);
if($negative === true){
$x = ~$x;
} }
$x .= self::writeShort(bcmod(bcdiv($value, "281474976710656"), "65536"));
$x .= self::writeShort(bcmod(bcdiv($value, "4294967296"), "65536"));
$x .= self::writeShort(bcmod(bcdiv($value, "65536"), "65536"));
$x .= self::writeShort(bcmod($value, "65536"));
return $x; return $x;
} }