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

Turn NPC methods public

Browse Source
This commit is contained in:
PikaMug 2025-03-01 11:40:53 -05:00
parent acb0798320
commit 3995aad54f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/me/pikamug/quests/listeners/BukkitNpcListener.java
View File

@ -38,7 +38,7 @@ public abstract class BukkitNpcListener implements Listener {
this.npcDependency = npcDependency;
}
protected void onNpcInteract(Player player, UUID npcId, ClickType clickType) {
public void interactNPC(Player player, UUID npcId, ClickType clickType) {
if (plugin.getQuestFactory().getSelectingNpcs().contains(player.getUniqueId())) {
if (npcId == null || !npcDependency.isNpc(npcId)) {
plugin.getLogger().severe("NPC was null while selecting");
@ -247,7 +247,7 @@ public abstract class BukkitNpcListener implements Listener {
}
}
protected void onNpcKill(Entity damager, UUID npcId) {
protected void preKillNPC(Entity damager, UUID npcId) {
if (plugin.getDependencies().isNpc(damager)) {
return;
}

6
core/src/main/java/me/pikamug/quests/listeners/npc/BukkitCitizensListener.java
View File

@ -20,12 +20,12 @@ public class BukkitCitizensListener extends BukkitNpcListener {
@EventHandler(priority = EventPriority.LOWEST)
public void onNPCRightClick(final NPCRightClickEvent event) {
onNpcInteract(event.getClicker(), event.getNPC() != null ? event.getNPC().getUniqueId() : null, ClickType.RIGHT);
interactNPC(event.getClicker(), event.getNPC() != null ? event.getNPC().getUniqueId() : null, ClickType.RIGHT);
}
@EventHandler
public void onNPCLeftClick(final NPCLeftClickEvent event) {
onNpcInteract(event.getClicker(), event.getNPC() != null ? event.getNPC().getUniqueId() : null, ClickType.LEFT);
interactNPC(event.getClicker(), event.getNPC() != null ? event.getNPC().getUniqueId() : null, ClickType.LEFT);
}
@EventHandler
@ -39,7 +39,7 @@ public class BukkitCitizensListener extends BukkitNpcListener {
= (EntityDamageByEntityEvent) event.getNPC().getEntity().getLastDamageCause();
final Entity damager = damageEvent.getDamager();
final UUID npcId = event.getNPC().getUniqueId();
onNpcKill(damager, npcId);
preKillNPC(damager, npcId);
}
}
}

4
core/src/main/java/me/pikamug/quests/listeners/npc/BukkitZnpcsPlusLegacyListener.java
View File

@ -20,9 +20,9 @@ public class BukkitZnpcsPlusLegacyListener extends BukkitNpcListener {
UUID npcUUID = event.getNpc() != null ? event.getNpc().getUUID() : null;
if (event.isLeftClick()) {
onNpcInteract(player, npcUUID, ClickType.LEFT);
interactNPC(player, npcUUID, ClickType.LEFT);
} else if (event.isRightClick()) {
onNpcInteract(player, npcUUID, ClickType.RIGHT);
interactNPC(player, npcUUID, ClickType.RIGHT);
}
}
}

4
core/src/main/java/me/pikamug/quests/listeners/npc/BukkitZnpcsPlusListener.java
View File

@ -23,9 +23,9 @@ public class BukkitZnpcsPlusListener extends BukkitNpcListener {
// Needed because the NpcInteractEvent is fired async
plugin.getServer().getScheduler().runTask(plugin, () -> {
if (event.getClickType().equals(InteractionType.LEFT_CLICK)) {
onNpcInteract(player, npcUUID, ClickType.LEFT);
interactNPC(player, npcUUID, ClickType.LEFT);
} else if (event.getClickType().equals(InteractionType.RIGHT_CLICK)) {
onNpcInteract(player, npcUUID, ClickType.RIGHT);
interactNPC(player, npcUUID, ClickType.RIGHT);
}
});
}