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

Prevent chunk load respawning with SpawnReason.PLUGIN

Browse Source
This commit is contained in:
fullwall 2020-10-12 22:24:44 +08:00
parent 12b796afa3
commit 675eaffad5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,8 +415,8 @@ public class EventListen implements Listener {
|| event.getReason() == DespawnReason.RELOAD) { || event.getReason() == DespawnReason.RELOAD) {
if (event.getNPC().getStoredLocation() != null) { if (event.getNPC().getStoredLocation() != null) {
ChunkCoord coord = new ChunkCoord(event.getNPC().getStoredLocation()); ChunkCoord coord = new ChunkCoord(event.getNPC().getStoredLocation());
Messaging.debug("Preventing further respawns of " + event.getNPC().getId() + " at [" + coord.x + "," Messaging.debug("Preventing further respawns of", event.getNPC().getId(), "at", coord,
+ coord.z + "] due to DespawnReason." + event.getReason()); "due to DespawnReason." + event.getReason());
toRespawn.remove(coord, event.getNPC()); toRespawn.remove(coord, event.getNPC());
} }
} else { } else {
@ -447,6 +447,11 @@ public class EventListen implements Listener {
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onNPCSpawn(NPCSpawnEvent event) { public void onNPCSpawn(NPCSpawnEvent event) {
skinUpdateTracker.onNPCSpawn(event.getNPC()); skinUpdateTracker.onNPCSpawn(event.getNPC());
Location location = event.getNPC().getStoredLocation();
if (location == null) {
location = event.getLocation();
}
toRespawn.remove(new ChunkCoord(location), event.getNPC());
} }
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)