Merge pull request '1.7.0 - Multi Map Support' (#4) from dev into main

Reviewed-on: https://g.tylerm.dev/tylermurphy534/KenshinsHideAndSeek/pulls/4

1 files changed, 22 insertions, 26 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
index 56f4517..0c2b6b1 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
@@ -1,30 +1,13 @@
-/*
- * This file is part of Kenshins Hide and Seek
- *
- * Copyright (c) 2021 Tyler Murphy.
- *
- * Kenshins Hide and Seek free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * he Free Software Foundation version 3.
- *
- * Kenshins Hide and Seek is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
 package net.tylermurphy.hideAndSeek.command;
 
 import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.configuration.Config;
-import net.tylermurphy.hideAndSeek.configuration.Items;
-import net.tylermurphy.hideAndSeek.configuration.Localization;
+import net.tylermurphy.hideAndSeek.command.util.ICommand;
+import net.tylermurphy.hideAndSeek.configuration.*;
 import net.tylermurphy.hideAndSeek.game.util.Status;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
 import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
@@ -38,9 +21,18 @@ public class Reload implements ICommand {
 			sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
 			return;
 		}
-		Config.loadConfig();
-		Localization.loadLocalization();
-		Items.loadItems();
+
+		try {
+			Config.loadConfig();
+			Maps.loadMaps();
+			Localization.loadLocalization();
+			Items.loadItems();
+			Leaderboard.loadLeaderboard();
+		} catch (Exception e) {
+			sender.sendMessage(errorPrefix + message("CONFIG_ERROR"));
+			return;
+		}
+
 		sender.sendMessage(messagePrefix + message("CONFIG_RELOAD"));
 	}
 
@@ -55,5 +47,9 @@ public class Reload implements ICommand {
 	public String getDescription() {
 		return "Reloads the config";
 	}
-	
+
+	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
+		return null;
+	}
+
 }