Skip to content

Commit e9bfb46

Browse files
committed
NPC API getters
1 parent 5e13d19 commit e9bfb46

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

core/src/main/java/me/pikamug/quests/dependencies/BukkitDenizenTrigger.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public boolean runDenizenScript(final String scriptName, final Quester quester,
3434
plugin.getLogger().severe("NPC UUID was null for Denizen script named " + scriptName);
3535
return false;
3636
}
37-
final NPC npc = ((BukkitCitizensDependency) plugin.getDependencies().getNpcDependency("Citizens")).getCitizens().getNPCRegistry().getByUniqueId(uuid);
37+
final NPC npc = ((BukkitCitizensDependency) plugin.getDependencies().getNpcDependency("Citizens")).getApi().getNPCRegistry().getByUniqueId(uuid);
3838
plugin.getDependencies().getDenizenApi().runTaskScript(scriptName, quester.getPlayer(), npc);
3939
} else {
4040
plugin.getDependencies().getDenizenApi().runTaskScript(scriptName, quester.getPlayer(), null);

core/src/main/java/me/pikamug/quests/dependencies/npc/citizens/BukkitCitizensDependency.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ public boolean isNpc(final UUID uuid) {
7070
return npcs;
7171
}
7272

73-
public CitizensPlugin getCitizens() {
74-
return citizens;
75-
}
76-
7773
@Override
7874
public boolean isNpc(final Entity entity) {
7975
return citizens.getNPCRegistry().isNPC(entity);
@@ -90,4 +86,8 @@ public boolean isNpc(final Entity entity) {
9086
final NPC npc = citizens.getNPCRegistry().getNPC(entity);
9187
return npc != null ? npc.getUniqueId() : null;
9288
}
89+
90+
public CitizensPlugin getApi() {
91+
return citizens;
92+
}
9393
}

core/src/main/java/me/pikamug/quests/dependencies/npc/znpcsplus/BukkitZnpcsPlusDependency.java

+4
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,8 @@ public boolean isNpc(final UUID uuid) {
8484
}
8585
return npcs;
8686
}
87+
88+
public NpcApi getApi() {
89+
return api;
90+
}
8791
}

core/src/main/java/me/pikamug/quests/dependencies/npc/znpcsplus/legacy/BukkitZnpcsPlusLegacyDependency.java

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.pikamug.quests.dependencies.npc.znpcsplus.legacy;
22

33
import io.github.znetworkw.znpcservers.npc.NPC;
4+
import lol.pyr.znpcsplus.ZNPCsPlus;
45
import me.pikamug.quests.BukkitQuestsPlugin;
56
import me.pikamug.quests.dependencies.npc.BukkitEntityNpcDependency;
67
import me.pikamug.quests.dependencies.npc.BukkitNpcDependency;
@@ -17,8 +18,10 @@
1718
import java.util.stream.Collectors;
1819

1920
public class BukkitZnpcsPlusLegacyDependency implements BukkitNpcDependency, BukkitEntityNpcDependency {
21+
private final ZNPCsPlus znpcsPlusLegacy;
2022

2123
public BukkitZnpcsPlusLegacyDependency(final BukkitQuestsPlugin plugin) {
24+
znpcsPlusLegacy = (ZNPCsPlus) plugin.getServer().getPluginManager().getPlugin("ZNPCsPlus");
2225
plugin.getServer().getPluginManager().registerEvents(new BukkitZnpcsPlusLegacyListener(plugin, this), plugin);
2326
}
2427

@@ -88,4 +91,8 @@ public boolean isNpc(final Entity entity) {
8891
final NPC npc = getNpc(entity);
8992
return npc != null ? npc.getUUID() : null;
9093
}
94+
95+
public ZNPCsPlus getApi() {
96+
return znpcsPlusLegacy;
97+
}
9198
}

0 commit comments

Comments
 (0)