Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use Entity instead of LivingEntity to avoid needing to cast

This commit is contained in:
aPunch 2012-01-18 04:47:13 -06:00
parent 28870818ba
commit 8ba1d49a00
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/CitizensAPI.jar
View File

Binary file not shown.

9
src/net/citizensnpcs/listener/EntityListen.java
View File

@ -3,7 +3,6 @@ package net.citizensnpcs.listener;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@ -16,13 +15,13 @@ public class EntityListen implements Listener {
@EventHandler(event = EntityDamageEvent.class, priority = EventPriority.NORMAL)
public void onEntityDamage(EntityDamageEvent event) {
if (event.isCancelled() || !CitizensAPI.getNPCManager().isNPC((LivingEntity) event.getEntity()))
if (event.isCancelled() || !CitizensAPI.getNPCManager().isNPC(event.getEntity()))
return;
if (event instanceof EntityDamageByEntityEvent) {
EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event;
if (e.getDamager() instanceof Player) {
NPC npc = CitizensAPI.getNPCManager().getNPC((LivingEntity) event.getEntity());
NPC npc = CitizensAPI.getNPCManager().getNPC(event.getEntity());
npc.getCharacter().onLeftClick(npc, (Player) e.getDamager());
}
}
@ -30,11 +29,11 @@ public class EntityListen implements Listener {
@EventHandler(event = EntityTargetEvent.class, priority = EventPriority.NORMAL)
public void onEntityTarget(EntityTargetEvent event) {
if (event.isCancelled() || !CitizensAPI.getNPCManager().isNPC((LivingEntity) event.getEntity())
if (event.isCancelled() || !CitizensAPI.getNPCManager().isNPC(event.getEntity())
|| !(event.getTarget() instanceof Player))
return;
NPC npc = CitizensAPI.getNPCManager().getNPC((LivingEntity) event.getEntity());
NPC npc = CitizensAPI.getNPCManager().getNPC(event.getEntity());
npc.getCharacter().onRightClick(npc, (Player) event.getTarget());
}
}

8
src/net/citizensnpcs/npc/CitizensNPCManager.java
View File

@ -11,7 +11,7 @@ import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Entity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.npc.NPCManager;
@ -25,7 +25,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.WorldServer;
public class CitizensNPCManager implements NPCManager {
private Map<LivingEntity, NPC> spawned = new HashMap<LivingEntity, NPC>();
private Map<Entity, NPC> spawned = new HashMap<Entity, NPC>();
private Map<Integer, NPC> byID = new HashMap<Integer, NPC>();
@Override
@ -51,7 +51,7 @@ public class CitizensNPCManager implements NPCManager {
}
@Override
public NPC getNPC(LivingEntity entity) {
public NPC getNPC(Entity entity) {
return spawned.get(entity);
}
@ -83,7 +83,7 @@ public class CitizensNPCManager implements NPCManager {
}
@Override
public boolean isNPC(LivingEntity entity) {
public boolean isNPC(Entity entity) {
return spawned.containsKey(entity);
}