Merge branch 'next-minor' into next-major

src/entity/ExperienceManager.php

@@ -237,11 +237,10 @@ class ExperienceManager{
 	}
 
 	public function onPickupXp(int $xpValue) : void{
-		static $mainHandIndex = -1;
-		static $offHandIndex = -2;
+		$mainHandIndex = -1;
+		$offHandIndex = -2;
 
 		//TODO: replace this with a more generic equipment getting/setting interface
-		/** @var Durable[] $equipment */
 		$equipment = [];
 
 		if(($item = $this->entity->getInventory()->getItemInHand()) instanceof Durable && $item->hasEnchantment(VanillaEnchantments::MENDING())){

src/entity/effect/Effect.php

@@ -38,7 +38,6 @@ class Effect{
 	 * @param Translatable|string $name Translation key used for effect name
 	 * @param Color               $color Color of bubbles given by this effect
 	 * @param bool                $bad Whether the effect is harmful
-	 * @param int                 $defaultDuration
 	 * @param bool                $hasBubbles Whether the effect has potion bubbles. Some do not (e.g. Instant Damage has its own particles instead of bubbles)
 	 */
 	public function __construct(

src/entity/effect/VanillaEffects.php

@@ -101,6 +101,7 @@ final class VanillaEffects{
 
 	/**
 	 * @return Effect[]
+	 * @phpstan-return array<string, Effect>
 	 */
 	public static function getAll() : array{
 		//phpstan doesn't support generic traits yet :(