Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-15 23:26:16 +01:00
Code Issues Projects Releases Wiki Activity

Simplify marker removal

Browse Source
This commit is contained in:
fullwall 2020-07-09 23:43:27 +08:00
parent ea20cdb21e
commit 44b6da408d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/java/net/citizensnpcs/trait/waypoint/EntityMarkers.java
View File

@ -14,6 +14,7 @@ import net.citizensnpcs.api.event.SpawnReason;
import net.citizensnpcs.api.npc.MemoryNPCDataStore;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.npc.NPCRegistry;
import net.citizensnpcs.npc.ai.NPCHolder;
/**
* A helper class for storing a number of entity markers. By default an entity marker is a non-persisted EnderSignal.
@ -50,16 +51,14 @@ public class EntityMarkers<T> {
}
public void destroyMarkers() {
for (Entity entity : markers.values()) {
entity.remove();
}
registry.deregisterAll();
markers.clear();
}
public void removeMarker(T marker) {
Entity entity = markers.remove(marker);
if (entity != null) {
entity.remove();
((NPCHolder) entity).getNPC().destroy();
}
}