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

Merge branch 'next-minor'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-11-29 12:06:27 +00:00
parent 8ee3d4486a 4cfceeeb8e
commit 994781494f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -25,6 +25,7 @@
## Donate ## Donate
- Bitcoin Cash (BCH): `qq3r46hn6ljnhnqnfwxt5pg3g447eq9jhvw5ddfear` - Bitcoin Cash (BCH): `qq3r46hn6ljnhnqnfwxt5pg3g447eq9jhvw5ddfear`
- Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV` - Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV`
- Stellar Lumens (XLM): `GAAC5WZ33HCTE3BFJFZJXONMEIBNHFLBXM2HJVAZHXXPYA3HP5XPPS7T`
- [Patreon](https://www.patreon.com/pocketminemp) - [Patreon](https://www.patreon.com/pocketminemp)
## Licensing information ## Licensing information

4
build/make-release.php
View File

@ -76,6 +76,6 @@ system('git tag ' . $currentVer->getBaseVersion());
replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true); replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true);
system('git add "' . $versionInfoPath . '"'); system('git add "' . $versionInfoPath . '"');
system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"'); system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"');
echo "pushing changes in 10 seconds\n"; echo "pushing changes in 5 seconds\n";
sleep(10); sleep(5);
system('git push origin HEAD ' . $currentVer->getBaseVersion()); system('git push origin HEAD ' . $currentVer->getBaseVersion());

2
src/network/mcpe/protocol/DataPacket.php
View File

@ -106,7 +106,7 @@ abstract class DataPacket extends NetworkBinaryStream implements Packet{
public function __debugInfo(){ public function __debugInfo(){
$data = []; $data = [];
foreach($this as $k => $v){ foreach((array) $this as $k => $v){
if($k === "buffer" and is_string($v)){ if($k === "buffer" and is_string($v)){
$data[$k] = bin2hex($v); $data[$k] = bin2hex($v);
}elseif(is_string($v) or (is_object($v) and method_exists($v, "__toString"))){ }elseif(is_string($v) or (is_object($v) and method_exists($v, "__toString"))){