Fixed ChunkDataEvent.Save being fired with a null world if chunk isn't fully generated when unloaded. (#6628)

src/main/java/net/minecraftforge/event/world/ChunkDataEvent.java

@@ -20,6 +20,7 @@
 package net.minecraftforge.event.world;
 
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkStatus;
@@ -47,6 +48,12 @@ public class ChunkDataEvent extends ChunkEvent
         this.data = data;
     }
 
+    public ChunkDataEvent(IChunk chunk, IWorld world, CompoundNBT data)
+    {
+        super(chunk, world);
+        this.data = data;
+    }
+
     public CompoundNBT getData()
     {
         return data;
@@ -92,9 +99,15 @@ public class ChunkDataEvent extends ChunkEvent
      **/
     public static class Save extends ChunkDataEvent
     {
+        @Deprecated // remove in 1.16
         public Save(IChunk chunk, CompoundNBT data)
         {
             super(chunk, data);
         }
+
+        public Save(IChunk chunk, IWorld world, CompoundNBT data)
+        {
+            super(chunk, world, data);
+        }
     }
 }

src/main/java/net/minecraftforge/event/world/ChunkEvent.java

@@ -19,6 +19,7 @@
 
 package net.minecraftforge.event.world;
 
+import net.minecraft.world.IWorld;
 import net.minecraft.world.chunk.IChunk;
 import net.minecraftforge.common.MinecraftForge;
 
@@ -41,6 +42,12 @@ public class ChunkEvent extends WorldEvent
         this.chunk = chunk;
     }
 
+    public ChunkEvent(IChunk chunk, IWorld world)
+    {
+        super(world);
+        this.chunk = chunk;
+    }
+
     public IChunk getChunk()
     {
         return chunk;