Merge remote-tracking branch 'pmmp/minor-next' into stable

# Conflicts:
#	src/world/World.php

src/block/Block.php

@@ -348,17 +348,13 @@ public function generateStatePermutations() : \Generator{
 
  /**
  * Called when this block is created, set, or has a neighbouring block update, to re-detect dynamic properties which
- * are not saved on the world.
- *
- * Clears any cached precomputed objects, such as bounding boxes. Remove any outdated precomputed things such as
- * AABBs and force recalculation.
+ * are not saved in the blockstate ID.
+ * If any such properties are updated, don't forget to clear things like AABB caches if necessary.
  *
  * A replacement block may be returned. This is useful if the block type changed due to reading of world data (e.g.
  * data from a block entity).
  */
  public function readStateFromWorld() : Block{
- $this->collisionBoxes = null;
-
  return $this;
  }
 
@@ -612,6 +608,7 @@ final public function getPosition() : Position{
  */
  final public function position(World $world, int $x, int $y, int $z) : void{
  $this->position = new Position($x, $y, $z, $world);
+ $this->collisionBoxes = null;
  }
 
  /**

src/block/Door.php

@@ -51,6 +51,8 @@ protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
  public function readStateFromWorld() : Block{
  parent::readStateFromWorld();
 
+ $this->collisionBoxes = null;
+
  //copy door properties from other half
  $other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
  if($other instanceof Door && $other->hasSameTypeId($this)){

src/block/Fence.php

@@ -40,6 +40,8 @@ public function getThickness() : float{
  public function readStateFromWorld() : Block{
  parent::readStateFromWorld();
 
+ $this->collisionBoxes = null;
+
  foreach(Facing::HORIZONTAL as $facing){
  $block = $this->getSide($facing);
  if($block instanceof static || $block instanceof FenceGate || $block->getSupportType(Facing::opposite($facing)) === SupportType::FULL){

src/block/Stair.php

@@ -49,6 +49,8 @@ protected function describeBlockOnlyState(RuntimeDataDescriber $w) : void{
  public function readStateFromWorld() : Block{
  parent::readStateFromWorld();
 
+ $this->collisionBoxes = null;
+
  $clockwise = Facing::rotateY($this->facing, true);
  if(($backFacing = $this->getPossibleCornerFacing(false)) !== null){
  $this->shape = $backFacing === $clockwise ? StairShape::OUTER_RIGHT : StairShape::OUTER_LEFT;

src/block/Thin.php

@@ -39,6 +39,8 @@ class Thin extends Transparent{
  public function readStateFromWorld() : Block{
  parent::readStateFromWorld();
 
+ $this->collisionBoxes = null;
+
  foreach(Facing::HORIZONTAL as $facing){
  $side = $this->getSide($facing);
  if($side instanceof Thin || $side instanceof Wall || $side->getSupportType(Facing::opposite($facing)) === SupportType::FULL){

src/player/Player.php

@@ -1219,7 +1219,7 @@ public function getXpDropAmount() : int{
  }
 
  protected function checkGroundState(float $wantedX, float $wantedY, float $wantedZ, float $dx, float $dy, float $dz) : void{
- if($this->isSpectator()){
+ if($this->gamemode === GameMode::SPECTATOR){
  $this->onGround = false;
  }else{
  $bb = clone $this->boundingBox;

src/world/World.php

@@ -1018,9 +1018,7 @@ protected function actuallyDoTick(int $currentTick) : void{
  $this->providerGarbageCollectionTicker = 0;
  }
 
- //Do block updates
  $this->timings->scheduledBlockUpdates->startTiming();
-
  //Delayed updates
  while($this->scheduledBlockUpdateQueue->count() > 0 && $this->scheduledBlockUpdateQueue->current()["priority"] <= $currentTick){
  /** @var Vector3 $vec */
@@ -1034,7 +1032,9 @@ protected function actuallyDoTick(int $currentTick) : void{
  $block->onScheduledUpdate();
  }
  }
+ $this->timings->scheduledBlockUpdates->stopTiming();
 
+ $this->timings->neighbourBlockUpdates->startTiming();
  //Normal updates
  while($this->neighbourBlockUpdateQueue->count() > 0){
  $index = $this->neighbourBlockUpdateQueue->dequeue();
@@ -1045,12 +1045,7 @@ protected function actuallyDoTick(int $currentTick) : void{
  }
 
  foreach([0, 1] as $layer){
- $block = $this->getBlockAtLayer($x, $y, $z, $layer);
- $replacement = $block->readStateFromWorld(); //for blocks like fences, force recalculation of connected AABBs
- if($replacement !== $block){
- $replacement->position($this, $x, $y, $z);
- $block = $replacement;
- }
+ $block = $this->getBlockAt($x, $y, $z);
 
  if(BlockUpdateEvent::hasHandlers()){
  $ev = new BlockUpdateEvent($block);
@@ -1066,7 +1061,7 @@ protected function actuallyDoTick(int $currentTick) : void{
  }
  }
 
- $this->timings->scheduledBlockUpdates->stopTiming();
+ $this->timings->neighbourBlockUpdates->stopTiming();
 
  $this->timings->entityTick->startTiming();
  //Update entities that need update

src/world/WorldTimings.php

@@ -34,6 +34,7 @@ class WorldTimings{
 
  public TimingsHandler $doChunkUnload;
  public TimingsHandler $scheduledBlockUpdates;
+ public TimingsHandler $neighbourBlockUpdates;
  public TimingsHandler $randomChunkUpdates;
  public TimingsHandler $randomChunkUpdatesChunkSelection;
  public TimingsHandler $doChunkGC;
@@ -77,6 +78,7 @@ public function __construct(World $world){
 
  $this->doChunkUnload = self::newTimer($name, "Unload Chunks");
  $this->scheduledBlockUpdates = self::newTimer($name, "Scheduled Block Updates");
+ $this->neighbourBlockUpdates = self::newTimer($name, "Neighbour Block Updates");
  $this->randomChunkUpdates = self::newTimer($name, "Random Chunk Updates");
  $this->randomChunkUpdatesChunkSelection = self::newTimer($name, "Random Chunk Updates - Chunk Selection");
  $this->doChunkGC = self::newTimer($name, "Garbage Collection");