mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-22 02:46:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-11-04 19:27:41 +00:00
commit 54f287feb6
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -52,7 +52,7 @@
"webmozart/path-util": "^2.3" "webmozart/path-util": "^2.3"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "1.0.0", "phpstan/phpstan": "1.0.2",
"phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-phpunit": "^1.0.0",
"phpstan/phpstan-strict-rules": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.0.0",
"phpunit/phpunit": "^9.2" "phpunit/phpunit": "^9.2"

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "3fa50836a0e8560fe59ba9e73cc50c44", "content-hash": "c0368348f30e5309e979840d1cfad409",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1874,16 +1874,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.0.0", "version": "1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "0d13a99513182e521271d46bde8f28caa4f84d97" "reference": "e9e2a501102ba0b126b2f63a7f0a3b151056fe91"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d13a99513182e521271d46bde8f28caa4f84d97", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e9e2a501102ba0b126b2f63a7f0a3b151056fe91",
"reference": "0d13a99513182e521271d46bde8f28caa4f84d97", "reference": "e9e2a501102ba0b126b2f63a7f0a3b151056fe91",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1914,7 +1914,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.0.0" "source": "https://github.com/phpstan/phpstan/tree/1.0.2"
}, },
"funding": [ "funding": [
{ {
@ -1934,7 +1934,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-11-01T06:38:20+00:00" "time": "2021-11-03T16:09:51+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

1
src/entity/ExperienceManager.php
View File

@ -152,6 +152,7 @@ class ExperienceManager{
* @param bool $playSound Whether to play level-up and XP gained sounds. * @param bool $playSound Whether to play level-up and XP gained sounds.
*/ */
public function addXp(int $amount, bool $playSound = true) : bool{ public function addXp(int $amount, bool $playSound = true) : bool{
$amount = min($amount, Limits::INT32_MAX - $this->totalXp);
$oldLevel = $this->getXpLevel(); $oldLevel = $this->getXpLevel();
$oldTotal = $this->getCurrentTotalXp(); $oldTotal = $this->getCurrentTotalXp();