Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-11 09:51:43 +01:00
Code Issues Projects Releases Wiki Activity

Fixes mistakes not caught in the review of pull request.

Browse Source
This commit is contained in:
Rsl1122 2017-07-29 12:11:04 +03:00
parent f7f0a3f141
commit 75af8b58f8
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
View File

@ -59,7 +59,7 @@ public class InspectCommand extends SubCommand {
sCol + " Alias: /plan <name>" sCol + " Alias: /plan <name>"
}; };
setInDepthHelp(help); super.setInDepthHelp(help);
} }
@Override @Override

10
Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java
View File

@ -87,17 +87,19 @@ public class CommandUseTable extends Table {
Map<String, Integer> newData = new HashMap<>(data); Map<String, Integer> newData = new HashMap<>(data);
Map<String, Integer> saved = getCommandUse(); Map<String, Integer> saved = getCommandUse();
newData.keySet().removeAll(saved.keySet()); newData.keySet().removeAll(saved.keySet());
insertCommands(newData); insertCommands(newData);
Map<String, Integer> updateData = new HashMap<>(data); Map<String, Integer> updateData = new HashMap<>(data);
updateData.keySet().removeAll(newData.keySet()); updateData.keySet().removeAll(newData.keySet());
for (Map.Entry<String, Integer> entrySet : saved.entrySet()) {
String cmd = entrySet.getKey(); for (String cmd : saved.keySet()) {
Integer toSave = entrySet.getValue(); // IMPORTANT - not using saved as value
Integer toSave = updateData.get(cmd);
if (toSave == null || toSave > saved.get(cmd)) { if (toSave == null || toSave > saved.get(cmd)) {
continue; continue;
} }
updateData.remove(cmd); updateData.remove(cmd);
} }

8
Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
View File

@ -260,16 +260,16 @@ public class GMTimesTable extends Table {
+ columnSpectatorTime + columnSpectatorTime
+ ") VALUES (?, ?, ?, ?, ?)"); + ") VALUES (?, ?, ?, ?, ?)");
boolean commitRequired = false; boolean commitRequired = false;
for (Map.Entry<Integer, Map<String, Long>> entrySet : gamemodeTimes.entrySet()) { for (Map.Entry<Integer, Map<String, Long>> entry : gamemodeTimes.entrySet()) {
Integer id = entrySet.getKey(); Integer id = entry.getKey();
statement.setInt(1, id); statement.setInt(1, id);
for (int i = 0; i < gms.length; i++) { for (int i = 0; i < gms.length; i++) {
try { try {
Map<String, Long> times = entrySet.getValue(); Map<String, Long> times = entry.getValue();
Long time = times.get(gms[i]); Long time = times.get(gms[i]);
statement.setLong(i + 1, time != null ? time : 0); statement.setLong(i + 2, time != null ? time : 0);
} catch (NoSuchFieldError e) { } catch (NoSuchFieldError e) {
statement.setLong(i + 2, 0); statement.setLong(i + 2, 0);
} }

2
Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java
View File

@ -88,7 +88,7 @@ public class WebSocketServer {
trustManagerFactory.init(keystore); trustManagerFactory.init(keystore);
server = HttpsServer.create(new InetSocketAddress(port), 10); server = HttpsServer.create(new InetSocketAddress(port), 10);
SSLContext sslContext = SSLContext.getInstance("SSL"); SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
sslContext.init(keyManagerFactory.getKeyManagers(), null/*trustManagerFactory.getTrustManagers()*/, null); sslContext.init(keyManagerFactory.getKeyManagers(), null/*trustManagerFactory.getTrustManagers()*/, null);
((HttpsServer) server).setHttpsConfigurator(new HttpsConfigurator(sslContext) { ((HttpsServer) server).setHttpsConfigurator(new HttpsConfigurator(sslContext) {

3
Plan/src/test/java/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java
View File

@ -34,7 +34,8 @@ public class FormatUtilsTest {
* *
*/ */
@Before @Before
public void setUp() { public void setUp() throws Exception{
TestInit.init();
} }
/** /**