From 3a8393c53a36973a8971b8170d9704d2f946a570 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 1 Mar 2016 11:23:45 +1100 Subject: [PATCH] Patch rebuild. --- CraftBukkit-Patches/0010-Spigot-Timings.patch | 6 +++--- .../0141-Allow-Capping-Tile-Entity-Tick-Time.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch index 1529d37a70..5f326eb844 100644 --- a/CraftBukkit-Patches/0010-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch @@ -428,9 +428,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return this.world; } @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { - this.isClientSide = flag; - this.N = worldprovider.getWorldBorder(); - this.getServer().addWorld(this.world); // CraftBukkit + this.N.world = (WorldServer) this; + this.getServer().addWorld(this.world); + // CraftBukkit end + timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings } diff --git a/CraftBukkit-Patches/0141-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0141-Allow-Capping-Tile-Entity-Tick-Time.patch index 6f544dac62..95d330e044 100644 --- a/CraftBukkit-Patches/0141-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0141-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -24,8 +24,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public CraftWorld getWorld() { return this.world; @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { - this.N = worldprovider.getWorldBorder(); - this.getServer().addWorld(this.world); // CraftBukkit + this.getServer().addWorld(this.world); + // CraftBukkit end timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings + this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); + this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);