Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor BanService#ban

Browse Source
This commit is contained in:
P0nk
2024-10-02 06:54:55 +02:00
parent 5d81e05458
commit e38344ceae
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/service/BanService.java
View File

@@ -91,29 +91,43 @@ public class BanService {
private void ban(Client c, String victimName, Duration duration, byte reason, String description) { private void ban(Client c, String victimName, Duration duration, byte reason, String description) {
Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(victimName); Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(victimName);
boolean success;
if (victim == null) { if (victim == null) {
Optional<Integer> foundAccountId = accountService.getAccountIdByChrName(victimName); success = banOfflineChr(victimName, duration, reason, description);
if (foundAccountId.isEmpty()) {
c.sendPacket(PacketCreator.getGMEffect(6, (byte) 1));
return;
}
saveBan(foundAccountId.get(), duration, reason, description);
} else { } else {
victim.setBanned(); success = banOnlineChr(c, victim, duration, reason, description);
String readableName = Character.makeMapleReadable(victimName);
String ip = victim.getClient().getRemoteAddress();
String enrichedDescription = "[%s] %s (IP: %s)".formatted(description, readableName, ip);
saveBan(victim.getAccountID(), duration, reason, enrichedDescription);
victim.sendPacket(PacketCreator.sendPolice("You have been banned by %s.".formatted(c.getPlayer().getName())));
TimerManager.getInstance().schedule(() -> transitionService.disconnect(c, false),
TimeUnit.SECONDS.toMillis(5));
} }
if (!success) {
c.sendPacket(PacketCreator.getGMEffect(6, (byte) 1));
return;
}
c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0)); c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "%s has been banned.".formatted(victimName))); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "%s has been banned.".formatted(victimName)));
} }
private boolean banOfflineChr(String victimName, Duration duration, byte reason, String description) {
Optional<Integer> foundAccountId = accountService.getAccountIdByChrName(victimName);
if (foundAccountId.isEmpty()) {
return false;
}
saveBan(foundAccountId.get(), duration, reason, description);
return true;
}
private boolean banOnlineChr(Client c, Character victim, Duration duration, byte reason, String description) {
victim.setBanned();
String readableName = Character.makeMapleReadable(victim.getName());
String ip = victim.getClient().getRemoteAddress();
String enrichedDescription = "[%s] %s (IP: %s)".formatted(description, readableName, ip);
saveBan(victim.getAccountID(), duration, reason, enrichedDescription);
victim.sendPacket(PacketCreator.sendPolice("You have been banned by %s.".formatted(c.getPlayer().getName())));
TimerManager.getInstance().schedule(() -> transitionService.disconnect(c, false),
TimeUnit.SECONDS.toMillis(5));
return true;
}
private void saveBan(int accountId, Duration duration, byte reason, String description) { private void saveBan(int accountId, Duration duration, byte reason, String description) {
final Instant bannedUntil; final Instant bannedUntil;
if (duration != null) { if (duration != null) {