Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 01:21:30 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes & class updates

Browse Source
This commit is contained in:
KingRainbow44 2022-04-28 21:54:51 -04:00
parent ffe215a739
commit e2d6e695dc
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/Account.java
View File

@ -104,7 +104,7 @@ public class Account {
}
public boolean hasPermission(String permission) {
return this.permissions.contains(permission) || this.permissions.contains("*") ? true : false;
return this.permissions.contains(permission) || this.permissions.contains("*");
}
public boolean removePermission(String permission) {

8
src/main/java/emu/grasscutter/plugin/api/ServerHook.java
View File

@ -2,7 +2,7 @@ package emu.grasscutter.plugin.api;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.game.GenshinPlayer;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.dispatch.DispatchServer;
import emu.grasscutter.server.game.GameServer;
@ -33,7 +33,7 @@ public final class ServerHook {
public ServerHook(GameServer gameServer, DispatchServer dispatchServer) {
this.gameServer = gameServer;
this.dispatchServer = dispatchServer;
instance = this;
}
@ -50,12 +50,12 @@ public final class ServerHook {
public DispatchServer getDispatchServer() {
return this.dispatchServer;
}
/**
* Gets all online players.
* @return Players connected to the server.
*/
public List<GenshinPlayer> getOnlinePlayers() {
public List<Player> getOnlinePlayers() {
return new LinkedList<>(this.gameServer.getPlayers().values());
}

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

@ -209,7 +209,7 @@ public final class DispatchServer {
return null;
}
private KeyManagerFactory createKeyManagerFactory(File keystore, String password) throws Exception {
private KeyManagerFactory createKeyManagerFactory(File keystore, String password) {
char[] pass = password.toCharArray();
KeyManagerFactory kmf = null;
@ -220,8 +220,8 @@ public final class DispatchServer {
kmf = KeyManagerFactory.getInstance("SunX509");
kmf.init(ks, pass);
} catch (Exception e) {
throw e;
} catch (Exception exception) {
Grasscutter.getLogger().error("Unable to load keystore.", exception);
}
return kmf;
@ -257,7 +257,7 @@ public final class DispatchServer {
server = this.safelyCreateServer(this.getAddress());
}
HttpsServer httpsServer = null;
HttpsServer httpsServer;
try {
httpsServer = HttpsServer.create(getAddress(), 0);