Close #19

Hopefully fix for #18
MHIGists · Sep 22, 2021 · f88a5d3 · f88a5d3
1 parent f777adf
commit f88a5d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/TheClimbing/RPGLike/Commands/RPGCommand.php b/src/TheClimbing/RPGLike/Commands/RPGCommand.php
@@ -46,11 +46,9 @@ public function execute(CommandSender $sender, string $commandLabel, array $args
                         }
                         break;
                     case "upgrade":
-                        RPGForms::upgradeStatsForm($sender, 0);
+                        RPGForms::upgradeStatsForm($sender);
                 }
             }
-        } else {
-            $sender->sendMessage($this->getPermissionMessage());
         }
     }
 

diff --git a/src/TheClimbing/RPGLike/EventListener.php b/src/TheClimbing/RPGLike/EventListener.php
@@ -136,7 +136,7 @@ public function onLevelUp(PlayerExperienceChangeEvent $event)
 
                     $player->xplevel = $new_lvl;
                     $spleft = $new_lvl - $old_level;
-                    $player->setSPleft($spleft);
+                    $player->setSPleft($player->getSPleft() + $spleft);
                     $player->setHealth($player->getMaxHealth());
                     $player->setFood($player->getMaxFood());
                     $player->setAirSupplyTicks($player->getMaxAirSupplyTicks());

diff --git a/src/TheClimbing/RPGLike/Forms/RPGForms.php b/src/TheClimbing/RPGLike/Forms/RPGForms.php
@@ -23,12 +23,10 @@ public function __construct(RPGLike $rpg)
         self::$main = $rpg;
     }
 
-    public static function upgradeStatsForm(RPGPlayer $player, int $spleft)
+    public static function upgradeStatsForm(RPGPlayer $player)
     {
-        if ($player->getSPleft() > 0) {
-            $spleft += $player->getSPleft();
-            $player->setSPleft(0);
-        }
+            $spleft = $player->getSPleft();
+
         if ($spleft <= 0) {
             $player->setSPleft(0);
             self::statsForm($player);
@@ -68,7 +66,7 @@ public static function upgradeStatsForm(RPGPlayer $player, int $spleft)
                     $player->setSPleft($spleft);
                     return;
             }
-            self::upgradeStatsForm($player, $spleft);
+            self::upgradeStatsForm($player);
 
         });
 
@@ -129,15 +127,15 @@ public static function menuForm(RPGPlayer $player)
                     self::statsForm($player, true);
                     break;
                 case "upgrade":
-                    self::upgradeStatsForm($player, 0);
+                    self::upgradeStatsForm($player);
                     break;
                 case "traits":
                     self::traitsForm($player);
             }
         });
         $form->setTitle($menuStrings['title']);
         foreach ($menuStrings['buttons'] as $key => $buttonText) {
-            if ($key == 'skills' && !$player->isSkillsUnlocked() || $key == 'traits' && !$player->isTraitsUnlocked()){
+            if (($key == 'skills' && !$player->isSkillsUnlocked()) || ($key == 'traits' && !$player->isTraitsUnlocked())){
                 continue;
             }
             $form->addButton($buttonText, -1, '', $key);