Fix #1 and other bug

- Fix #1 - Fix error that happened when a rank was eliminated and a player with that rank joined the server.
IvanCraft623 · Sep 8, 2021 · 3507b5c · 3507b5c
1 parent e54d8fd
commit 3507b5c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/src/IvanCraft623/RankSystem/command/RanksCommand.php b/src/IvanCraft623/RankSystem/command/RanksCommand.php
@@ -72,7 +72,7 @@ public function execute(CommandSender $sender, string $label, array $args) {
 						$sender->sendMessage("§cUse: /ranks delete <rank>");
 						return true;
 					}
-					if ($this->plugin->getRankManager()->exists($args[1])) {
+					if (!$this->plugin->getRankManager()->exists($args[1])) {
 						$sender->sendMessage("§c".$args[1]." rank does not exist!");
 						return true;
 					}
@@ -81,13 +81,21 @@ public function execute(CommandSender $sender, string $label, array $args) {
 						return true;
 					}
 					$this->plugin->getRankManager()->delete($args[1]);
+					$sender->sendMessage("§bYou have successfully §cdeleted§b the rank §e".$args[1]);
 				break;
 
 				case 'edit':
 					if (!$sender->hasPermission("ranksystem.commands")) {
 						$sender->sendMessage("§cYou do not have permission to use this command!");
 						return true;
 					}
+					if (!$sender instanceof Player) {
+						$sender->sendMessage(
+							"§cYou can only use this command in game!"."\n".
+							"§eTo edit a rank you must go to §bplugin_data/Ranks/ranks.yml §eand edit it manually."
+						);
+						return true;
+					}
 					if (!isset($args[1])) {
 						$sender->sendMessage("§cUse: /ranks edit <rank>");
 						return true;

diff --git a/src/IvanCraft623/RankSystem/provider/SQLite3.php b/src/IvanCraft623/RankSystem/provider/SQLite3.php
@@ -58,7 +58,9 @@ public function getRanks(string $user) : array {
 					if (is_numeric($expTime)) {
 						$expTime = (int)$expTime;
 					}
-					$ranks[$data[0]] = $expTime;
+					if (Ranks::getInstance()->getRankManager()->exists($data[0])) {
+						$ranks[$data[0]] = $expTime;
+					}
 				}
 			}
 		}

diff --git a/src/IvanCraft623/RankSystem/provider/YAML.php b/src/IvanCraft623/RankSystem/provider/YAML.php
@@ -43,6 +43,11 @@ public function getRanks(string $user) : array {
 		if ($this->isInDb($user)) {
 			$all = $this->db->getAll();
 			$ranks = $all[$user]["ranks"];
+			foreach ($ranks as $rank => $expTime) {
+				if (!Ranks::getInstance()->getRankManager()->exists($rank)) {
+					unset($ranks[$rank]);
+				}
+			}
 		}
 		return $ranks;
 	}

diff --git a/src/IvanCraft623/RankSystem/session/Session.php b/src/IvanCraft623/RankSystem/session/Session.php
@@ -85,7 +85,7 @@ private function loadRanks() : void {
 			$ranks[] = $rank;
 		}
 		if ($ranks === []) {
-			$ranks = [$this->plugin->getRankManager()->getDefault()];
+			$ranks[0] = $this->plugin->getRankManager()->getDefault();
 		}
 		$this->ranks = $manager->getHierarchical($ranks);
 	}
@@ -277,15 +277,18 @@ public function removePermission(string $perm) : bool {
 
 	public function updateRanks() {
 		$this->ranks = $this->plugin->getRankManager()->getHierarchical($this->ranks);
-		$player = Ranks::getInstance()->getServer()->getPlayerByPrefix($this->name);
+		if ($this->ranks === []) {
+			$this->ranks = [$this->plugin->getRankManager()->getDefault()];
+		}
+		$player = Ranks::getInstance()->getServer()->getPlayerExact($this->name);
 		if ($player !== null) {
 			$this->updatePermissions();
 			$player->setNameTag($this->getNameTagFormat());
 		}
 	}
 
 	public function updatePermissions() {
-		$player = Ranks::getInstance()->getServer()->getPlayerByPrefix($this->name);
+		$player = Ranks::getInstance()->getServer()->getPlayerExact($this->name);
 		if ($player !== null) {
 			foreach ($this->attachments as $attachment) {
 				$player->removeAttachment($attachment);