Update upstream

Spigot-Server-Patches/Timings-v2.patch

@@ -1148,7 +1148,7 @@ index 5a5a588e7..d2d4ff6fb 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 07fd5d957..ec83c431e 100644
+index 843320ffb..d902e2630 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ import com.google.common.collect.Maps;
@@ -1229,11 +1229,10 @@ index 07fd5d957..ec83c431e 100644
          this.methodProfiler.b();
      }
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
-             return;
          }
-         // Spigot end
+         // CraftBukkit end
+ 
 -        entity.tickTimer.startTiming(); // Spigot
-+
          entity.M = entity.locX;
          entity.N = entity.locY;
          entity.O = entity.locZ;