mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-20 07:54:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge 'minor-next' into 'major-next'

Browse Source 
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11802296296
This commit is contained in:
github-actions 2024-11-12 17:14:26 +00:00
commit cc335889f3
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/CODEOWNERS vendored Normal file
View File

@ -0,0 +1 @@
* @pmmp/server-developers

2
build/php

@ -1 +1 @@
Subproject commit 084822aa9e381ca05591e902a2613fe971dff3fd
Subproject commit a51259d7a6ea649d64f409fc0276baa59cf4f19a

9
changelogs/5.21.md
View File

@ -101,3 +101,12 @@ Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if
## Internals
- Fixed incorrect visibility of `createEntity` in spawn eggs.
- Added support for newer `BedrockBlockUpgradeSchema` in `BlockStateUpgrader`.
# 5.21.1
Released 12th November 2024.
## Fixes
- Fixed server crash when applying a cooldown to an item with 1 count.
- Fixed garbage collector cycle count increase on player disconnect.
- Fixed weakness effect being applied to all attack types, causing damage splash potions to become weaker.
- Fixed Enchanted Golden Apple regeneration effect amplifier to match vanilla.

2
src/VersionInfo.php
View File

@ -31,7 +31,7 @@ use function str_repeat;
final class VersionInfo{
public const NAME = "PocketMine-MP";
public const BASE_VERSION = "5.21.1";
public const BASE_VERSION = "5.21.2";
public const IS_DEVELOPMENT_BUILD = true;
public const BUILD_CHANNEL = "stable";

4
src/inventory/ArmorInventory.php
View File

@ -42,7 +42,7 @@ class ArmorInventory extends SimpleInventory{
){
parent::__construct(4);
$this->validators->add(new CallbackSlotValidator($this->validate(...)));
$this->validators->add(new CallbackSlotValidator(self::validate(...)));
}
public function getHolder() : Living{
@ -81,7 +81,7 @@ class ArmorInventory extends SimpleInventory{
$this->setItem(self::SLOT_FEET, $boots);
}
private function validate(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException{
private static function validate(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException{
if($item instanceof Armor){
if($item->getArmorSlot() !== $slot){
return new TransactionValidationException("Armor item is in wrong slot");