Skip to content
This repository was archived by the owner on Nov 26, 2019. It is now read-only.

Commit 41c3dd9

Browse files
committed
Fixed error when adding a server to favourites that is online
1 parent 39f0341 commit 41c3dd9

File tree

1 file changed

+5
-23
lines changed

1 file changed

+5
-23
lines changed

client/src/main/java/com/msc/serverbrowser/data/FavouritesController.java

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static SampServer addServerToFavourites(final String address, final Integ
5555
server.setMaxPlayers(Integer.parseInt(serverInfo[2]));
5656
server.setHostname(serverInfo[3]);
5757
server.setMode(serverInfo[4]);
58-
server.setLanguage(serverInfo[6]);
58+
server.setLanguage(serverInfo[5]);
5959
});
6060

6161
query.getServersRules().ifPresent(rules ->
@@ -97,17 +97,8 @@ public static void addServerToFavourites(final SampServer server)
9797
else
9898
{
9999
String statement = "INSERT INTO favourite(hostname, ip, lagcomp, language, players, maxplayers, mode, port, version, website) VALUES (''{0}'', ''{1}'', ''{2}'', ''{3}'', {4}, {5}, ''{6}'', {7}, ''{8}'', ''{9}'');";
100-
statement = escapeFormat(statement,
101-
server.getHostname(),
102-
server.getAddress(),
103-
server.getLagcomp(),
104-
server.getLanguage(),
105-
server.getPlayers().toString(),
106-
server.getMaxPlayers().toString(),
107-
server.getMode(),
108-
server.getPort().toString(),
109-
server.getVersion(),
110-
server.getWebsite());
100+
statement = escapeFormat(statement, server.getHostname(), server.getAddress(), server.getLagcomp(), server.getLanguage(), server.getPlayers().toString(), server
101+
.getMaxPlayers().toString(), server.getMode(), server.getPort().toString(), server.getVersion(), server.getWebsite());
111102
SQLDatabase.getInstance().execute(statement);
112103
}
113104
}
@@ -133,17 +124,8 @@ public static boolean isFavourite(final SampServer server)
133124
public static void updateServerData(final SampServer server)
134125
{
135126
String statement = "UPDATE favourite SET hostname = ''{0}'', lagcomp = ''{1}'', language = ''{2}'', players = {3}, maxplayers = {4}, mode = ''{5}'', version = ''{6}'', website = ''{7}'' WHERE ip = ''{8}'' AND port = {9};";
136-
statement = escapeFormat(statement,
137-
server.getHostname(),
138-
server.getLagcomp(),
139-
server.getLanguage(),
140-
server.getPlayers().toString(),
141-
server.getMaxPlayers().toString(),
142-
server.getMode(),
143-
server.getVersion(),
144-
server.getWebsite(),
145-
server.getAddress(),
146-
server.getPort().toString());
127+
statement = escapeFormat(statement, server.getHostname(), server.getLagcomp(), server.getLanguage(), server.getPlayers().toString(), server.getMaxPlayers()
128+
.toString(), server.getMode(), server.getVersion(), server.getWebsite(), server.getAddress(), server.getPort().toString());
147129
SQLDatabase.getInstance().execute(statement);
148130
}
149131

0 commit comments

Comments
 (0)