SceneScriptManager fix nullPointer error

Merge pull request Grasscutters#1581 from akatatsu27/development
GoJam11 · Jul 26, 2022 · 107111d · 107111d
2 parents 7600f70 + 7ca947b
commit 107111d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
@@ -213,7 +213,7 @@ public void checkRegions() {
 			}
 
             for(int entityId : region.getEntities()) {
-                if(!region.getMetaRegion().contains(getScene().getEntityById(entityId).getPosition())) {
+                if(getScene().getEntityById(entityId) == null || !region.getMetaRegion().contains(getScene().getEntityById(entityId).getPosition())) {
                     region.removeEntity(entityId);
 
                 }