mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 11:39:43 +00:00
fixes x2
This commit is contained in:
parent
b30cdd3b2f
commit
5f11abae12
1 changed files with 0 additions and 3 deletions
|
|
@ -39,7 +39,6 @@ class Utils{
|
|||
return $id;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
public static function getSign($v){
|
||||
return $v > 0 ? 1 : ($v < 0 ? -1 : 0);
|
||||
}
|
||||
|
|
@ -48,8 +47,6 @@ class Utils{
|
|||
return floor(($v % 360 + 360) % 360);
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> 1042e025 (look player achievements, moved method cmdWhitelist to ConsoleAPI(marked as deprecated in BanAPI to avoid losing compability with old pmmp plugins))
|
||||
public static function hasEmoji($s){
|
||||
return preg_match(Utils::emojiRegex, $s);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue