melody/GeyserConnectCustom
1
0
Fork 0
forked from git-mirrors/GeyserConnect
Code Pull requests Activity

fixed closing forms (#45)

Browse source
This commit is contained in:
creeper123123321 2021-10-09 13:06:43 -03:00 • committed by GitHub
parent eda16f7702
commit db6d2167b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -224,3 +224,9 @@ nbdist/
# Copyright header files # Copyright header files
.idea/* .idea/*
!.idea/copyright/ !.idea/copyright/
/config.yml
/welcome.txt
/logs/
/locales/
/players/

14
src/main/java/org/geysermc/connect/ui/UIHandler.java
View file

@ -264,7 +264,7 @@ public class UIHandler {
List<Server> servers = player.getCurrentServers(); List<Server> servers = player.getCurrentServers();
if (player.getServerCategory() == ServerCategory.CUSTOM) { if (player.getServerCategory() == ServerCategory.CUSTOM) {
if (data == null || data.getClickedButtonId() == servers.size() + 1) { if (!data.isCorrect() || data.getClickedButtonId() == servers.size() + 1) {
player.sendWindow(FormID.MAIN, UIHandler.getMainMenu()); player.sendWindow(FormID.MAIN, UIHandler.getMainMenu());
} else if (data.getClickedButtonId() == servers.size()) { } else if (data.getClickedButtonId() == servers.size()) {
player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getCurrentServers())); player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getCurrentServers()));
@ -275,7 +275,7 @@ public class UIHandler {
player.sendToServer(server); player.sendToServer(server);
} }
} else { } else {
if (data == null || data.getClickedButtonId() == servers.size()) { if (!data.isCorrect() || data.getClickedButtonId() == servers.size()) {
player.sendWindow(FormID.MAIN, UIHandler.getMainMenu()); player.sendWindow(FormID.MAIN, UIHandler.getMainMenu());
} else { } else {
// Get the server // Get the server
@ -294,7 +294,7 @@ public class UIHandler {
*/ */
public static void handleDirectConnectResponse(Player player, CustomFormResponse data) { public static void handleDirectConnectResponse(Player player, CustomFormResponse data) {
// Take them back to the main menu if they close the direct connect window // Take them back to the main menu if they close the direct connect window
if (data == null) { if (!data.isCorrect()) {
player.sendWindow(FormID.MAIN, getMainMenu()); player.sendWindow(FormID.MAIN, getMainMenu());
return; return;
} }
@ -333,7 +333,7 @@ public class UIHandler {
List<Server> servers = player.getCurrentServers(); List<Server> servers = player.getCurrentServers();
// Take them back to the main menu if they close the edit server list window // Take them back to the main menu if they close the edit server list window
if (data == null) { if (!data.isCorrect()) {
player.sendWindow(FormID.LIST_SERVERS, getServerList(servers, player.getServerCategory())); player.sendWindow(FormID.LIST_SERVERS, getServerList(servers, player.getServerCategory()));
return; return;
} }
@ -356,7 +356,7 @@ public class UIHandler {
*/ */
public static void handleAddServerResponse(Player player, CustomFormResponse data) { public static void handleAddServerResponse(Player player, CustomFormResponse data) {
// Take them back to the edit server list menu if they close the add server window // Take them back to the edit server list menu if they close the add server window
if (data == null) { if (!data.isCorrect()) {
player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers()));
return; return;
} }
@ -396,7 +396,7 @@ public class UIHandler {
*/ */
public static void handleServerOptionsResponse(Player player, SimpleFormResponse data) { public static void handleServerOptionsResponse(Player player, SimpleFormResponse data) {
// Take them back to the main menu if they close the edit server list window // Take them back to the main menu if they close the edit server list window
if (data == null) { if (!data.isCorrect()) {
player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers()));
return; return;
} }
@ -468,7 +468,7 @@ public class UIHandler {
*/ */
public static void handleEditServerResponse(Player player, CustomFormResponse data) { public static void handleEditServerResponse(Player player, CustomFormResponse data) {
// Take them back to the edit server list menu if they close the add server window // Take them back to the edit server list menu if they close the add server window
if (data == null) { if (!data.isCorrect()) {
player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers())); player.sendWindow(FormID.EDIT_SERVERS, getEditServerList(player.getServers()));
return; return;
} }