Update upstream B/CB

2025-01-01 05:47:45 +01:00 · 2016-12-06 17:12:19 -06:00 · 2016-12-06 17:12:19 -06:00 · cead4e0a74
commit cead4e0a74
parent b75a37d67b
3 changed files with 3 additions and 3 deletions
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@ -938,8 +938,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
             int l = 49;
             Iterator iterator1 = this.h.iterator();
@@ -0,0 +0,0 @@ public class PlayerChunkMap {
-                     }
                 }
+                 // CraftBukkit end
             }
 +            } // Paper timing
         }
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 71d3a3c774a2b53458456c49cf6dd2796934ef2d
+Subproject commit b7a392c072a92bdeef8e6fc1e2849740bdb1ccca
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit a710176e461fa6192521afdee74b3f9bc315065d
+Subproject commit 58bff62b2dc68da958f2e90371582a13aa3c9355