Bumped version to 1.0.6 + Fixed forms causing ISEs for float/int argu…

…ments
DaPigGuy · May 22, 2020 · b9fbdcf · b9fbdcf
1 parent 6825b9a
commit b9fbdcf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: PiggyFactions
 main: DaPigGuy\PiggyFactions\PiggyFactions
-version: 1.0.5
+version: 1.0.6
 api: 3.2.0
 author: DaPigGuy
 softdepend: [EconomyAPI, MultiEconomy, PiggyCustomEnchants, HRKChat]

diff --git a/src/DaPigGuy/PiggyFactions/commands/subcommands/FactionSubCommand.php b/src/DaPigGuy/PiggyFactions/commands/subcommands/FactionSubCommand.php
@@ -6,6 +6,8 @@
 
 use CortexPE\Commando\args\BaseArgument;
 use CortexPE\Commando\args\BooleanArgument;
+use CortexPE\Commando\args\FloatArgument;
+use CortexPE\Commando\args\IntegerArgument;
 use CortexPE\Commando\args\StringEnumArgument;
 use CortexPE\Commando\BaseSubCommand;
 use DaPigGuy\PiggyFactions\factions\Faction;
@@ -122,7 +124,16 @@ public function onFormRun(Player $sender, ?Faction $faction, FactionsPlayer $mem
                 foreach ($this->getArgumentList() as $position => $arguments) {
                     /** @var PiggyArgument $argument */
                     foreach ($arguments as $argument) {
-                        $args[$argument->getName()] = (($enum = $argument->getWrappedArgument()) instanceof StringEnumArgument && !$enum instanceof BooleanArgument) ? $enums[$position][$data[$position]] : $data[$position];
+                        $wrappedArgument = $argument->getWrappedArgument();
+                        if ($wrappedArgument instanceof StringEnumArgument && !$wrappedArgument instanceof BooleanArgument) {
+                            $args[$argument->getName()] = $enums[$position][$data[$position]];
+                        } elseif ($wrappedArgument instanceof IntegerArgument) {
+                            $args[$argument->getName()] = (int)$data[$position];
+                        } elseif ($wrappedArgument instanceof FloatArgument) {
+                            $args[$argument->getName()] = (float)$data[$position];
+                        } else {
+                            $args[$argument->getName()] = $data[$position];
+                        }
                     }
                 }
                 $this->onRun($player, $this->getName(), $args);