mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-09-19 02:11:55 +02:00
Fix
This commit is contained in:
parent
1994683e47
commit
680717dbca
@ -140,19 +140,22 @@ public class AuthMe extends JavaPlugin {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
|
|
||||||
|
// TODO: split the plugin in more modules
|
||||||
|
// TODO: remove vault as hard dependency
|
||||||
|
|
||||||
server = getServer();
|
server = getServer();
|
||||||
PluginManager pm = server.getPluginManager();
|
PluginManager pm = server.getPluginManager();
|
||||||
|
|
||||||
authme = this;
|
// Setup the Logger
|
||||||
authmeLogger.setParent(this.getLogger());
|
authmeLogger.setParent(this.getLogger());
|
||||||
m = Messages.getInstance();
|
|
||||||
|
|
||||||
|
// Set the Instance
|
||||||
|
authme = this;
|
||||||
|
|
||||||
|
// Setup otherAccounts file
|
||||||
otherAccounts = OtherAccounts.getInstance();
|
otherAccounts = OtherAccounts.getInstance();
|
||||||
|
|
||||||
// TODOs
|
|
||||||
// TODO: split the plugin in more modules
|
|
||||||
// TODO: remove vault as hard dependency
|
|
||||||
|
|
||||||
// Load settings and custom configurations
|
// Load settings and custom configurations
|
||||||
// TODO: new configuration style (more files)
|
// TODO: new configuration style (more files)
|
||||||
try {
|
try {
|
||||||
@ -162,7 +165,6 @@ public class AuthMe extends JavaPlugin {
|
|||||||
this.getServer().shutdown();
|
this.getServer().shutdown();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configuration Security Warnings
|
// Configuration Security Warnings
|
||||||
if (!Settings.isForceSingleSessionEnabled) {
|
if (!Settings.isForceSingleSessionEnabled) {
|
||||||
ConsoleLogger.showError("WARNING!!! By disabling ForceSingleSession, your server protection is inadequate!");
|
ConsoleLogger.showError("WARNING!!! By disabling ForceSingleSession, your server protection is inadequate!");
|
||||||
@ -171,6 +173,9 @@ public class AuthMe extends JavaPlugin {
|
|||||||
ConsoleLogger.showError("WARNING!!! You set session timeout to 0, this may cause security issues!");
|
ConsoleLogger.showError("WARNING!!! You set session timeout to 0, this may cause security issues!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Setup messages
|
||||||
|
m = Messages.getInstance();
|
||||||
|
|
||||||
// Start the metrics service
|
// Start the metrics service
|
||||||
// TODO: add a setting to disable metrics
|
// TODO: add a setting to disable metrics
|
||||||
try {
|
try {
|
||||||
@ -435,7 +440,7 @@ public class AuthMe extends JavaPlugin {
|
|||||||
|
|
||||||
// Check the presence of the Vault plugin and a permissions provider
|
// Check the presence of the Vault plugin and a permissions provider
|
||||||
public void checkVault() {
|
public void checkVault() {
|
||||||
if (server.getPluginManager().getPlugin("Vault").isEnabled()) {
|
if (server.getPluginManager().isPluginEnabled("Vault")) {
|
||||||
RegisteredServiceProvider<Permission> permissionProvider = server.getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
|
RegisteredServiceProvider<Permission> permissionProvider = server.getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
|
||||||
if (permissionProvider != null) {
|
if (permissionProvider != null) {
|
||||||
permission = permissionProvider.getProvider();
|
permission = permissionProvider.getProvider();
|
||||||
@ -450,7 +455,7 @@ public class AuthMe extends JavaPlugin {
|
|||||||
|
|
||||||
// Check the version of the ChestShop plugin
|
// Check the version of the ChestShop plugin
|
||||||
public void checkChestShop() {
|
public void checkChestShop() {
|
||||||
if (Settings.legacyChestShop && server.getPluginManager().getPlugin("ChestShop").isEnabled()) {
|
if (Settings.legacyChestShop && server.getPluginManager().isPluginEnabled("ChestShop")) {
|
||||||
try {
|
try {
|
||||||
String rawver = com.Acrobot.ChestShop.ChestShop.getVersion();
|
String rawver = com.Acrobot.ChestShop.ChestShop.getVersion();
|
||||||
double version = 0;
|
double version = 0;
|
||||||
@ -481,7 +486,7 @@ public class AuthMe extends JavaPlugin {
|
|||||||
|
|
||||||
// Check PerWorldInventories version
|
// Check PerWorldInventories version
|
||||||
public void checkPerWorldInventories() {
|
public void checkPerWorldInventories() {
|
||||||
if (server.getPluginManager().getPlugin("PerWorldInventories").isEnabled()) {
|
if (server.getPluginManager().isPluginEnabled("PerWorldInventories")) {
|
||||||
try {
|
try {
|
||||||
double version = 0;
|
double version = 0;
|
||||||
String ver = server.getPluginManager().getPlugin("PerWorldInventories").getDescription().getVersion();
|
String ver = server.getPluginManager().getPlugin("PerWorldInventories").getDescription().getVersion();
|
||||||
@ -503,7 +508,7 @@ public class AuthMe extends JavaPlugin {
|
|||||||
|
|
||||||
// Get the Multiverse plugin
|
// Get the Multiverse plugin
|
||||||
public void checkMultiverse() {
|
public void checkMultiverse() {
|
||||||
if (Settings.multiverse && this.getServer().getPluginManager().isPluginEnabled("Multiverse-Core")) {
|
if (Settings.multiverse && server.getPluginManager().isPluginEnabled("Multiverse-Core")) {
|
||||||
try {
|
try {
|
||||||
multiverse = (MultiverseCore) server.getPluginManager().getPlugin("Multiverse-Core");
|
multiverse = (MultiverseCore) server.getPluginManager().getPlugin("Multiverse-Core");
|
||||||
ConsoleLogger.info("Hooked correctly with Multiverse-Core");
|
ConsoleLogger.info("Hooked correctly with Multiverse-Core");
|
||||||
|
@ -12,7 +12,6 @@ import java.util.regex.PatternSyntaxException;
|
|||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
|
Loading…
Reference in New Issue
Block a user