Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-02-20 05:21:22 +01:00
Code Issues Projects Releases Wiki Activity

fix core registration

Browse Source
This commit is contained in:
jascotty2 2019-09-11 05:50:43 -05:00
parent c023c73ddd
commit ae592242a2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/songoda/core/SongodaCore.java
View File

@ -21,6 +21,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Level;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -46,7 +47,7 @@ public class SongodaCore {
* Whenever we make a major change to the core GUI, updater, * Whenever we make a major change to the core GUI, updater,
* or other function used by the core, increment this number * or other function used by the core, increment this number
*/ */
private final static int coreRevision = 5; private final static int coreRevision = 6;
private final static int updaterVersion = 1; private final static int updaterVersion = 1;
private final static Set<PluginInfo> registeredPlugins = new HashSet<>(); private final static Set<PluginInfo> registeredPlugins = new HashSet<>();
@ -114,15 +115,16 @@ public class SongodaCore {
} }
return; return;
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) { } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
plugin.getLogger().log(Level.WARNING, "Error registering core service", ignored);
} }
} }
} }
// register ourselves as the SongodaCore service! // register ourselves as the SongodaCore service!
INSTANCE = new SongodaCore(plugin); INSTANCE = new SongodaCore(plugin);
INSTANCE.init(); INSTANCE.init();
INSTANCE.register(plugin, pluginID, icon);
Bukkit.getServicesManager().register(SongodaCore.class, INSTANCE, plugin, ServicePriority.Normal); Bukkit.getServicesManager().register(SongodaCore.class, INSTANCE, plugin, ServicePriority.Normal);
} }
INSTANCE.register(plugin, pluginID, icon);
} }
SongodaCore() { SongodaCore() {
@ -154,9 +156,9 @@ public class SongodaCore {
private void destroy() { private void destroy() {
Bukkit.getServicesManager().unregister(SongodaCore.class, INSTANCE); Bukkit.getServicesManager().unregister(SongodaCore.class, INSTANCE);
tasks.stream().filter(task -> task != null && !task.isCancelled()) tasks.stream().filter(task -> task != null && !task.isCancelled())
.forEach(task -> Bukkit.getScheduler().cancelTask(task.getTaskId())); .forEach(task -> Bukkit.getScheduler().cancelTask(task.getTaskId()));
HandlerList.unregisterAll(loginListener); HandlerList.unregisterAll(loginListener);
if(!hasShading()) { if (!hasShading()) {
HandlerList.unregisterAll(shadingListener); HandlerList.unregisterAll(shadingListener);
} }
registeredPlugins.clear(); registeredPlugins.clear();