Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-17 01:44:07 +02:00
Code Issues Projects Releases Wiki Activity

Delay registry check in-case Citizens is slow to enable

Browse Source
This commit is contained in:
PikaMug 2019-04-22 23:42:46 -04:00
parent 1ff72d811d
commit 4f921c1c5f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/java/me/blackvein/quests/Dependencies.java
View File

@ -78,6 +78,10 @@ public class Dependencies {
return citizens; return citizens;
} }
public void disableCitizens() {
citizens = null;
}
public Denizen getDenizen() { public Denizen getDenizen() {
return denizen; return denizen;
} }
@ -109,9 +113,6 @@ public class Dependencies {
try { try {
if (isPluginAvailable("Citizens")) { if (isPluginAvailable("Citizens")) {
citizens = (CitizensPlugin) plugin.getServer().getPluginManager().getPlugin("Citizens"); citizens = (CitizensPlugin) plugin.getServer().getPluginManager().getPlugin("Citizens");
if (citizens.getNPCRegistry() == null) {
citizens = null;
}
} }
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().warning("Legacy version of Citizens found. Citizens in Quests not enabled."); plugin.getLogger().warning("Legacy version of Citizens found. Citizens in Quests not enabled.");

6
main/src/main/java/me/blackvein/quests/Quests.java
View File

@ -477,6 +477,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
+ ", " + events.size() + " Event(s)" + ", " + events.size() + " Event(s)"
+ ", " + Lang.size() + " Phrase(s)"); + ", " + Lang.size() + " Phrase(s)");
questers.addAll(getOnlineQuesters()); questers.addAll(getOnlineQuesters());
if (depends.getCitizens() != null) {
if (depends.getCitizens().getNPCRegistry() == null) {
getLogger().log(Level.SEVERE, "Citizens was enabled but NPCRegistry was null. Disabling linkage.");
depends.disableCitizens();
}
}
loadModules(); loadModules();
} }
}, 5L); }, 5L);