Skip to content

Fix VelocityPlugin to use proxyServer for server lookup #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kmaba wants to merge 1 commit into from
Closed

Fix VelocityPlugin to use proxyServer for server lookup #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/main/java/io/github/kmaba/vLobbyConnect/VelocityPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import org.slf4j.Logger;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
Expand All @@ -28,11 +28,18 @@ public final class VelocityPlugin {
@Inject
private Logger logger;

private final ProxyServer proxyServer;

private RegisteredServer lobby1;
private RegisteredServer lobby2;
private RegisteredServer lobby3;
private RegisteredServer lobby4;

@Inject
public VelocityPlugin(ProxyServer proxyServer) {
this.proxyServer = proxyServer;
}

@Subscribe
void onProxyInitialization(final ProxyInitializeEvent event) {
// Initialize lobbies
Expand All @@ -41,10 +48,10 @@ void onProxyInitialization(final ProxyInitializeEvent event) {
Map<String, Object> config = yaml.load(Files.newInputStream(Paths.get("src/main/resources/config.yml")));
Map<String, String> lobbies = (Map<String, String>) config.get("lobbies");

Optional<RegisteredServer> lobby1Opt = event.getServer().getServer(lobbies.get("lobby1"));
Optional<RegisteredServer> lobby2Opt = event.getServer().getServer(lobbies.get("lobby2"));
Optional<RegisteredServer> lobby3Opt = event.getServer().getServer(lobbies.get("lobby3"));
Optional<RegisteredServer> lobby4Opt = event.getServer().getServer(lobbies.get("lobby4"));
Optional<RegisteredServer> lobby1Opt = proxyServer.getServer(lobbies.get("lobby1"));
Optional<RegisteredServer> lobby2Opt = proxyServer.getServer(lobbies.get("lobby2"));
Optional<RegisteredServer> lobby3Opt = proxyServer.getServer(lobbies.get("lobby3"));
Optional<RegisteredServer> lobby4Opt = proxyServer.getServer(lobbies.get("lobby4"));

if (lobby1Opt.isPresent() && lobby2Opt.isPresent() && lobby3Opt.isPresent() && lobby4Opt.isPresent()) {
lobby1 = lobby1Opt.get();
Expand Down Expand Up @@ -83,7 +90,7 @@ void onPlayerJoin(final PlayerChooseInitialServerEvent event) {
logger.info("Redirecting player {} to lobby3", player.getUsername());
} else if (lobby4.getPlayersConnected().size() < lobby4.getServerInfo().getMaxPlayers()) {
event.setInitialServer(lobby4);
logger.info("Redirecting player {} to lobby4", player.getUsername());
logger.info("Redirecting player {} to lobby4");
} else {
logger.warn("All 1.8 lobbies are full. Player {} could not be redirected.", player.getUsername());
}
Expand Down
Loading