Fork/CitizensCMD
2
0
Fork 0
forked from Upstream/CitizensCMD
Code Pull Requests Actions Releases Activity

Move NPC remove event into the correct class

Browse Source
This commit is contained in:
HexedHero 2022-05-03 00:14:38 +01:00
parent 2cfd0beb6f
commit 0011f2282e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
View File

@ -48,7 +48,6 @@ import me.mattstudios.citizenscmd.utility.EnumTypes;
import me.mattstudios.citizenscmd.utility.Messages; import me.mattstudios.citizenscmd.utility.Messages;
import me.mattstudios.citizenscmd.utility.Util; import me.mattstudios.citizenscmd.utility.Util;
import net.citizensnpcs.api.event.NPCLeftClickEvent; import net.citizensnpcs.api.event.NPCLeftClickEvent;
import net.citizensnpcs.api.event.NPCRemoveEvent;
import net.citizensnpcs.api.event.NPCRightClickEvent; import net.citizensnpcs.api.event.NPCRightClickEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
@ -228,15 +227,6 @@ public class NPCClickListener implements Listener {
} }
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onRemoveNPC(NPCRemoveEvent event) {
if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
return;
}
plugin.getDataHandler().removeNPCData(event.getNPC().getId());
}
/** /**
* Does the main commands for both left and right clicks. * Does the main commands for both left and right clicks.
* *

12
src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
View File

@ -6,6 +6,7 @@ import org.bukkit.event.Listener;
import me.mattstudios.citizenscmd.CitizensCMD; import me.mattstudios.citizenscmd.CitizensCMD;
import net.citizensnpcs.api.event.NPCCloneEvent; import net.citizensnpcs.api.event.NPCCloneEvent;
import net.citizensnpcs.api.event.NPCRemoveEvent;
public class NPCListener implements Listener { public class NPCListener implements Listener {
@ -16,11 +17,20 @@ public class NPCListener implements Listener {
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void on(NPCCloneEvent event) { public void onCloneNPC(NPCCloneEvent event) {
if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) { if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
return; return;
} }
plugin.getDataHandler().cloneData(event.getNPC().getId(), event.getClone().getId()); plugin.getDataHandler().cloneData(event.getNPC().getId(), event.getClone().getId());
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onRemoveNPC(NPCRemoveEvent event) {
if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
return;
}
plugin.getDataHandler().removeNPCData(event.getNPC().getId());
}
} }