Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-16 20:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Avoid double registration of NPC event listener

Browse Source
This commit is contained in:
PikaMug 2021-02-04 22:33:52 -05:00
parent 335360b640
commit df564644cf
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@ import java.util.UUID;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.RegisteredListener;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import com.alessiodp.parties.api.Parties; import com.alessiodp.parties.api.Parties;
@ -29,6 +31,7 @@ import com.herocraftonline.heroes.Heroes;
import com.herocraftonline.heroes.characters.Hero; import com.herocraftonline.heroes.characters.Hero;
import de.erethon.dungeonsxl.DungeonsXL; import de.erethon.dungeonsxl.DungeonsXL;
import me.blackvein.quests.listeners.NpcListener;
import me.blackvein.quests.reflect.denizen.DenizenAPI; import me.blackvein.quests.reflect.denizen.DenizenAPI;
import me.blackvein.quests.reflect.worldguard.WorldGuardAPI; import me.blackvein.quests.reflect.worldguard.WorldGuardAPI;
import me.blackvein.quests.util.Lang; import me.blackvein.quests.util.Lang;
@ -125,29 +128,37 @@ public class Dependencies {
public CitizensPlugin getCitizens() { public CitizensPlugin getCitizens() {
if (citizens == null) { if (citizens == null) {
enableCitizens(); linkCitizens();
} }
return citizens; return citizens;
} }
public void enableCitizens() { public void linkCitizens() {
if (isPluginAvailable("Citizens")) { if (isPluginAvailable("Citizens")) {
try { try {
citizens = (CitizensPlugin) plugin.getServer().getPluginManager().getPlugin("Citizens"); citizens = (CitizensPlugin) plugin.getServer().getPluginManager().getPlugin("Citizens");
plugin.getServer().getPluginManager().registerEvents(plugin.getNpcListener(), plugin); boolean found = false;
if (plugin.getSettings().canNpcEffects()) { for (final RegisteredListener listener : HandlerList.getRegisteredListeners(plugin)) {
plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, plugin.getNpcEffectThread(), if (listener.getListener() instanceof NpcListener) {
20, 20); found = true;
}
}
if (!found) {
plugin.getServer().getPluginManager().registerEvents(plugin.getNpcListener(), plugin);
if (plugin.getSettings().canNpcEffects()) {
plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, plugin.getNpcEffectThread(),
20, 20);
}
plugin.getLogger().info("Successfully linked Quests with Citizens "
+ citizens.getDescription().getVersion());
} }
plugin.getLogger().info("Successfully linked Quests with Citizens "
+ citizens.getDescription().getVersion());
} catch (final Exception e) { } catch (final 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.");
} }
} }
} }
public void disableCitizens() { public void unlinkCitizens() {
citizens = null; citizens = null;
} }

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

@ -217,7 +217,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
// 10 - Register listeners // 10 - Register listeners
getServer().getPluginManager().registerEvents(blockListener, this); getServer().getPluginManager().registerEvents(blockListener, this);
getServer().getPluginManager().registerEvents(itemListener, this); getServer().getPluginManager().registerEvents(itemListener, this);
depends.enableCitizens(); depends.linkCitizens();
getServer().getPluginManager().registerEvents(playerListener, this); getServer().getPluginManager().registerEvents(playerListener, this);
if (settings.getStrictPlayerMovement() > 0) { if (settings.getStrictPlayerMovement() > 0) {
final long ticks = settings.getStrictPlayerMovement() * 20; final long ticks = settings.getStrictPlayerMovement() * 20;
@ -650,7 +650,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
if (depends.getCitizens().getNPCRegistry() == null) { if (depends.getCitizens().getNPCRegistry() == null) {
getLogger().log(Level.SEVERE, getLogger().log(Level.SEVERE,
"Citizens was enabled but NPCRegistry was null. Disabling linkage."); "Citizens was enabled but NPCRegistry was null. Disabling linkage.");
depends.disableCitizens(); depends.unlinkCitizens();
} }
} }
loadModules(); loadModules();