Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-08-09 06:02:55 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fullwall 2015-08-25 23:42:16 +08:00
commit b2d9c0dd73
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,8 +216,8 @@ public class EventListen implements Listener {
if (npc == null) {
return;
}
Bukkit.getPluginManager().callEvent(new NPCDeathEvent(npc, event));
final Location location = npc.getEntity().getLocation();
Bukkit.getPluginManager().callEvent(new NPCDeathEvent(npc, event));
npc.despawn(DespawnReason.DEATH);
if (npc.data().has(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA)) {
@ -235,7 +235,7 @@ public class EventListen implements Listener {
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
if (!npc.isSpawned()) {
if (!npc.isSpawned() && npc.getOwningRegistry().getByUniqueId(npc.getUniqueId()) == npc) {
npc.spawn(location);
}
}