diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
index 491d45c01..c7fd73214 100644
--- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
+++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
@@ -17,33 +17,34 @@
     }
  
     public Chunk(World p_i48703_1_, ChunkPrimer p_i48703_2_, int p_i48703_3_, int p_i48703_4_) {
-@@ -1164,4 +1165,29 @@
+@@ -1164,4 +1165,30 @@
        QUEUED,
        CHECK;
     }
-+   
-+   // FORGE start
-+   
++
 +   /**
 +    * <strong>FOR INTERNAL USE ONLY</strong>
 +    * <p>
-+    * Only public for use in {@link AnvilChunkLoader}. 
++    * Only public for use in {@link AnvilChunkLoader}.
 +    */
 +   @java.lang.Deprecated
 +   @javax.annotation.Nullable
-+   public final NBTTagCompound writeCapsToNBT()
-+   {
-+       return this.serializeCaps();
- }
-+   
++   public final NBTTagCompound writeCapsToNBT() {
++      return this.serializeCaps();
++   }
++
 +   /**
 +    * <strong>FOR INTERNAL USE ONLY</strong>
 +    * <p>
-+    * Only public for use in {@link AnvilChunkLoader}. 
++    * Only public for use in {@link AnvilChunkLoader}.
 +    */
 +   @java.lang.Deprecated
-+   public final void readCapsFromNBT(NBTTagCompound tag)
-+   {
-+       this.deserializeCaps(tag);
++   public final void readCapsFromNBT(NBTTagCompound tag) {
++      this.deserializeCaps(tag);
 +   }
-+}
++
++   @Override
++   public World getWorldForge() {
++      return func_177412_p();
++   }
+ }
diff --git a/patches/minecraft/net/minecraft/world/chunk/IChunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/IChunk.java.patch
index cd3f49a61..d683810a2 100644
--- a/patches/minecraft/net/minecraft/world/chunk/IChunk.java.patch
+++ b/patches/minecraft/net/minecraft/world/chunk/IChunk.java.patch
@@ -6,7 +6,7 @@
     BitSet func_205749_a(GenerationStage.Carving p_205749_1_);
 +
 +   @Nullable
-+   default net.minecraft.world.IWorld getWorld() {
++   default net.minecraft.world.IWorld getWorldForge() {
 +      return null;
 +   }
  }
diff --git a/src/main/java/net/minecraftforge/event/world/ChunkEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkEvent.java
index e42983d64..f85e2e8d5 100644
--- a/src/main/java/net/minecraftforge/event/world/ChunkEvent.java
+++ b/src/main/java/net/minecraftforge/event/world/ChunkEvent.java
@@ -38,7 +38,7 @@ public class ChunkEvent extends WorldEvent
 
     public ChunkEvent(IChunk chunk)
     {
-        super(chunk.getWorld());
+        super(chunk.getWorldForge());
         this.chunk = chunk;
     }