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

ClearCommand: Cleanup logic & fix vanilla disparities (#4619)

Browse Source
This commit is contained in:
Matthew Jordan 2021-12-06 17:57:07 -06:00 committed by GitHub
parent 8f2ca92f02
commit 3728ddbf24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/4.0.md
View File

@ -836,7 +836,7 @@ However, if we add `src-namespace-prefix: pmmp\TesterPlugin` to the `plugin.yml`
- `Item::clearCreativeItems()` -> `CreativeInventory::clear()`
- `Item::getCreativeItemIndex()` -> `CreativeInventory::getItemIndex()`
- `Item::getCreativeItems()` -> `CreativeInventory::getAll()`
- `Item::initCreativeItems()` -> `CreativeInventory::init()`
- `Item::initCreativeItems()` -> `CreativeInventory::reset()`
- `Item::isCreativeItem()` -> `CreativeInventory::contains()`
- `Item::removeCreativeItem()` -> `CreativeInventory::remove()`
- The following classes have been added:

107
src/command/defaults/ClearCommand.php
View File

@ -26,6 +26,8 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\inventory\Inventory;
use pocketmine\item\Item;
use pocketmine\item\LegacyStringToItemParser;
use pocketmine\item\LegacyStringToItemParserException;
use pocketmine\item\StringToItemParser;
@ -33,9 +35,9 @@ use pocketmine\lang\KnownTranslationFactory;
use pocketmine\permission\DefaultPermissionNames;
use pocketmine\player\Player;
use pocketmine\utils\TextFormat;
use function array_merge;
use function count;
use function implode;
use function min;
class ClearCommand extends VanillaCommand{
@ -57,7 +59,6 @@ class ClearCommand extends VanillaCommand{
throw new InvalidCommandSyntaxException();
}
$target = null;
if(isset($args[0])){
$target = $sender->getServer()->getPlayerByPrefix($args[0]);
if($target === null){
@ -77,14 +78,14 @@ class ClearCommand extends VanillaCommand{
throw new InvalidCommandSyntaxException();
}
$item = null;
$targetItem = null;
$maxCount = -1;
if(isset($args[1])){
try{
$item = StringToItemParser::getInstance()->parse($args[1]) ?? LegacyStringToItemParser::getInstance()->parse($args[1]);
$targetItem = StringToItemParser::getInstance()->parse($args[1]) ?? LegacyStringToItemParser::getInstance()->parse($args[1]);
if(isset($args[2])){
$item->setCount($maxCount = $this->getInteger($sender, $args[2], 0));
$targetItem->setCount($maxCount = $this->getInteger($sender, $args[2], -1));
}
}catch(LegacyStringToItemParserException $e){
//vanilla checks this at argument parsing layer, can't come up with a better alternative
@ -93,14 +94,18 @@ class ClearCommand extends VanillaCommand{
}
}
//checking players inventory for all the items matching the criteria
if($item !== null and $maxCount === 0){
$count = 0;
$contents = array_merge($target->getInventory()->all($item), $target->getArmorInventory()->all($item));
foreach($contents as $content){
$count += $content->getCount();
}
/**
* @var Inventory[] $inventories - This is the order that vanilla would clear items in.
*/
$inventories = [
$target->getInventory(),
$target->getCursorInventory(),
$target->getArmorInventory()
];
// Checking player's inventory for all the items matching the criteria
if($targetItem !== null and $maxCount === 0){
$count = $this->countItems($inventories, $targetItem);
if($count > 0){
$sender->sendMessage(KnownTranslationFactory::commands_clear_testing($target->getName(), (string) $count));
}else{
@ -110,65 +115,59 @@ class ClearCommand extends VanillaCommand{
return true;
}
$cleared = 0;
//clear everything from the targets inventory
if($item === null){
$contents = array_merge($target->getInventory()->getContents(), $target->getArmorInventory()->getContents());
foreach($contents as $content){
$cleared += $content->getCount();
$clearedCount = 0;
if($targetItem === null){
// Clear all items from the inventories
$clearedCount += $this->countItems($inventories, null);
foreach($inventories as $inventory){
$inventory->clearAll();
}
$target->getInventory()->clearAll();
$target->getArmorInventory()->clearAll();
//TODO: should the cursor inv be cleared?
}else{
//clear the item from targets inventory irrelevant of the count
// Clear the item from target's inventory irrelevant of the count
if($maxCount === -1){
if(($slot = $target->getArmorInventory()->first($item)) !== -1){
$cleared++;
$target->getArmorInventory()->clear($slot);
}
foreach($target->getInventory()->all($item) as $index => $i){
$cleared += $i->getCount();
$target->getInventory()->clear($index);
$clearedCount += $this->countItems($inventories, $targetItem);
foreach($inventories as $inventory){
$inventory->remove($targetItem);
}
}else{
//clear only the given amount of that particular item from targets inventory
if(($slot = $target->getArmorInventory()->first($item)) !== -1){
$cleared++;
$maxCount--;
$target->getArmorInventory()->clear($slot);
}
if($maxCount > 0){
foreach($target->getInventory()->all($item) as $index => $i){
if($i->getCount() >= $maxCount){
$i->pop($maxCount);
$cleared += $maxCount;
$target->getInventory()->setItem($index, $i);
break;
}
// Clear the item from target's inventory up to maxCount
foreach($inventories as $inventory){
foreach($inventory->all($targetItem) as $index => $item){
// The count to reduce from the item and max count
$reductionCount = min($item->getCount(), $maxCount);
$item->pop($reductionCount);
$clearedCount += $reductionCount;
$inventory->setItem($index, $item);
$maxCount -= $reductionCount;
if($maxCount <= 0){
break;
break 2;
}
$cleared += $i->getCount();
$maxCount -= $i->getCount();
$target->getInventory()->clear($index);
}
}
}
}
if($cleared > 0){
Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_clear_success($target->getName(), (string) $cleared));
if($clearedCount > 0){
Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_clear_success($target->getName(), (string) $clearedCount));
}else{
$sender->sendMessage(KnownTranslationFactory::commands_clear_failure_no_items($target->getName())->prefix(TextFormat::RED));
}
return true;
}
/**
* @param Inventory[] $inventories
*/
protected function countItems(array $inventories, ?Item $target) : int{
$count = 0;
foreach($inventories as $inventory){
$contents = $target !== null ? $inventory->all($target) : $inventory->getContents();
foreach($contents as $item){
$count += $item->getCount();
}
}
return $count;
}
}