Upstream
/
Advanced-Portals
mirror of https://github.com/sekwah41/Advanced-Portals.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: detect new velocity setting location

This commit is contained in:
Sekwah 2023-01-21 03:21:49 +00:00
parent 1ec77035a2
commit 71fe36c324
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java
View File

@ -12,11 +12,14 @@ import com.sekwah.advancedportals.bungee.BungeeMessages;
import org.bukkit.Bukkit;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
public class AdvancedPortalsPlugin extends JavaPlugin {
@ -154,9 +157,9 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
// Will be valid if paperspigot is being used. Otherwise catch.
try {
ConfigurationSection configSelection = getServer().spigot().getPaperConfig().getConfigurationSection("settings");
ConfigurationSection velocity = configSelection != null ? configSelection.getConfigurationSection("velocity-support") : null;
if (velocity != null && velocity.getBoolean("enabled") ) {
YamlConfiguration config = getServer().spigot().getPaperConfig();
if(Objects.equals(config.get("velocity-support.enabled"),true)
|| Objects.equals(config.get("proxies.velocity.enabled"),true)) {
getLogger().info( "Modern forwarding detected. Enabling proxy features." );
return true;
}
@ -164,8 +167,8 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
if(!disableProxyWarning) getLogger().info("Paper config not detected, ignoring paper settings");
}
if(!disableProxyWarning) getLogger().warning( "Proxy features disabled for Advanced Portals as bungee isn't enabled on the server (spigot.yml) " +
"or if you are using Paper settings.velocity-support.enabled may not be enabled (paper.yml)" );
if(!disableProxyWarning) getLogger().warning( "Proxy features disabled for Advanced Portals as bungee isn't enabled on the server (spigot.yml)." +
"If you are using Paper proxies.velocity.enabled (config/paper-global.yml) or settings.velocity-support.enabled (paper.yml) may not be enabled " );
return false;
}