Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität

Fix double Discord command registration, ConnectionListener and bau member commands

Quellcode durchsuchen 
Signed-off-by: Lixfel <git-5w3l@lixfel.de>
Dieser Commit ist enthalten in:
Lixfel 2024-06-28 15:37:31 +02:00
Ursprung 0ef4fc147c
Commit 8c098841ba
5 geänderte Dateien mit 8 neuen und 14 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

3
src/de/steamwar/velocitycore/ErrorLogger.java
Datei anzeigen

@ -73,7 +73,8 @@ public class ErrorLogger extends AbstractAppender {
}
private static final List<String> filteredMessages = List.of(
"read timed out"
"read timed out",
"disconnected while connecting to Lobby"
);
private static final List<String> filteredStacktraces = List.of(
"ErrorLogger",

2
src/de/steamwar/velocitycore/commands/BauCommand.java
Datei anzeigen

@ -175,7 +175,7 @@ public class BauCommand extends SWCommand {
return new TypeMapper<SteamwarUser>() {
@Override
public SteamwarUser map(Chatter sender, PreviousArguments previousArguments, String s) {
return sender.user();
return SteamwarUser.get(s);
}
@Override

3
src/de/steamwar/velocitycore/discord/DiscordBot.java
Datei anzeigen

@ -170,10 +170,7 @@ public class DiscordBot {
}
}).repeat(30, TimeUnit.SECONDS).schedule();
Guild guild = getGuild();
commandSetup(jda.retrieveCommands(), jda.updateCommands());
commandSetup(guild.retrieveCommands(), guild.updateCommands());
jda.addEventListener(
new DiscordTicketHandler(),
new DiscordTeamEvent(),

5
src/de/steamwar/velocitycore/listeners/BanListener.java
Datei anzeigen

@ -22,13 +22,12 @@ package de.steamwar.velocitycore.listeners;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.LoginEvent;
import com.velocitypowered.api.proxy.Player;
import de.steamwar.velocitycore.commands.PunishmentCommand;
import de.steamwar.velocitycore.commands.WebpasswordCommand;
import de.steamwar.messages.Chatter;
import de.steamwar.messages.Message;
import de.steamwar.sql.BannedUserIPs;
import de.steamwar.sql.Punishment;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.velocitycore.commands.PunishmentCommand;
import net.kyori.adventure.text.event.ClickEvent;
import java.sql.Timestamp;
@ -42,7 +41,7 @@ public class BanListener extends BasicListener {
@Subscribe
public void onLogin(LoginEvent event) {
Player player = event.getPlayer();
SteamwarUser user = SteamwarUser.getOrCreate(player.getUniqueId(), player.getUsername(), ConnectionListener::newPlayer, WebpasswordCommand::changeUsername);
SteamwarUser user = SteamwarUser.get(player.getUniqueId());
String ip = IPSanitizer.getTrueAddress(player).getHostAddress();
if (user.isPunished(Punishment.PunishmentType.Ban)) {
BannedUserIPs.banIP(user.getId(), ip);

9
src/de/steamwar/velocitycore/listeners/ConnectionListener.java
Datei anzeigen

@ -31,10 +31,7 @@ import de.steamwar.persistent.Servertype;
import de.steamwar.persistent.Subserver;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserPerm;
import de.steamwar.velocitycore.commands.ChallengeCommand;
import de.steamwar.velocitycore.commands.CheckCommand;
import de.steamwar.velocitycore.commands.ModCommand;
import de.steamwar.velocitycore.commands.MsgCommand;
import de.steamwar.velocitycore.commands.*;
import de.steamwar.velocitycore.discord.DiscordBot;
import de.steamwar.velocitycore.discord.util.DiscordRanks;
import de.steamwar.velocitycore.mods.ModUtils;
@ -57,10 +54,10 @@ public class ConnectionListener extends BasicListener {
@Subscribe
public void onPermissionSetup(PermissionsSetupEvent event) {
event.setProvider(subject -> {
if(!(subject instanceof Player))
if(!(subject instanceof Player player))
return perm -> Tristate.TRUE;
Set<UserPerm> perms = SteamwarUser.get(((Player) subject).getUniqueId()).perms();
Set<UserPerm> perms = SteamwarUser.getOrCreate(player.getUniqueId(), player.getUsername(), ConnectionListener::newPlayer, WebpasswordCommand::changeUsername).perms();
if(perms.contains(UserPerm.ADMINISTRATION))
return perm -> Tristate.TRUE;
else if(perms.contains(UserPerm.TEAM))