From f0ae67309116ae9617395478d622cc10bed4f6e9 Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Mon, 25 Apr 2022 14:27:54 -0700
Subject: [PATCH] Fix concurrency related error while spawning monsters

---
 src/main/java/emu/grasscutter/game/GenshinScene.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/GenshinScene.java b/src/main/java/emu/grasscutter/game/GenshinScene.java
index 43370ef84..431134b5f 100644
--- a/src/main/java/emu/grasscutter/game/GenshinScene.java
+++ b/src/main/java/emu/grasscutter/game/GenshinScene.java
@@ -144,7 +144,7 @@ public class GenshinScene {
 		return this.entities.containsKey(entity.getId());
 	}
 	
-	public void addPlayer(GenshinPlayer player) {
+	public synchronized void addPlayer(GenshinPlayer player) {
 		// Check if player already in
 		if (getPlayers().contains(player)) {
 			return;
@@ -163,7 +163,7 @@ public class GenshinScene {
 		this.setupPlayerAvatars(player);
 	}
 	
-	public void removePlayer(GenshinPlayer player) {
+	public synchronized void removePlayer(GenshinPlayer player) {
 		// Remove player from scene
 		getPlayers().remove(player);
 		player.setScene(null);
@@ -367,7 +367,6 @@ public class GenshinScene {
 				entity.setSpawnEntry(entry);
 				
 				toAdd.add(entity);
-				this.addEntityDirectly(entity);
 				
 				// Add to spawned list
 				this.getSpawnedEntities().add(entry);
@@ -377,14 +376,15 @@ public class GenshinScene {
 		for (GenshinEntity entity : this.getEntities().values()) {
 			if (entity.getSpawnEntry() != null && !visible.contains(entity.getSpawnEntry())) {
 				toRemove.add(entity);
-				this.removeEntityDirectly(entity);
 			}
 		}
 		
 		if (toAdd.size() > 0) {
+			toAdd.stream().forEach(this::addEntityDirectly);
 			this.broadcastPacket(new PacketSceneEntityAppearNotify(toAdd, VisionType.VisionBorn));
 		}
 		if (toRemove.size() > 0) {
+			toRemove.stream().forEach(this::removeEntityDirectly);
 			this.broadcastPacket(new PacketSceneEntityDisappearNotify(toRemove, VisionType.VisionRemove));
 		}
 	}