mirror of
https://github.com/PlaceholderAPI/PlaceholderAPI
synced 2026-02-26 05:51:12 +01:00
Merge branch 'hytale' into hytale-curseforge
This commit is contained in:
@@ -11,11 +11,9 @@ import com.hypixel.hytale.server.core.HytaleServer;
|
|||||||
import com.hypixel.hytale.server.core.command.system.CommandSender;
|
import com.hypixel.hytale.server.core.command.system.CommandSender;
|
||||||
import com.hypixel.hytale.server.core.console.ConsoleSender;
|
import com.hypixel.hytale.server.core.console.ConsoleSender;
|
||||||
import com.hypixel.hytale.server.core.event.events.BootEvent;
|
import com.hypixel.hytale.server.core.event.events.BootEvent;
|
||||||
import com.hypixel.hytale.server.core.event.events.PrepareUniverseEvent;
|
|
||||||
import com.hypixel.hytale.server.core.event.events.player.PlayerDisconnectEvent;
|
import com.hypixel.hytale.server.core.event.events.player.PlayerDisconnectEvent;
|
||||||
import com.hypixel.hytale.server.core.plugin.JavaPlugin;
|
import com.hypixel.hytale.server.core.plugin.JavaPlugin;
|
||||||
import com.hypixel.hytale.server.core.plugin.JavaPluginInit;
|
import com.hypixel.hytale.server.core.plugin.JavaPluginInit;
|
||||||
import com.hypixel.hytale.server.core.task.TaskRegistration;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.concurrent.ScheduledFuture;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public interface Configurable<T> {
|
|||||||
@NotNull
|
@NotNull
|
||||||
default T getConfig() {
|
default T getConfig() {
|
||||||
if (this instanceof PlaceholderExpansion exp) {
|
if (this instanceof PlaceholderExpansion exp) {
|
||||||
return (T) PlaceholderAPIPlugin.instance().configManager().config().expansions().getOrDefault(exp.getIdentifier(), provideDefault());
|
return (T) PlaceholderAPIPlugin.instance().configManager().config().expansions().computeIfAbsent(exp.getIdentifier(), s -> provideDefault());
|
||||||
}
|
}
|
||||||
|
|
||||||
return provideDefault();
|
return provideDefault();
|
||||||
|
|||||||
Reference in New Issue
Block a user