mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-07-11 04:17:48 +00:00
Merge branch 'stable' into next-minor
This commit is contained in:
commit
c237ff538c
@ -291,7 +291,7 @@ class CrashDump{
|
|||||||
|
|
||||||
private function determinePluginFromFile(string $filePath, bool $crashFrame) : bool{
|
private function determinePluginFromFile(string $filePath, bool $crashFrame) : bool{
|
||||||
$frameCleanPath = Utils::cleanPath($filePath); //this will be empty in phar stub
|
$frameCleanPath = Utils::cleanPath($filePath); //this will be empty in phar stub
|
||||||
if($frameCleanPath !== "" and strpos($frameCleanPath, "src/pocketmine/") === false and strpos($frameCleanPath, "vendor/pocketmine/") === false and file_exists($filePath)){
|
if(strpos($frameCleanPath, "plugins") === 0 and file_exists($filePath)){
|
||||||
$this->addLine();
|
$this->addLine();
|
||||||
if($crashFrame){
|
if($crashFrame){
|
||||||
$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
|
$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
|
||||||
|
@ -822,11 +822,11 @@ class Level implements ChunkManager, Metadatable{
|
|||||||
while($this->scheduledBlockUpdateQueue->count() > 0 and $this->scheduledBlockUpdateQueue->current()["priority"] <= $currentTick){
|
while($this->scheduledBlockUpdateQueue->count() > 0 and $this->scheduledBlockUpdateQueue->current()["priority"] <= $currentTick){
|
||||||
/** @var Vector3 $vec */
|
/** @var Vector3 $vec */
|
||||||
$vec = $this->scheduledBlockUpdateQueue->extract()["data"];
|
$vec = $this->scheduledBlockUpdateQueue->extract()["data"];
|
||||||
|
unset($this->scheduledBlockUpdateQueueIndex[Level::blockHash($vec->x, $vec->y, $vec->z)]);
|
||||||
if(!$this->isInLoadedTerrain($vec)){
|
if(!$this->isInLoadedTerrain($vec)){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$block = $this->getBlock($vec);
|
$block = $this->getBlock($vec);
|
||||||
unset($this->scheduledBlockUpdateQueueIndex[Level::blockHash($block->x, $block->y, $block->z)]);
|
|
||||||
$block->onScheduledUpdate();
|
$block->onScheduledUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user