Add checks to matching server name in BungeeSettings.yml

BenCodez · Dec 2, 2023 · 4c6073c · 4c6073c
1 parent b1eb591
commit 4c6073c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 0 deletions.
diff --git a/VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java b/VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java
@@ -523,6 +523,17 @@ public void onRecieve(String subChannel, ArrayList<String> args) {
 				}
 			});
 
+			plugin.getPluginMessaging().add(new PluginMessageHandler("ServerName") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String server = args.get(0);
+					if (!plugin.getOptions().getServer().equals(server)) {
+						plugin.getLogger()
+								.warning("Server name doesn't match in BungeeSettings.yml, should be " + server);
+					}
+				}
+			});
+
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBungee") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java
@@ -905,6 +905,16 @@ public void onReceive(String[] data) {
 		if (!buildNumber.equals("NOTSET")) {
 			getLogger().info("Detected using dev build number: " + buildNumber);
 		}
+		sendServerNameMessage();
+	}
+
+	public void sendServerNameMessage() {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (String s : getAvailableAllServers()) {
+				sendPluginMessageServer(s, "ServerName", s);
+			}
+		}
+
 	}
 
 	public void loadMultiProxySupport() {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungeeCommand.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungeeCommand.java
@@ -49,6 +49,7 @@ public void execute(CommandSender sender, String[] args) {
 						sender.sendMessage(new TextComponent(
 								"&aChecking status, waiting for response, check console, method: plugin messaging"));
 						bungee.status(sender);
+						bungee.sendServerNameMessage();
 					} else {
 						sender.sendMessage(
 								new TextComponent("&aNot using socket/pluginmessage method, command unavailable"));

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java
@@ -987,6 +987,16 @@ public void onReceive(String[] data) {
 		if (!buildNumber.equals("NOTSET")) {
 			logger.info("Detected using dev build number: " + buildNumber);
 		}
+		sendServerNameMessage();
+	}
+
+	public void sendServerNameMessage() {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (RegisteredServer s : getAvailableAllServers()) {
+				sendPluginMessageServer(s, "ServerName", s.getServerInfo().getName());
+			}
+		}
+
 	}
 
 	public void loadMultiProxySupport() {

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocityCommand.java b/VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocityCommand.java
@@ -55,13 +55,15 @@ public void execute(final Invocation invocation) {
 							.text("Checking status, waiting for response, check console, method: pluginmessaging")
 							.color(NamedTextColor.AQUA));
 					plugin.status();
+					plugin.sendServerNameMessage();
 				} else {
 					source.sendMessage(Component.text("Not using socket/pluginmessage method, command unavailable")
 							.color(NamedTextColor.AQUA));
 				}
 			}
 			if (args[0].equalsIgnoreCase("multiproxystatus")) {
 				plugin.sendMultiProxyServerMessage("Status");
+
 				source.sendMessage(Component.text("Sending status message").color(NamedTextColor.AQUA));
 			}
 			if (args[0].equalsIgnoreCase("help")) {