Merge pull request #47 from Driesboy/patch-3

Clear INV Flix

Author: xZeroMCPE

src/Andre/SurvivalGame/Main.php

@@ -1180,33 +1180,18 @@ public function playerBlockTouch(PlayerInteractEvent $event){
 		}
 	}
 
-	public function ClearInv($player)
-	{
-		if(!$player instanceof Player)
-		{
-			unset($player);
-		}
-		$inv=$player->getInventory();
-		if(!$inv instanceof Inventory)
-		{
-			unset($player,$inv);
+	public function ClearInv($player){
+		foreach ($this->players as $player){
+		$player->getInventory()->setItemInHand(new Item(Item::AIR,0,0));
+   		$player->getInventory()->clearAll();
 		}
-		$inv->clearAll();
-		unset($player,$inv);
 	}
 
-	public function ClearAllInv()
-	{
-		foreach($this->players as $pl)
-		{
-			$player=$this->getServer()->getPlayer($pl["id"]);
-			if(!$player instanceof Player)
-			{
-				continue;
-			}
-			$this->ClearInv($player);
+	public function ClearAllInv($player){
+		foreach ($this->players as $player){
+		$player->getInventory()->setItemInHand(new Item(Item::AIR,0,0));
+   		$player->getInventory()->clearAll();
 		}
-		unset($pl,$player);
 	}
 
 	public function PlayerQuit(PlayerQuitEvent $event){
@@ -1233,11 +1218,11 @@ public function PlayerQuit(PlayerQuitEvent $event){
 	}
 
 	public function onDisable(){
-		$this->saveResource("config.yml");
-        	$this->saveResource("points.yml");
 			$this->getServer()->getLogger()->info(TextFormat::GREEN."[SG] Saving All Data...");
-			$this->getServer()->getLogger()->info(TextFormat::GREEN."[SG] Please wait...........");
 			$this->saveResource("config.yml");
+        	        $this->saveResource("points.yml");
+        	        $this->saveResource("config.yml");
+			$this->getServer()->getLogger()->info(TextFormat::GREEN."[SG] Please wait...........");
 			$this->getServer()->getLogger()->info(TextFormat::GREEN."[SG] All Data/Settings has been fixed");
 	}
 }