Fixed BungeeCord connector bug.

keksexception · May 23, 2020 · b5372c5 · b5372c5
1 parent 8a3337c
commit b5372c5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/LobbyNPCs/src/de/raffi/lobbynpcs/commands/LobbyNPCCommand.java b/LobbyNPCs/src/de/raffi/lobbynpcs/commands/LobbyNPCCommand.java
@@ -48,7 +48,7 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String
 
 								@Override
 								public void onHandlerRemoved(boolean b) {
-									InputHandler.getInputFrom(p, ConfigLobbyNPCs.PREFIX+"§6Enter the skin name of the npc (name is used to get cape etc.)", new MessageHandler() {
+									InputHandler.getInputFrom(p, ConfigLobbyNPCs.PREFIX+"§6Enter the name of the npc", new MessageHandler() {
 
 										@Override
 										public void onMessageDenied(String message) {p.sendMessage("§cError: String length is bigger than maximum of 16!");}
@@ -73,7 +73,7 @@ public void onHandlerRemoved() {
 
 																@Override
 																public void onHandlerRemoved(boolean b) {
-																	InputHandler.getInputFrom(p, ConfigLobbyNPCs.PREFIX+"§6On what server should a player get send to (servername)?", new MessageHandler() {
+																	InputHandler.getInputFrom(p, ConfigLobbyNPCs.PREFIX+"§6To what server should a player get send to (servername)?", new MessageHandler() {
 
 																		@Override
 																		public void onMessageDenied(String message) {
@@ -126,25 +126,6 @@ public void accept() {
 																											} else {
 																												createNPC(p, loc, npcName, fetch, skinName, showInTab, server, item, autoRotate, forcefield, sneak, false);
 																											}
-																											/*NPC npc = new NPC(loc, npcName, fetch, skinName);
-																											
-																											if(item != null)
-																												npc.setHandItem(item);
-																											npc.setRemovedFromTablist(!showInTab);
-																											npc.register();
-																											npc.enableAutoSpawn();
-																											LobbyNPCManager.setAutoRotate(npc, autoRotate);
-																											LobbyNPCManager.setServer(npc, server);
-																											LobbyNPCManager.setItem(npc, item);
-																											LobbyNPCManager.setForcefield(npc, forcefield);	
-																											LobbyNPCManager.setAutoSneak(npc, state);
-																											
-																											LobbyNPCManager.setProperty(npc, "server", server);
-																											LobbyNPCManager.setProperty(npc, "rotate", autoRotate);
-																											LobbyNPCManager.setProperty(npc, "forcefield", forcefield);
-																											LobbyNPCManager.setProperty(npc, "sneak", state);
-
-																											p.sendMessage(ConfigLobbyNPCs.PREFIX+"§aCreated NPC successfully. Rejoin to see a change.");*/
 
 																										}
 

diff --git a/LobbyNPCs/src/de/raffi/lobbynpcs/listener/NPCListener.java b/LobbyNPCs/src/de/raffi/lobbynpcs/listener/NPCListener.java
@@ -18,7 +18,6 @@
 import de.raffi.lobbynpcs.utils.InventoryManager;
 import de.raffi.lobbynpcs.utils.LabyModHook;
 import de.raffi.lobbynpcs.utils.LobbyNPCManager;
-import de.raffi.pluginlib.bungeecord.BungeeAPI;
 import de.raffi.pluginlib.event.PlayerInteractAtNPCEvent;
 import de.raffi.pluginlib.npc.NPC;
 import de.raffi.pluginlib.npc.NPCManager;
@@ -70,7 +69,7 @@ public void onInteract(PlayerInteractAtNPCEvent e) {
 		if(System.currentTimeMillis()-allow.get(e.getPlayer())>ConfigLobbyNPCs.NPC_COOLDOWN) {
 			allow.put(e.getPlayer(), System.currentTimeMillis());
 			e.getPlayer().sendMessage(ConfigLobbyNPCs.connectingMessage);
-			BungeeAPI.sendToServer(LobbyNPCs.getInstance(), (String) LobbyNPCManager.getProperty(e.getNPC(), "server"), e.getPlayer());
+			de.raffi.lobbynpcs.utils.Bungee.sendToServer((String) LobbyNPCManager.getProperty(e.getNPC(), "server"), e.getPlayer());
 		}
 
 	}

diff --git a/LobbyNPCs/src/de/raffi/lobbynpcs/main/LobbyNPCs.java b/LobbyNPCs/src/de/raffi/lobbynpcs/main/LobbyNPCs.java
@@ -10,7 +10,6 @@
 import de.raffi.lobbynpcs.listener.NPCListener;
 import de.raffi.lobbynpcs.utils.ConfigLobbyNPCs;
 import de.raffi.lobbynpcs.utils.LobbyNPCManager;
-import de.raffi.pluginlib.bungeecord.BungeeAPI;
 import de.raffi.pluginlib.compability.npchandler.NPCHandlerManager;
 import de.raffi.pluginlib.main.PluginLib;
 import de.raffi.pluginlib.test.setup.PluginSetup;
@@ -49,7 +48,7 @@ public void onEnable() {
 
 
 		try {
-			Bukkit.getScheduler().scheduleSyncDelayedTask(this, ()->BungeeAPI.registerChannel(this),30);
+			getServer().getMessenger().registerOutgoingPluginChannel(getInstance(), "BungeeCord");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

diff --git a/LobbyNPCs/src/de/raffi/lobbynpcs/utils/Bungee.java b/LobbyNPCs/src/de/raffi/lobbynpcs/utils/Bungee.java
@@ -0,0 +1,23 @@
+package de.raffi.lobbynpcs.utils;
+
+import org.bukkit.entity.Player;
+
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
+
+import de.raffi.lobbynpcs.main.LobbyNPCs;
+
+public class Bungee {
+
+
+
+	public static final void sendToServer(String server, Player player) {
+		ByteArrayDataOutput out = ByteStreams.newDataOutput();
+		out.writeUTF("Connect");
+		out.writeUTF(server);
+		player.sendPluginMessage(LobbyNPCs.getInstance(), "BungeeCord", out.toByteArray());
+	}
+
+
+
+}
diff --git a/LobbyNPCs/src/plugin.yml b/LobbyNPCs/src/plugin.yml
@@ -1,5 +1,5 @@
 name: LobbyNPCs
-version: 1.1-r2
+version: 1.1-r3
 main: de.raffi.lobbynpcs.main.LobbyNPCs
 authors: [keksexception]
 loadbefore: [PluginLib]