mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 23:29:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:PocketMine/PocketMine-MP

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-30 14:10:39 +02:00
commit f5fee4c909
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Server.php
View File

@ -749,7 +749,7 @@ class Server{
$name = strtolower($name); $name = strtolower($name);
$delta = PHP_INT_MAX; $delta = PHP_INT_MAX;
foreach($this->getOnlinePlayers() as $player){ foreach($this->getOnlinePlayers() as $player){
if(stripos($player->getName(), $name) !== false){ if(stripos($player->getName(), $name) === 0){
$curDelta = strlen($player->getName()) - strlen($name); $curDelta = strlen($player->getName()) - strlen($name);
if($curDelta < $delta){ if($curDelta < $delta){
$found = $player; $found = $player;
@ -1814,7 +1814,7 @@ class Server{
if(($data = json_decode($reply)) !== false and isset($data->crashId)){ if(($data = json_decode($reply)) !== false and isset($data->crashId)){
$reportId = $data->crashId; $reportId = $data->crashId;
$reportUrl = $data->crashUrl; $reportUrl = $data->crashUrl;
$this->logger->emergency("The crash dump has ben automatically submitted to the Crash Archive. You can view it on $reportUrl or use the ID #$reportId."); $this->logger->emergency("The crash dump has been automatically submitted to the Crash Archive. You can view it on $reportUrl or use the ID #$reportId.");
} }
} }

2
start.sh
View File

@ -24,7 +24,7 @@ done
if [ "$PHP_BINARY" == "" ]; then if [ "$PHP_BINARY" == "" ]; then
if [ -f ./bin/php5/bin/php ]; then if [ -f ./bin/php5/bin/php ]; then
PHP_BINARY="./bin/php5/bin/php" PHP_BINARY="./bin/php5/bin/php"
elif [ type php 2>/dev/null ]; then elif type php > /dev/null 2>&1 ; then
PHP_BINARY=$(type -p php) PHP_BINARY=$(type -p php)
else else
echo "Couldn't find a working PHP binary, please use the installer." echo "Couldn't find a working PHP binary, please use the installer."