diff --git a/src/main/java/org/ultramine/server/event/ServerWorldEventProxy.java b/src/main/java/org/ultramine/server/event/ServerWorldEventProxy.java
index fbe04fb..acb7386 100644
--- a/src/main/java/org/ultramine/server/event/ServerWorldEventProxy.java
+++ b/src/main/java/org/ultramine/server/event/ServerWorldEventProxy.java
@@ -12,6 +12,7 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.MinecraftForge;
 
@@ -28,9 +29,16 @@
 	}
 	
 	@Override
+	public World getWorld()
+	{
+		return world;
+	}
+	
+	@Override
 	public void pushState(WorldUpdateObjectType state)
 	{
 		object.setType(state);
+		current = this;
 	}
 	
 	@Override
@@ -39,6 +47,7 @@
 		object.setType(WorldUpdateObjectType.UNKNOWN);
 		object.setEntity(null);
 		object.setTileEntity(null);
+		current = null;
 	}
 	
 	@Override
diff --git a/src/main/java/org/ultramine/server/event/WorldEventProxy.java b/src/main/java/org/ultramine/server/event/WorldEventProxy.java
index 5c6733d..b46900c 100644
--- a/src/main/java/org/ultramine/server/event/WorldEventProxy.java
+++ b/src/main/java/org/ultramine/server/event/WorldEventProxy.java
@@ -4,9 +4,22 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 
 public class WorldEventProxy
 {
+	protected static WorldEventProxy current;
+	
+	public static WorldEventProxy getCurrent()
+	{
+		return current;
+	}
+	
+	public World getWorld()
+	{
+		return null;
+	}
+	
 	public void pushState(WorldUpdateObjectType state)
 	{
 	}