mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-20 15:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/world/Explosion.php
#	tests/phpunit/item/ItemTest.php
#	tests/phpunit/world/format/io/region/RegionLoaderTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMainLoggerTest.php
#	tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/tests/AsyncTaskMemoryLeakTest.php
This commit is contained in:
Dylan K. Taylor
2020-11-01 14:21:47 +00:00
parent c312c8ddd6 deb0cee8a0
commit 73a8c90bee
10 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/inventory/BaseInventory.php
View File

@@ -210,11 +210,11 @@ abstract class BaseInventory implements Inventory{
for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
$slot = $this->getItem($i);
if($item->equals($slot)){
if(($diff = $slot->getMaxStackSize() - $slot->getCount()) > 0){
if(($diff = min($slot->getMaxStackSize(), $item->getMaxStackSize()) - $slot->getCount()) > 0){
$count -= $diff;
}
}elseif($slot->isNull()){
$count -= $this->getMaxStackSize();
$count -= min($this->getMaxStackSize(), $item->getMaxStackSize());
}
if($count <= 0){

2
src/world/Explosion.php
View File

@@ -157,7 +157,6 @@ class Explosion{
* and creating sounds and particles.
*/
public function explodeB() : bool{
$send = [];
$updateBlocks = [];
$source = (new Vector3($this->source->x, $this->source->y, $this->source->z))->floor();
@@ -250,7 +249,6 @@ class Explosion{
$updateBlocks[$index] = true;
}
}
$send[] = $pos->subtractVector($source);
}
$this->world->addParticle($source, new HugeExplodeSeedParticle());