Fix changing Xbox name not updating/Fixed incorrectly placed return s…

…tatement
DaPigGuy · May 10, 2020 · 21f3c69 · 21f3c69
1 parent a89a6d3
commit 21f3c69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/DaPigGuy/PiggyFactions/EventListener.php b/src/DaPigGuy/PiggyFactions/EventListener.php
@@ -118,7 +118,7 @@ public function onJoin(PlayerJoinEvent $event): void
     {
         $player = $event->getPlayer();
         if (($member = PlayerManager::getInstance()->getPlayer($player->getUniqueId())) === null) $member = PlayerManager::getInstance()->createPlayer($player);
-        if ($member->getUsername() !== $player->getName()) $member->setUsername($member->getUsername());
+        if ($member->getUsername() !== $player->getName()) $member->setUsername($player->getName());
         LanguageManager::getInstance()->setPlayerLanguage($player, LanguageManager::LANGUAGES[$player->getLocale()] ?? LanguageManager::DEFAULT_LANGUAGE);
         if (($faction = $member->getFaction()) !== null) {
             if (($motd = $faction->getMotd()) !== null) LanguageManager::getInstance()->sendMessage($player, "motd", ["{MOTD}" => $motd]);

diff --git a/src/DaPigGuy/PiggyFactions/commands/subcommands/claims/ClaimMultipleSubCommand.php b/src/DaPigGuy/PiggyFactions/commands/subcommands/claims/ClaimMultipleSubCommand.php
@@ -44,7 +44,7 @@ public function onNormalRun(Player $sender, ?Faction $faction, FactionsPlayer $m
 
             $ev = new ClaimChunkEvent($faction, $chunk);
             $ev->call();
-            if ($ev->isCancelled()) return;
+            if ($ev->isCancelled()) continue;
 
             ClaimsManager::getInstance()->createClaim($faction, $sender->getLevel(), $chunk);
             $claimed++;