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

Merge branch 'PEMapModder-patch-19'

Browse Source
This commit is contained in:
Intyre 2015-12-20 00:31:04 +01:00
commit b83964e527
No known key found for this signature in database
GPG Key ID: B06D41D26935005A
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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