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:
Dylan K. Taylor
2020-12-20 20:54:13 +00:00
18 changed files with 221 additions and 127 deletions

View File

@ -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++;
}