EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Moves the Bungee Queue to BungeeHelper

Browse Source
This commit is contained in:
Kristian Knarvik
2021-10-23 12:58:31 +02:00
parent 2196d5b99e
commit 50084c40f9
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/knarcraft/stargate/Stargate.java
View File

@@ -42,7 +42,6 @@ import org.bukkit.scheduler.BukkitScheduler;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Map;
@@ -78,8 +77,6 @@ public class Stargate extends JavaPlugin {
public static boolean debuggingEnabled = false;
public static boolean permissionDebuggingEnabled = false;
//HashMap of player names for Bungee support
public static final Map<String, String> bungeeQueue = new HashMap<>();
//World names that contain stargates
public static final HashSet<String> managedWorlds = new HashSet<>();

2
src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
View File

@@ -48,7 +48,7 @@ public class PlayerEventListener implements Listener {
Player player = event.getPlayer();
//Check if the player is waiting to be teleported to a stargate
String destination = Stargate.bungeeQueue.remove(player.getName().toLowerCase());
String destination = BungeeHelper.removeFromQueue(player.getName());
if (destination == null) {
return;
}

19
src/main/java/net/knarcraft/stargate/utility/BungeeHelper.java
View File

@@ -11,6 +11,8 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
/**
* This class contains helpful functions to help with sending and receiving BungeeCord plugin messages
@@ -20,11 +22,26 @@ public final class BungeeHelper {
private final static String bungeeSubChannel = "SGBungee";
private final static String bungeeChannel = "BungeeCord";
private final static String teleportMessageDelimiter = "#@#";
private final static Map<String, String> bungeeQueue = new HashMap<>();
private BungeeHelper() {
}
/**
* Removes a player from the queue of players teleporting through BungeeCord
*
* <p>Whenever a BungeeCord teleportation message is received and the player is not currently connected to this
* server, it'll be added to this queue. Once the player joins this server, the player should be removed from the
* queue and teleported to the destination.</p>
*
* @param playerName <p>The name of the player to remove</p>
* @return <p>The name of the destination portal the player should be teleported to</p>
*/
public static String removeFromQueue(String playerName) {
return bungeeQueue.remove(playerName.toLowerCase());
}
/**
* Sends a plugin message to BungeeCord allowing the target server to catch it
*
@@ -123,7 +140,7 @@ public final class BungeeHelper {
// Check if the player is online, if so, teleport, otherwise, queue
Player player = Stargate.server.getPlayer(playerName);
if (player == null) {
Stargate.bungeeQueue.put(playerName.toLowerCase(), destination);
bungeeQueue.put(playerName.toLowerCase(), destination);
} else {
Portal destinationPortal = PortalHandler.getBungeePortal(destination);
// Specified an invalid gate. For now, we'll just let them connect at their current location