Properly update patches for upstream merge

2016-10-21 15:42:49 -05:00
parent 2515c80051
commit 4bef47531a
6 changed files with 112 additions and 47 deletions
--- a/Spigot-Server-Patches/Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/Add-exception-reporting-event.patch
@@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
         }
     }
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
-         try {
+         try (co.aikar.timings.Timing timed = world.timings.chunkSaveNop.startTiming()) {
             this.chunkLoader.b(this.world, chunk);
         } catch (Exception exception) {
 -            ChunkProviderServer.a.error("Couldn\'t save entities", exception);