Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-22 12:29:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:CitizensDev/Citizens2

Browse Source
This commit is contained in:
fullwall 2024-10-05 17:07:43 +08:00
commit 89331998a0
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
main/src/main/java/net/citizensnpcs/EventListen.java
View File

@ -319,14 +319,17 @@ public class EventListen implements Listener {
if (npc == null) if (npc == null)
return; return;
event.setCancelled(npc.isProtected()); final NPCCombustEvent npcCombustEvent;
if (event instanceof EntityCombustByEntityEvent) { if (event instanceof EntityCombustByEntityEvent) {
Bukkit.getPluginManager().callEvent(new NPCCombustByEntityEvent((EntityCombustByEntityEvent) event, npc)); npcCombustEvent = new NPCCombustByEntityEvent((EntityCombustByEntityEvent) event, npc);
} else if (event instanceof EntityCombustByBlockEvent) { } else if (event instanceof EntityCombustByBlockEvent) {
Bukkit.getPluginManager().callEvent(new NPCCombustByBlockEvent((EntityCombustByBlockEvent) event, npc)); npcCombustEvent = new NPCCombustByBlockEvent((EntityCombustByBlockEvent) event, npc);
} else { } else {
Bukkit.getPluginManager().callEvent(new NPCCombustEvent(event, npc)); npcCombustEvent = new NPCCombustEvent(event, npc);
}
Bukkit.getPluginManager().callEvent(npcCombustEvent);
if (npcCombustEvent.isCancelled() || npc.isProtected()) {
event.setCancelled(true);
} }
} }
@ -341,10 +344,15 @@ public class EventListen implements Listener {
event.setCancelled(!npc.data().get(NPC.Metadata.DAMAGE_OTHERS, true)); event.setCancelled(!npc.data().get(NPC.Metadata.DAMAGE_OTHERS, true));
NPCDamageEntityEvent damageEvent = new NPCDamageEntityEvent(npc, (EntityDamageByEntityEvent) event); NPCDamageEntityEvent damageEvent = new NPCDamageEntityEvent(npc, (EntityDamageByEntityEvent) event);
Bukkit.getPluginManager().callEvent(damageEvent); Bukkit.getPluginManager().callEvent(damageEvent);
if (damageEvent.isCancelled()) {
event.setCancelled(true);
}
} }
return; return;
} }
event.setCancelled(npc.isProtected()); if (npc.isProtected()) {
event.setCancelled(true);
}
if (event instanceof EntityDamageByEntityEvent) { if (event instanceof EntityDamageByEntityEvent) {
NPCDamageByEntityEvent damageEvent = new NPCDamageByEntityEvent(npc, (EntityDamageByEntityEvent) event); NPCDamageByEntityEvent damageEvent = new NPCDamageByEntityEvent(npc, (EntityDamageByEntityEvent) event);
@ -361,13 +369,23 @@ public class EventListen implements Listener {
} }
NPCLeftClickEvent leftClickEvent = new NPCLeftClickEvent(npc, damager); NPCLeftClickEvent leftClickEvent = new NPCLeftClickEvent(npc, damager);
Bukkit.getPluginManager().callEvent(leftClickEvent); Bukkit.getPluginManager().callEvent(leftClickEvent);
if (leftClickEvent.isCancelled()) {
return;
}
if (npc.hasTrait(CommandTrait.class)) { if (npc.hasTrait(CommandTrait.class)) {
npc.getTraitNullable(CommandTrait.class).dispatch(damager, CommandTrait.Hand.LEFT); npc.getTraitNullable(CommandTrait.class).dispatch(damager, CommandTrait.Hand.LEFT);
} }
} else if (event instanceof EntityDamageByBlockEvent) {
Bukkit.getPluginManager().callEvent(new NPCDamageByBlockEvent(npc, (EntityDamageByBlockEvent) event));
} else { } else {
Bukkit.getPluginManager().callEvent(new NPCDamageEvent(npc, event)); final NPCDamageEvent npcDamageEvent;
if (event instanceof EntityDamageByBlockEvent) {
npcDamageEvent = new NPCDamageByBlockEvent(npc, (EntityDamageByBlockEvent) event);
} else {
npcDamageEvent = new NPCDamageEvent(npc, event);
}
Bukkit.getPluginManager().callEvent(npcDamageEvent);
if (npcDamageEvent.isCancelled()) {
event.setCancelled(true);
}
} }
} }
@ -423,14 +441,18 @@ public class EventListen implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
@EventHandler @EventHandler(priority = EventPriority.LOWEST)
public void onEntityTarget(EntityTargetEvent event) { public void onEntityTarget(EntityTargetEvent event) {
NPC npc = plugin.getNPCRegistry().getNPC(event.getTarget()); NPC npc = plugin.getNPCRegistry().getNPC(event.getTarget());
if (npc == null) if (npc == null)
return; return;
event.setCancelled(!npc.data().get(NPC.Metadata.TARGETABLE, !npc.isProtected())); final EntityTargetNPCEvent targetNPCEvent = new EntityTargetNPCEvent(event, npc);
Bukkit.getPluginManager().callEvent(new EntityTargetNPCEvent(event, npc)); targetNPCEvent.setCancelled(!npc.data().get(NPC.Metadata.TARGETABLE, !npc.isProtected()));
Bukkit.getPluginManager().callEvent(targetNPCEvent);
if (targetNPCEvent.isCancelled()) {
targetNPCEvent.setCancelled(true);
}
} }
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)