From 61ab738d3c4fcf3f009cb8873182c61d1906aa24 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 5 Mar 2016 18:51:20 +1100 Subject: [PATCH] Patch rebuild --- CraftBukkit-Patches/0010-Spigot-Timings.patch | 10 +++++----- .../0062-Improve-AutoSave-Mechanism.patch | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch index 77a5029a4..b056f2249 100644 --- a/CraftBukkit-Patches/0010-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From ec2afa95dfc360d1ec483bfbedcab6e049d9e7a8 Mon Sep 17 00:00:00 2001 +From a5e080be0b23f8bfacc9d1405d8161ca731f36c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -26,10 +26,10 @@ index 582e684..7980e80 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 01729cb..780919a 100644 +index 22c17db..162613b 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -149,6 +149,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -154,6 +154,7 @@ public class ChunkProviderServer implements IChunkProvider { // CraftBukkit end if (chunk == null) { @@ -37,7 +37,7 @@ index 01729cb..780919a 100644 long k = ChunkCoordIntPair.a(i, j); chunk = this.loadChunk(i, j); -@@ -197,6 +198,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -202,6 +203,7 @@ public class ChunkProviderServer implements IChunkProvider { } // CraftBukkit end chunk.loadNearby(this, this.chunkGenerator); @@ -407,7 +407,7 @@ index baf1d73..8bbdc11 100644 private static Map> f = Maps.newHashMap(); private static Map, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c5c7503..11e8de4 100644 +index d8ddc43..7fb34e3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,6 +18,7 @@ import com.google.common.collect.Maps; diff --git a/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch index 7740997fc..0ab759e2a 100644 --- a/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From d84fad458d80f1cae8913ac4f0356868df9a6344 Mon Sep 17 00:00:00 2001 +From d18af2a333162e83672a42442f8d303defe32290 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Improve AutoSave Mechanism @@ -11,7 +11,7 @@ Instead we will mimic the save-all command in its behaviour, which is both safe Also, only save modified chunks, or chunks with entities after 4 auto save passes diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 47ef0db..277a6ad 100644 +index a7006b8..a4bf29a 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -875,7 +875,7 @@ public class Chunk { @@ -24,10 +24,10 @@ index 47ef0db..277a6ad 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 780919a..21e7709 100644 +index 162613b..83857a6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -258,7 +258,7 @@ public class ChunkProviderServer implements IChunkProvider { +@@ -263,7 +263,7 @@ public class ChunkProviderServer implements IChunkProvider { this.saveChunk(chunk); chunk.f(false); ++i;