Skip to content

Commit 28212f9

Browse files
committed
misc: Some code improvements
1 parent e42cd0f commit 28212f9

3 files changed

Lines changed: 8 additions & 13 deletions

File tree

src/main/java/io/github/_4drian3d/authmevelocity/lastserver/configuration/ConfigurationContainer.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
public final class ConfigurationContainer<C> {
1212
private final AtomicReference<C> config;
1313

14-
private ConfigurationContainer(
15-
final C config
16-
) {
14+
private ConfigurationContainer(final C config) {
1715
this.config = new AtomicReference<>(config);
1816
}
1917

@@ -27,9 +25,7 @@ public static <C> ConfigurationContainer<C> load(Path path, Class<C> clazz) thro
2725
final HoconConfigurationLoader loader = HoconConfigurationLoader.builder()
2826
.defaultOptions(opts -> opts
2927
.shouldCopyDefaults(true)
30-
.header("""
31-
AuthMeVelocity-LastServer-Addon | by 4drian3d
32-
""")
28+
.header("AuthMeVelocity-LastServer-Addon | by 4drian3d")
3329
)
3430
.path(path)
3531
.build();

src/main/java/io/github/_4drian3d/authmevelocity/lastserver/database/Database.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CREATE TABLE IF NOT EXISTS last_server(\
2929

3030
private final HikariDataSource source;
3131
private final Logger logger;
32+
3233
@Inject
3334
public Database(
3435
final @DataDirectory Path dataDirectory,

src/main/java/io/github/_4drian3d/authmevelocity/lastserver/listener/DisconnectListener.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.jetbrains.annotations.Nullable;
1313

1414
import java.util.List;
15+
import java.util.function.Predicate;
1516

1617
public final class DisconnectListener implements LastLoginListener<DisconnectEvent> {
1718
@Inject
@@ -33,15 +34,12 @@ public void register() {
3334
}
3435
return EventTask.async(() -> {
3536
final Player player = event.getPlayer();
36-
final String server = player.getCurrentServer()
37+
final List<String> excludedServers = plugin.config().get().getExcludedServers();
38+
player.getCurrentServer()
3739
.map(ServerConnection::getServerInfo)
3840
.map(ServerInfo::getName)
39-
.orElse("");
40-
41-
List<String> excludedServers = plugin.config().get().getExcludedServers();
42-
if (!excludedServers.contains(server)) {
43-
database.setLastServer(player.getUsername(), server);
44-
}
41+
.filter(Predicate.not(excludedServers::contains))
42+
.ifPresent(server -> database.setLastServer(player.getUsername(), server));
4543
});
4644
}
4745
}

0 commit comments

Comments
 (0)