Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 18:05:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting changes

Browse Source
This commit is contained in:
KingRainbow44
2022-04-28 22:21:30 -04:00
parent e666dede7e
commit d701613831
11 changed files with 36 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
View File

@@ -30,6 +30,7 @@ import java.net.BindException;
import java.net.InetSocketAddress;
import java.net.URI;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.util.*;
@@ -243,10 +244,9 @@ public final class DispatchServer {
try {
kmf = createKeyManagerFactory(keystoreFile, "123456");
Grasscutter.getLogger().warn(
"[Dispatch] The default keystore password was loaded successfully. Please consider setting the password to 123456 in config.json.");
"[Dispatch] The default keystore password was loaded successfully. Please consider setting the password to '123456' in config.json.");
} catch (Exception e2) {
Grasscutter.getLogger().warn("[Dispatch] Error while loading keystore!");
e2.printStackTrace();
Grasscutter.getLogger().warn("[Dispatch] Error while loading keystore!", e2);
}
}
}
@@ -339,10 +339,6 @@ public final class DispatchServer {
// added.
account = DatabaseHelper.createAccountWithId(requestData.account, 0);
for (String permission : Grasscutter.getConfig().getDispatchOptions().defaultPermissions) {
account.addPermission(permission);
}
if (account != null) {
responseData.message = "OK";
responseData.data.account.uid = account.getId();
@@ -352,6 +348,9 @@ public final class DispatchServer {
Grasscutter.getLogger()
.info(String.format("[Dispatch] Client %s failed to log in: Account %s created",
t.getRemoteAddress(), responseData.data.account.uid));
for (String permission : Grasscutter.getConfig().getDispatchOptions().defaultPermissions) {
account.addPermission(permission);
}
} else {
responseData.retcode = -201;
responseData.message = "Username not found, create failed.";
@@ -575,15 +574,11 @@ public final class DispatchServer {
if (next > last) {
int eqPos = qs.indexOf('=', last);
try {
if (eqPos < 0 || eqPos > next) {
result.put(URLDecoder.decode(qs.substring(last, next), "utf-8"), "");
} else {
result.put(URLDecoder.decode(qs.substring(last, eqPos), "utf-8"),
URLDecoder.decode(qs.substring(eqPos + 1, next), "utf-8"));
}
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e); // will never happen, utf-8 support is mandatory for java
if (eqPos < 0 || eqPos > next) {
result.put(URLDecoder.decode(qs.substring(last, next), StandardCharsets.UTF_8), "");
} else {
result.put(URLDecoder.decode(qs.substring(last, eqPos), StandardCharsets.UTF_8),
URLDecoder.decode(qs.substring(eqPos + 1, next), StandardCharsets.UTF_8));
}
}
last = next + 1;

2
src/main/java/emu/grasscutter/server/event/dispatch/QueryAllRegionsEvent.java
View File

@@ -1,6 +1,6 @@
package emu.grasscutter.server.event.dispatch;
import emu.grasscutter.server.event.ServerEvent;
import emu.grasscutter.server.event.types.ServerEvent;
public final class QueryAllRegionsEvent extends ServerEvent {
private String regionList;

2
src/main/java/emu/grasscutter/server/event/dispatch/QueryCurrentRegionEvent.java
View File

@@ -1,6 +1,6 @@
package emu.grasscutter.server.event.dispatch;
import emu.grasscutter.server.event.ServerEvent;
import emu.grasscutter.server.event.types.ServerEvent;
public final class QueryCurrentRegionEvent extends ServerEvent {
private String regionInfo;

2
src/main/java/emu/grasscutter/server/event/game/ReceivePacketEvent.java
View File

@@ -1,7 +1,7 @@
package emu.grasscutter.server.event.game;
import emu.grasscutter.server.event.Cancellable;
import emu.grasscutter.server.event.ServerEvent;
import emu.grasscutter.server.event.types.ServerEvent;
import emu.grasscutter.server.game.GameSession;
public final class ReceivePacketEvent extends ServerEvent implements Cancellable {

2
src/main/java/emu/grasscutter/server/game/GameServer.java
View File

@@ -17,7 +17,7 @@ import emu.grasscutter.game.world.World;
import emu.grasscutter.net.packet.PacketHandler;
import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
import emu.grasscutter.netty.KcpServer;
import emu.grasscutter.server.event.ServerEvent;
import emu.grasscutter.server.event.types.ServerEvent;
import emu.grasscutter.server.event.game.ServerTickEvent;
import emu.grasscutter.server.event.internal.ServerStartEvent;
import emu.grasscutter.server.event.internal.ServerStopEvent;