Upstream Merge

By: md_5 <md_5@live.com.au>
2013-08-04 08:51:09 +10:00
parent 4d8ae2cd25
commit eb9d70ade9
11 changed files with 41 additions and 39 deletions
--- a/CraftBukkit-Patches/0064-Entity-ticking-chunk-caching.patch
+++ b/CraftBukkit-Patches/0064-Entity-ticking-chunk-caching.patch
@@ -1,4 +1,4 @@
-From 214a039d5fcb2ce28c32e580f91de4e23005bd86 Mon Sep 17 00:00:00 2001
+From d5f7eb5103fedc76dde546763d9c43d45038965d Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Tue, 16 Jul 2013 03:32:32 +0500
 Subject: [PATCH] Entity ticking chunk caching
@@ -70,4 +70,5 @@ index 8bd7876..52694f1 100644
         timings.entityTick.stopTiming(); // Spigot
         this.methodProfiler.c("tileEntities");
 -- 
-1.8.1.msysgit.1
+1.8.1.2
+