Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-28 02:01:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix dead player NPC not removed from world.

Browse Source
This commit is contained in:
JCThePants 2015-02-21 00:30:21 -08:00
parent 9cd19d8509
commit 687fcdb779
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
View File

@ -5,6 +5,7 @@ import java.net.Socket;
import java.util.List;
import net.citizensnpcs.Settings.Setting;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.trait.trait.Inventory;
@ -22,6 +23,7 @@ import net.citizensnpcs.util.nms.PlayerNavigation;
import net.minecraft.server.v1_8_R1.AttributeInstance;
import net.minecraft.server.v1_8_R1.Block;
import net.minecraft.server.v1_8_R1.BlockPosition;
import net.minecraft.server.v1_8_R1.DamageSource;
import net.minecraft.server.v1_8_R1.Entity;
import net.minecraft.server.v1_8_R1.EntityPlayer;
import net.minecraft.server.v1_8_R1.EnumGamemode;
@ -85,6 +87,22 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
}
}
@Override
public void die(DamageSource damagesource) {
// players that die are not normally removed from the world. when the
// NPC dies, we are done with the instance and it should be removed.
if (dead) {
return;
}
super.die(damagesource);
Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
world.removeEntity(EntityHumanNPC.this);
}
}, 35); // give enough time for death and smoke animation
}
@Override
public void e(float f, float f1) {
if (npc == null || !npc.isFlyable()) {