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

Add event to spawning debug

Browse Source
This commit is contained in:
fullwall 2020-06-28 17:36:24 +08:00
parent c9564c4be2
commit d8b3b1c2c0
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Minecart;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
@ -150,7 +151,7 @@ public class EventListen implements Listener {
Runnable runnable = new Runnable() {
@Override
public void run() {
respawnAllFromCoord(new ChunkCoord(event.getChunk()));
respawnAllFromCoord(new ChunkCoord(event.getChunk()), event);
}
};
if (event instanceof Cancellable) {
@ -187,7 +188,7 @@ public class EventListen implements Listener {
if (Messaging.isDebugging()) {
Messaging.debug("Cancelled chunk unload at [" + coord.x + "," + coord.z + "]");
}
respawnAllFromCoord(coord);
respawnAllFromCoord(coord, event);
return;
}
toRespawn.put(coord, npc);
@ -625,7 +626,7 @@ public class EventListen implements Listener {
for (ChunkCoord chunk : toRespawn.keySet()) {
if (!chunk.worldUUID.equals(event.getWorld().getUID()) || !event.getWorld().isChunkLoaded(chunk.x, chunk.z))
continue;
respawnAllFromCoord(chunk);
respawnAllFromCoord(chunk, event);
}
}
@ -638,7 +639,7 @@ public class EventListen implements Listener {
if (event.isCancelled() || !despawned) {
for (ChunkCoord coord : toRespawn.keySet()) {
if (event.getWorld().getUID().equals(coord.worldUUID)) {
respawnAllFromCoord(coord);
respawnAllFromCoord(coord, event);
}
}
event.setCancelled(true);
@ -651,7 +652,7 @@ public class EventListen implements Listener {
}
}
private void respawnAllFromCoord(ChunkCoord coord) {
private void respawnAllFromCoord(ChunkCoord coord, Event event) {
List<NPC> ids = toRespawn.get(coord);
for (int i = 0; i < ids.size(); i++) {
NPC npc = ids.get(i);
@ -672,8 +673,8 @@ public class EventListen implements Listener {
boolean success = spawn(npc);
if (!success) {
if (Messaging.isDebugging()) {
Messaging.debug("Couldn't respawn id", npc.getId(),
"during chunk event at [" + coord.x + "," + coord.z + "]");
Messaging.debug("Couldn't respawn id", npc.getId(), "during", event,
"at [" + coord.x + "," + coord.z + "]");
}
continue;
}
@ -686,7 +687,7 @@ public class EventListen implements Listener {
break;
}
if (Messaging.isDebugging()) {
Messaging.debug("Spawned id", npc.getId(), "due to chunk event at [" + coord.x + "," + coord.z + "]");
Messaging.debug("Spawned id", npc.getId(), "during", event, "at [" + coord.x + "," + coord.z + "]");
}
}
}

12
main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -243,8 +243,8 @@ public class CitizensNPC extends AbstractNPC {
getEntity().setMetadata(NPC_METADATA_MARKER, new FixedMetadataValue(CitizensAPI.getPlugin(), true));
boolean couldSpawn = !Util.isLoaded(at) ? false
: NMS.addEntityToWorld(getEntity(), CreatureSpawnEvent.SpawnReason.CUSTOM);
boolean loaded = Util.isLoaded(at);
boolean couldSpawn = !loaded ? false : NMS.addEntityToWorld(getEntity(), CreatureSpawnEvent.SpawnReason.CUSTOM);
// send skin packets, if applicable, before other NMS packets are sent
if (couldSpawn) {
@ -253,9 +253,11 @@ public class CitizensNPC extends AbstractNPC {
skinnable.getSkinTracker().onSpawnNPC();
}
} else {
Messaging.debug("Retrying spawn of", getId(), "later due to chunk being unloaded.",
Util.isLoaded(at) ? "Util.isLoaded true" : "Util.isLoaded false");
// we need to wait for a chunk load before trying to spawn
if (Messaging.isDebugging()) {
Messaging.debug("Retrying spawn of", getId(), "later. Was loaded", loaded, "is loaded",
Util.isLoaded(at));
}
// we need to wait before trying to spawn
entityController.remove();
Bukkit.getPluginManager().callEvent(new NPCNeedsRespawnEvent(this, at));
return false;