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

EnchantTransaction: cleanup XP cost checking logic

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-08-18 12:33:07 +01:00
parent b3c740081e
commit b2414b4c29
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/inventory/transaction/EnchantTransaction.php
View File

@ -31,6 +31,7 @@ use pocketmine\item\ItemTypeIds;
use pocketmine\player\Player;
use pocketmine\utils\AssumptionFailedError;
use function count;
use function min;
class EnchantTransaction extends InventoryTransaction{
@ -56,15 +57,6 @@ class EnchantTransaction extends InventoryTransaction{
}
}
/**
* The selected option might be available to a player who has enough XP levels to meet the option's minimum level,
* but not enough to pay the full cost (e.g. option costs 3 levels but requires only 1 to use). As much XP as
* possible is spent in these cases.
*/
private function getAdjustedXpCost() : int{
return min($this->cost, $this->source->getXpManager()->getXpLevel());
}
private function validateFiniteResources(int $lapisSpent) : void{
if($lapisSpent !== $this->cost){
throw new TransactionValidationException("Expected the amount of lapis lazuli spent to be $this->cost, but received $lapisSpent");
@ -72,14 +64,12 @@ class EnchantTransaction extends InventoryTransaction{
$xpLevel = $this->source->getXpManager()->getXpLevel();
$requiredXpLevel = $this->option->getRequiredXpLevel();
$actualCost = $this->getAdjustedXpCost();
if($xpLevel < $requiredXpLevel){
throw new TransactionValidationException("Player's XP level $xpLevel is less than the required XP level $requiredXpLevel");
}
if($xpLevel < $actualCost){
throw new TransactionValidationException("Player's XP level $xpLevel is less than the XP level cost $actualCost");
}
//XP level cost is intentionally not checked here, as the required level may be lower than the cost, allowing
//the option to be used with less XP than the cost - in this case, as much XP as possible will be deducted.
}
public function validate() : void{
@ -125,7 +115,9 @@ class EnchantTransaction extends InventoryTransaction{
parent::execute();
if($this->source->hasFiniteResources()){
$this->source->getXpManager()->subtractXpLevels($this->getAdjustedXpCost());
//If the required XP level is less than the XP cost, the option can be selected with less XP than the cost.
//In this case, as much XP as possible will be taken.
$this->source->getXpManager()->subtractXpLevels(min($this->cost, $this->source->getXpManager()->getXpLevel()));
}
$this->source->setEnchantmentSeed($this->source->generateEnchantmentSeed());
}