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: fixed XP level costs when minimum level is less than the XP cost

Browse Source 
this can happen and happens in vanilla too. In these cases, as much of the XP cost as possible is deducted.
This commit is contained in:
Dylan K. Taylor 2023-08-16 14:51:47 +01:00
parent e323c5dd76
commit beaca8bb6d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,15 @@ 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");
@ -63,12 +72,13 @@ 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 < $this->cost){
throw new TransactionValidationException("Player's XP level $xpLevel is less than the XP level cost $this->cost");
if($xpLevel < $actualCost){
throw new TransactionValidationException("Player's XP level $xpLevel is less than the XP level cost $actualCost");
}
}
@ -115,7 +125,7 @@ class EnchantTransaction extends InventoryTransaction{
parent::execute();
if($this->source->hasFiniteResources()){
$this->source->getXpManager()->subtractXpLevels($this->cost);
$this->source->getXpManager()->subtractXpLevels($this->getAdjustedXpCost());
}
$this->source->setEnchantmentSeed($this->source->generateEnchantmentSeed());
}