diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index da6b8dd411..11d3561c55 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -36,14 +36,14 @@ public class WorldServer extends World {
     @Override
     public boolean c(int i1, int j1, int k1, int l1) {
         boolean result = super.c(i1, j1, k1, l1);
-        world.updateBlock(i1, j1, k1);
+        if (world != null) world.updateBlock(i1, j1, k1);
         return result;
     }
 
     @Override
     public boolean d(int i1, int j1, int k1, int l1) {
         boolean result = super.d(i1, j1, k1, l1);
-        world.updateBlock(i1, j1, k1);
+        if (world != null) world.updateBlock(i1, j1, k1);
         return result;
     }