Fix errors if player is kicked before player joined

PiggyArchive · Apr 17, 2017 · add5e40 · add5e40
1 parent 2b462dd
commit add5e40
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: PiggyAuth
 main: PiggyAuth\Main
-version: 3.0.0.12
+version: 3.0.0.13
 api: [2.0.0, 3.0.0-ALPHA1, 3.0.0-ALPHA2, 3.0.0-ALPHA3, 3.0.0-ALPHA4, 3.0.0-APLHA5]
 load: POSTWORLD
 author: MCPEPIG

diff --git a/src/PiggyAuth/Main.php b/src/PiggyAuth/Main.php
@@ -775,18 +775,20 @@ public function logout(Player $player, $quit = true)
             if ($this->sessionmanager->getSession($player) !== null && $this->sessionmanager->getSession($player)->isAuthenticated()) {
                 $this->sessionmanager->getSession($player)->setAuthenticated(false);
             } else {
-                if ($this->getConfig()->getNested("login.adventure-mode")) {
-                    if($this->sessionmanager->getSession($player)->getGamemode() !== null) {
-                        $player->setGamemode($this->sessionmanager->getSession($player)->getGamemode());
-                        $this->sessionmanager->getSession($player)->setGamemode(null);
+                if($this->sessionmanager->getSession($player) !== null) {
+                    if ($this->getConfig()->getNested("login.adventure-mode")) {
+                        if ($this->sessionmanager->getSession($player)->getGamemode() !== null) {
+                            $player->setGamemode($this->sessionmanager->getSession($player)->getGamemode());
+                            $this->sessionmanager->getSession($player)->setGamemode(null);
+                        }
+                    }
+                    $this->sessionmanager->getSession($player)->setMessageTick(0);
+                    $this->sessionmanager->getSession($player)->setTimeoutTick(0);
+                    $this->sessionmanager->getSession($player)->setTries(0);
+                    if ($this->getConfig()->getNested("message.boss-bar")) {
+                        $this->sessionmanager->getSession($player)->getWither()->kill();
+                        $this->sessionmanager->getSession($player)->setWither(null);
                     }
-                }
-                $this->sessionmanager->getSession($player)->setMessageTick(0);
-                $this->sessionmanager->getSession($player)->setTimeoutTick(0);
-                $this->sessionmanager->getSession($player)->setTries(0);
-                if ($this->getConfig()->getNested("message.boss-bar")) {
-                    $this->sessionmanager->getSession($player)->getWither()->kill();
-                    $this->sessionmanager->getSession($player)->setWither(null);
                 }
             }
             if ($quit !== true) {