mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +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/11769186885
This commit is contained in:
github-actions
2024-11-10 22:56:09 +00:00
parent 82c5a3160c fa3529966f
commit 80b7f6aba4
7 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/item/GoldenAppleEnchanted.php
View File

@ -30,7 +30,7 @@ class GoldenAppleEnchanted extends GoldenApple{
public function getAdditionalEffects() : array{
return [
new EffectInstance(VanillaEffects::REGENERATION(), 600, 4),
new EffectInstance(VanillaEffects::REGENERATION(), 600, 1),
new EffectInstance(VanillaEffects::ABSORPTION(), 2400, 3),
new EffectInstance(VanillaEffects::RESISTANCE(), 6000),
new EffectInstance(VanillaEffects::FIRE_RESISTANCE(), 6000)

3
src/item/Potion.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\item;
use pocketmine\data\runtime\RuntimeDataDescriber;
use pocketmine\entity\Living;
use pocketmine\player\Player;
use pocketmine\world\sound\BottleEmptySound;
class Potion extends Item implements ConsumableItem{
@ -50,7 +51,7 @@ class Potion extends Item implements ConsumableItem{
}
public function onConsume(Living $consumer) : void{
$consumer->broadcastSound(new BottleEmptySound());
}
public function getAdditionalEffects() : array{