diff --git a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch index dce5db11ba..90fc8f65fd 100644 --- a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch +++ b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch @@ -1,14 +1,14 @@ -From 38e2ee2f9337fc85740266713d841dada00b1e59 Mon Sep 17 00:00:00 2001 +From 8793e6a8cbd642c7d5c8e0572888eea9df36e247 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 37e6419..4deb492 100644 +index e9b1b0a..56f5029 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -136,6 +136,78 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -137,6 +137,78 @@ public interface World extends PluginMessageRecipient, Metadatable { public Chunk getChunkAt(Block block); /** @@ -88,5 +88,5 @@ index 37e6419..4deb492 100644 * * @param chunk The chunk to check -- -2.10.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index 93ae5a72f3..bf48d822b1 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,4 +1,4 @@ -From e872080700a37e9e6688fa039bf02cf5325d744c Mon Sep 17 00:00:00 2001 +From 8818914cb1f14d8f19c57e5777344df5f60c6d99 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -869,7 +869,7 @@ index 0b790ab..81a69e8 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index ae427b4..ce3390c 100644 +index a5a096b..c546139 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ @@ -937,9 +937,9 @@ index ae427b4..ce3390c 100644 long k = System.nanoTime() + 50000000L; int l = 49; Iterator iterator1 = this.h.iterator(); -@@ -176,10 +186,12 @@ public class PlayerChunkMap { - } +@@ -180,10 +190,12 @@ public class PlayerChunkMap { } + // CraftBukkit end } + } // Paper timing } @@ -950,7 +950,7 @@ index ae427b4..ce3390c 100644 Iterator iterator2 = this.g.iterator(); while (iterator2.hasNext()) { -@@ -193,14 +205,17 @@ public class PlayerChunkMap { +@@ -197,14 +209,17 @@ public class PlayerChunkMap { } } } @@ -969,7 +969,7 @@ index ae427b4..ce3390c 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ea2540d..108bb65 100644 +index 2a195ca..3c4cc27 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1833,5 +1833,5 @@ index c32d44d..5c2fb00 100644 } } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch index b15eb64d69..e9cbaff00b 100644 --- a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch @@ -1,14 +1,14 @@ -From d98bd2358838148eef90502ac28710a65df0d423 Mon Sep 17 00:00:00 2001 +From f9f10699b2f5fcd38c9160971515c6cf5f093db7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:19:01 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index efafbff..a27a9f0 100644 +index 9a2e9b2..cc15a0b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -126,6 +126,26 @@ public class CraftWorld implements World { +@@ -127,6 +127,26 @@ public class CraftWorld implements World { } } @@ -36,5 +36,5 @@ index efafbff..a27a9f0 100644 return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk; } -- -2.10.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch index 962c57b53f..75ab2e7d03 100644 --- a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From 7aee8c3e09e1bc95ee5d630bf798447c6db3b395 Mon Sep 17 00:00:00 2001 +From 7082ace40e5fdcd0eb3cea5d68d9d9ff9f20992f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a400062..635aad7 100644 +index ca9e94a..1982749 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -56,6 +56,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -25,7 +25,7 @@ index a400062..635aad7 100644 // CraftBukkit start public String displayName; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index ce3390c..5db113c 100644 +index c546139..ef8744b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -47,7 +47,7 @@ public class PlayerChunkMap { @@ -37,7 +37,7 @@ index ce3390c..5db113c 100644 private long k; private boolean l = true; private boolean m = true; -@@ -283,8 +283,11 @@ public class PlayerChunkMap { +@@ -287,8 +287,11 @@ public class PlayerChunkMap { // CraftBukkit start - Load nearby chunks first List chunkList = new LinkedList(); @@ -51,7 +51,7 @@ index ce3390c..5db113c 100644 chunkList.add(new ChunkCoordIntPair(k, l)); } } -@@ -303,8 +306,11 @@ public class PlayerChunkMap { +@@ -307,8 +310,11 @@ public class PlayerChunkMap { int i = (int) entityplayer.d >> 4; int j = (int) entityplayer.e >> 4; @@ -65,7 +65,7 @@ index ce3390c..5db113c 100644 PlayerChunk playerchunk = this.getChunk(k, l); if (playerchunk != null) { -@@ -334,7 +340,9 @@ public class PlayerChunkMap { +@@ -338,7 +344,9 @@ public class PlayerChunkMap { if (d2 >= 64.0D) { int k = (int) entityplayer.d >> 4; int l = (int) entityplayer.e >> 4; @@ -76,7 +76,7 @@ index ce3390c..5db113c 100644 int j1 = i - k; int k1 = j - l; -@@ -343,7 +351,7 @@ public class PlayerChunkMap { +@@ -347,7 +355,7 @@ public class PlayerChunkMap { if (j1 != 0 || k1 != 0) { for (int l1 = i - i1; l1 <= i + i1; ++l1) { for (int i2 = j - i1; i2 <= j + i1; ++i2) { @@ -85,7 +85,7 @@ index ce3390c..5db113c 100644 // this.c(l1, i2).a(entityplayer); chunksToLoad.add(new ChunkCoordIntPair(l1, i2)); // CraftBukkit } -@@ -378,6 +386,8 @@ public class PlayerChunkMap { +@@ -382,6 +390,8 @@ public class PlayerChunkMap { return playerchunk != null && playerchunk.d(entityplayer) && playerchunk.e(); } @@ -94,7 +94,7 @@ index ce3390c..5db113c 100644 public void a(int i) { i = MathHelper.clamp(i, 3, 32); if (i != this.j) { -@@ -387,36 +397,55 @@ public class PlayerChunkMap { +@@ -391,36 +401,55 @@ public class PlayerChunkMap { while (iterator.hasNext()) { EntityPlayer entityplayer = (EntityPlayer) iterator.next(); @@ -172,7 +172,7 @@ index ce3390c..5db113c 100644 private void e() { this.l = true; -@@ -495,4 +524,20 @@ public class PlayerChunkMap { +@@ -499,4 +528,20 @@ public class PlayerChunkMap { } } // CraftBukkit end @@ -215,5 +215,5 @@ index a9c2677..4ba6e35 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0076-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0076-Handle-Item-Meta-Inconsistencies.patch index 7547a3381c..85b937a17e 100644 --- a/Spigot-Server-Patches/0076-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0076-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From 1fc3e056ef00e598274783495e7f732f1933e5b1 Mon Sep 17 00:00:00 2001 +From d85208945003e34255152d5268d9db24a609f8a3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 0ce23f0..9ae05b3 100644 +index 8ed4b4b..fafc6b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS; @@ -144,7 +144,7 @@ index 0ce23f0..9ae05b3 100644 static Map getEnchantments(net.minecraft.server.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 4b70495..e91ca49 100644 +index b20d0f2..e2b99a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -6,13 +6,8 @@ import java.lang.annotation.RetentionPolicy; @@ -182,7 +182,7 @@ index 4b70495..e91ca49 100644 import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.server.NBTCompressedStreamTools; -@@ -222,14 +224,14 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -223,14 +225,14 @@ class CraftMetaItem implements ItemMeta, Repairable { private String displayName; private List lore; @@ -199,7 +199,7 @@ index 4b70495..e91ca49 100644 CraftMetaItem(CraftMetaItem meta) { if (meta == null) { -@@ -243,7 +245,7 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -244,7 +246,7 @@ class CraftMetaItem implements ItemMeta, Repairable { } if (meta.enchantments != null) { // Spigot @@ -208,7 +208,7 @@ index 4b70495..e91ca49 100644 } this.repairCost = meta.repairCost; -@@ -455,13 +457,13 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -456,13 +458,13 @@ class CraftMetaItem implements ItemMeta, Repairable { } } @@ -224,7 +224,7 @@ index 4b70495..e91ca49 100644 for (int i = 0; i < ench.size(); i++) { int id = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_ID.NBT); -@@ -531,13 +533,13 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -532,13 +534,13 @@ class CraftMetaItem implements ItemMeta, Repairable { void deserializeInternal(NBTTagCompound tag) { } @@ -240,7 +240,7 @@ index 4b70495..e91ca49 100644 for (Map.Entry entry : ench.entrySet()) { Enchantment enchantment = Enchantment.getByName(entry.getKey().toString()); -@@ -663,12 +665,12 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -664,12 +666,12 @@ class CraftMetaItem implements ItemMeta, Repairable { } public Map getEnchants() { @@ -255,7 +255,7 @@ index 4b70495..e91ca49 100644 } if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) { -@@ -836,7 +838,7 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -837,7 +839,7 @@ class CraftMetaItem implements ItemMeta, Repairable { clone.lore = new ArrayList(this.lore); } if (this.enchantments != null) { @@ -264,7 +264,7 @@ index 4b70495..e91ca49 100644 } clone.hideFlag = this.hideFlag; clone.unbreakable = this.unbreakable; -@@ -989,6 +991,28 @@ class CraftMetaItem implements ItemMeta, Repairable { +@@ -991,6 +993,28 @@ class CraftMetaItem implements ItemMeta, Repairable { } } @@ -294,5 +294,5 @@ index 4b70495..e91ca49 100644 private final Spigot spigot = new Spigot() { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0084-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0084-Catch-Async-PlayerChunkMap-operations.patch index 8ca7ff9f24..f92ee7b98b 100644 --- a/Spigot-Server-Patches/0084-Catch-Async-PlayerChunkMap-operations.patch +++ b/Spigot-Server-Patches/0084-Catch-Async-PlayerChunkMap-operations.patch @@ -1,14 +1,14 @@ -From 38d42c576439460df8d23272448c30342f72997a Mon Sep 17 00:00:00 2001 +From 67cdeb4969936cc2040d98c8fe777c852df52ad6 Mon Sep 17 00:00:00 2001 From: Daniel Ennis Date: Sun, 20 Mar 2016 15:22:42 -0400 Subject: [PATCH] Catch Async PlayerChunkMap operations diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 5db113c..8f6f3a0 100644 +index ef8744b..d970e2f 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -461,10 +461,12 @@ public class PlayerChunkMap { +@@ -465,10 +465,12 @@ public class PlayerChunkMap { } public void a(PlayerChunk playerchunk) { @@ -22,5 +22,5 @@ index 5db113c..8f6f3a0 100644 long i = d(chunkcoordintpair.x, chunkcoordintpair.z); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 570d0a4878..0386a70393 100644 --- a/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0111-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 72104ec5ddcbf6be1314825dff3ed0e1644dd413 Mon Sep 17 00:00:00 2001 +From d994474633853169f0956a20ca5d02d50e7839b0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -67,10 +67,10 @@ index 5614147..f107221 100644 for (int j = -short1; j <= short1; j += 16) { for (int k = -short1; k <= short1; k += 16) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a27a9f0..1d70abf 100644 +index cc15a0b..5bfdcfd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1247,8 +1247,9 @@ public class CraftWorld implements World { +@@ -1264,8 +1264,9 @@ public class CraftWorld implements World { int chunkCoordX = chunkcoordinates.getX() >> 4; int chunkCoordZ = chunkcoordinates.getZ() >> 4; // Cycle through the 25x25 Chunks around it to load/unload the chunks. @@ -83,5 +83,5 @@ index a27a9f0..1d70abf 100644 loadChunk(chunkCoordX + x, chunkCoordZ + z); } else { -- -2.10.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0151-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0151-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 1d656369ac..63e2778f03 100644 --- a/Spigot-Server-Patches/0151-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0151-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 0ea073bb6aa61144d42ce61b9a166b430da7d527 Mon Sep 17 00:00:00 2001 +From 795af98bafa1b29558646aa61187796616c97a82 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -108,10 +108,10 @@ index dd40e98..f109e98 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 8f6f3a0..eae9276 100644 +index d970e2f..d3c454c 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -479,7 +479,13 @@ public class PlayerChunkMap { +@@ -483,7 +483,13 @@ public class PlayerChunkMap { Chunk chunk = playerchunk.f(); if (chunk != null) { @@ -127,10 +127,10 @@ index 8f6f3a0..eae9276 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1d70abf..b7e063d 100644 +index 5bfdcfd..c3f0f47 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1540,7 +1540,7 @@ public class CraftWorld implements World { +@@ -1557,7 +1557,7 @@ public class CraftWorld implements World { ChunkProviderServer cps = world.getChunkProviderServer(); for (net.minecraft.server.Chunk chunk : cps.chunks.values()) { // If in use, skip it @@ -140,5 +140,5 @@ index 1d70abf..b7e063d 100644 } -- -2.10.2.windows.1 +2.9.3 diff --git a/work/Bukkit b/work/Bukkit index 71d3a3c774..b7a392c072 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 71d3a3c774a2b53458456c49cf6dd2796934ef2d +Subproject commit b7a392c072a92bdeef8e6fc1e2849740bdb1ccca diff --git a/work/CraftBukkit b/work/CraftBukkit index a710176e46..58bff62b2d 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a710176e461fa6192521afdee74b3f9bc315065d +Subproject commit 58bff62b2dc68da958f2e90371582a13aa3c9355