Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-05 07:57:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix folia init tasks never getting called LOLW

Browse Source
This commit is contained in:
Josh Roy 2023-04-26 21:28:33 -04:00
parent 9133dce3eb
commit 4256909eee
No known key found for this signature in database
GPG Key ID: 86A69D08540BC29A
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Essentials/src/main/java/com/earth2me/essentials/Essentials.java
View File

@ -467,6 +467,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
} }
execTimer.mark("Init(Providers)"); execTimer.mark("Init(Providers)");
registerListeners(getServer().getPluginManager());
reload(); reload();
// The item spawn blacklist is loaded with all other settings, before the item // The item spawn blacklist is loaded with all other settings, before the item
@ -526,8 +527,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
} }
private void registerListeners(final PluginManager pm) { private void registerListeners(final PluginManager pm) {
HandlerList.unregisterAll(this);
if (getSettings().isDebug()) { if (getSettings().isDebug()) {
LOGGER.log(Level.INFO, "Registering Listeners"); LOGGER.log(Level.INFO, "Registering Listeners");
} }
@ -629,9 +628,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
command.setUsage(tl(commandName + "CommandUsage")); command.setUsage(tl(commandName + "CommandUsage"));
} }
} }
final PluginManager pm = getServer().getPluginManager();
registerListeners(pm);
} }
private IEssentialsCommand loadCommand(final String path, final String name, final IEssentialsModule module, final ClassLoader classLoader) throws Exception { private IEssentialsCommand loadCommand(final String path, final String name, final IEssentialsModule module, final ClassLoader classLoader) throws Exception {

1
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
View File

@ -728,6 +728,7 @@ public class Commandessentials extends EssentialsCommand {
sender.sendMessage(tl(serverMessageKey, "Server", server.getBukkitVersion() + " " + server.getVersion())); sender.sendMessage(tl(serverMessageKey, "Server", server.getBukkitVersion() + " " + server.getVersion()));
sender.sendMessage(tl(serverMessageKey, "Brand", server.getName())); sender.sendMessage(tl(serverMessageKey, "Brand", server.getName()));
sender.sendMessage(tl("versionOutputFlags", "FOLIA:" + VersionUtil.FOLIA + ",FLAT:" + VersionUtil.PRE_FLATTENING + ",SUPSTAT:" + VersionUtil.getServerSupportStatus().name()));
sender.sendMessage(tl("versionOutputFine", "EssentialsX", essVer)); sender.sendMessage(tl("versionOutputFine", "EssentialsX", essVer));
for (final Plugin plugin : pm.getPlugins()) { for (final Plugin plugin : pm.getPlugins()) {

1
Essentials/src/main/resources/messages.properties
View File

@ -1483,6 +1483,7 @@ versionErrorPlayer=\u00a76Error while checking EssentialsX version information!
versionFetching=\u00a76Fetching version information... versionFetching=\u00a76Fetching version information...
versionOutputVaultMissing=\u00a74Vault is not installed. Chat and permissions may not work. versionOutputVaultMissing=\u00a74Vault is not installed. Chat and permissions may not work.
versionOutputFine=\u00a76{0} version: \u00a7a{1} versionOutputFine=\u00a76{0} version: \u00a7a{1}
versionOutputFlags=\u00a76Feature Flags: \u00a7a{0}
versionOutputWarn=\u00a76{0} version: \u00a7c{1} versionOutputWarn=\u00a76{0} version: \u00a7c{1}
versionOutputUnsupported=\u00a7d{0} \u00a76version: \u00a7d{1} versionOutputUnsupported=\u00a7d{0} \u00a76version: \u00a7d{1}
versionOutputUnsupportedPlugins=\u00a76You are running \u00a7dunsupported plugins\u00a76! versionOutputUnsupportedPlugins=\u00a76You are running \u00a7dunsupported plugins\u00a76!