Update from upstream SpigotMC

44608631338 [M]
29dbaa783fe
edf691c2e93
da9bbdfaea9
330d66bfb62
This commit is contained in:
Zach Brown
2014-12-10 22:21:51 -06:00
parent 3ba06bf3ff
commit af1661e8d3
3 changed files with 6 additions and 6 deletions

View File

@@ -441,7 +441,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return this.world;
}
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
this.M = worldprovider.getWorldBorder();
this.M.a(new WorldBorderListener(((WorldServer) this).getServer().getHandle())); // CraftBukkit
this.getServer().addWorld(this.world); // CraftBukkit
+ timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings