no kb if entity is dead + Utils::getUniqueID change

This commit is contained in:
kotyara 2023-02-26 16:47:40 +05:00
parent b1025aa4a3
commit a3711cfded
2 changed files with 19 additions and 4 deletions

View file

@ -1434,6 +1434,9 @@ class Entity extends Position
public function knockBack($d, $d1)
{
if($this->closed || $this->dead){
return false;
}
$f = sqrt($d * $d + $d1 * $d1);
$f1 = 0.4;
$this->speedX /= 2;

View file

@ -99,13 +99,14 @@ class Utils{
public static function getUniqueID($raw = false, $extra = ""){
$machine = php_uname("a");
$machine .= file_exists("/proc/cpuinfo") ? file_get_contents("/proc/cpuinfo") : "";
$machine .= file_exists("/proc/cpuinfo") ? `cat /proc/cpuinfo | grep "model name"` : "";
$machine .= sys_get_temp_dir();
$machine .= $extra;
if(Utils::getOS() == "win"){
exec("ipconfig /ALL", $mac);
$os = Utils::getOS();
if($os === "win"){
@exec("ipconfig /ALL", $mac);
$mac = implode("\n", $mac);
if(preg_match_all("#Physical Address[. ]{1,}: ([0-9A-F\-]{17})#", $mac, $matches)){
if(preg_match_all("#Physical Address[. ]{1,}: ([0-9A-F\\-]{17})#", $mac, $matches)){
foreach($matches[1] as $i => $v){
if($v == "00-00-00-00-00-00"){
unset($matches[1][$i]);
@ -113,6 +114,17 @@ class Utils{
}
$machine .= implode(" ", $matches[1]); //Mac Addresses
}
}elseif($os === "linux"){
@exec("ifconfig", $mac);
$mac = implode("\n", $mac);
if(preg_match_all("#HWaddr[ \t]{1,}([0-9a-f:]{17})#", $mac, $matches)){
foreach($matches[1] as $i => $v){
if($v == "00:00:00:00:00:00"){
unset($matches[1][$i]);
}
}
$machine .= implode(" ", $matches[1]); //Mac Addresses
}
}
$data = $machine . PHP_MAXPATHLEN;
$data .= PHP_INT_MAX;