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

Merged master into php7 to support 0.13.1

Browse Source
This commit is contained in:
Intyre
2016-01-22 17:36:45 +01:00
parent cf3d8f449e ee0d4aa124
commit a2734f6dc0
117 changed files with 2732 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/utils/Utils.php
View File

@ -84,7 +84,7 @@ class Utils{
if(file_exists("/etc/machine-id")){
$machine .= file_get_contents("/etc/machine-id");
}else{
@exec("ifconfig", $mac);
@exec("ifconfig 2>/dev/null", $mac);
$mac = implode("\n", $mac);
if(preg_match_all("#HWaddr[ \t]{1,}([0-9a-f:]{17})#", $mac, $matches)){
foreach($matches[1] as $i => $v){