From a4ba07de99b278400f4bc0a2c6c3ac9e6f916d15 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Sat, 24 Jul 2021 09:42:06 -0400
Subject: [PATCH] Fix world events

---
 src/main/java/com/volmit/iris/engine/IrisWorldManager.java    | 2 +-
 .../java/com/volmit/iris/engine/headless/HeadlessWorld.java   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
index 78fbd60c8..fb258d404 100644
--- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
+++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
@@ -78,7 +78,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
 
     @Override
     public void onEntitySpawn(EntitySpawnEvent e) {
-        if (getTarget().getWorld() == null || !getTarget().getWorld().equals(e.getEntity().getWorld())) {
+        if (getTarget().getWorld() == null || !e.getEntity().getWorld().equals(getTarget().getWorld().realWorld())) {
             return;
         }
 
diff --git a/src/main/java/com/volmit/iris/engine/headless/HeadlessWorld.java b/src/main/java/com/volmit/iris/engine/headless/HeadlessWorld.java
index 90e7cb2a4..f931ae8ef 100644
--- a/src/main/java/com/volmit/iris/engine/headless/HeadlessWorld.java
+++ b/src/main/java/com/volmit/iris/engine/headless/HeadlessWorld.java
@@ -69,11 +69,13 @@ public class HeadlessWorld {
     }
 
     public World load() {
-        return new WorldCreator(worldName)
+        World w = new WorldCreator(worldName)
                 .environment(dimension.getEnvironment())
                 .seed(world.seed())
                 .generator(new EngineCompositeGenerator(dimension.getLoadKey(), !studio))
                 .createWorld();
+        world.realWorld(w);
+        return w;
     }
 
     public static HeadlessWorld from(World world) {