Fix formatting issues due to bad IDE settings

This commit is contained in:
Shoghi Cervantes
2014-12-07 16:30:04 +01:00
parent bb82e7be50
commit 747f7685e7
191 changed files with 1315 additions and 1304 deletions

View File

@ -136,7 +136,7 @@ class MainLogger extends \AttachableThreadedLogger{
$errstr = substr($errstr, 0, $pos);
}
$errfile = \pocketmine\cleanPath($errfile);
$this->log($type, get_class($e).": \"$errstr\" ($errno) in \"$errfile\" at line $errline");
$this->log($type, get_class($e) . ": \"$errstr\" ($errno) in \"$errfile\" at line $errline");
foreach(($trace = @\pocketmine\getTrace($trace === null ? 4 : 0, $trace)) as $i => $line){
$this->debug($line);

View File

@ -59,7 +59,7 @@ class Utils{
*/
public static function getUniqueID($raw = false, $extra = ""){
$machine = php_uname("a");
$machine .= file_exists("/proc/cpuinfo") ? implode(preg_grep("/model name/", file("/proc/cpuinfo"))): "";
$machine .= file_exists("/proc/cpuinfo") ? implode(preg_grep("/model name/", file("/proc/cpuinfo"))) : "";
$machine .= sys_get_temp_dir();
$machine .= $extra;
$os = Utils::getOS();