mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-09-03 08:35:20 +00:00
Merge remote-tracking branch 'origin/stable'
# Conflicts: # composer.json # composer.lock # resources/vanilla # src/CrashDump.php # src/PocketMine.php # src/pocketmine/Server.php # src/pocketmine/item/Bucket.php # src/pocketmine/item/Item.php # src/pocketmine/level/format/Chunk.php # src/pocketmine/level/format/io/leveldb/LevelDB.php # src/pocketmine/level/format/io/region/McRegion.php # src/pocketmine/network/mcpe/protocol/BatchPacket.php # src/pocketmine/tile/Furnace.php # src/pocketmine/utils/UUID.php # src/utils/ServerKiller.php
This commit is contained in:
@ -87,7 +87,7 @@ trait EnumTrait{
|
||||
}
|
||||
$this->enumName = $enumName;
|
||||
if(self::$nextId === null){
|
||||
self::$nextId = getmypid(); //this provides enough base entropy to prevent hardcoding
|
||||
self::$nextId = Process::pid(); //this provides enough base entropy to prevent hardcoding
|
||||
}
|
||||
$this->runtimeId = self::$nextId++;
|
||||
}
|
||||
|
Reference in New Issue
Block a user