Update upstream B/CB

2016-08-07 00:01:31 -05:00 · 2016-08-07 00:01:31 -05:00 · 15f3ca7ecb
parent 01a09f8ff1
commit 15f3ca7ecb
12 changed files with 48 additions and 48 deletions
--- a/Spigot-API-Patches/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,14 +1,14 @@
-From 578d1f92b19a427d2deb9ded55c699ea9fdbdec4 Mon Sep 17 00:00:00 2001
+From ebe7bf9e6ebef527817214387e1696bcb5ecd7ce Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 22de9f7..570da41 100644
+index 69eda6d..0c12311 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -416,4 +416,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -426,4 +426,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
      * @return collision status
      */
     boolean isCollidable();
@ -29,5 +29,5 @@ index 22de9f7..570da41 100644
 +    // Paper end
 }
 -- 
-2.8.0
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@ -1,4 +1,4 @@
-From 154f0ef603f61f2902d211375f658b61246b350c Mon Sep 17 00:00:00 2001
+From 35c7f457c6c2ae182fba3e9889a240de77c1c4c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@ -964,10 +964,10 @@ index 0668887..e0f448d 100644
                 this.methodProfiler.b();
                 this.U.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1ef30a3..c880d85 100644
+index 03169db..a519b71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1726,6 +1726,7 @@ public final class CraftServer implements Server {
+@@ -1722,6 +1722,7 @@ public final class CraftServer implements Server {
     private final Spigot spigot = new Spigot()
     {
 
@ -975,7 +975,7 @@ index 1ef30a3..c880d85 100644
         @Override
         public YamlConfiguration getConfig()
         {
-@@ -1733,6 +1734,24 @@ public final class CraftServer implements Server {
+@@ -1729,6 +1730,24 @@ public final class CraftServer implements Server {
         }
 
         @Override
@ -1411,5 +1411,5 @@ index 30efc99..eb30abe 100644
     }
 }
 -- 
-2.9.0.windows.1
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
@ -1,4 +1,4 @@
-From a1736bd08470fa83ab378b446396c85282b78180 Mon Sep 17 00:00:00 2001
+From 78b963270f4b2957d9c9b4bbcafc34e2b109a68a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@ -148,10 +148,10 @@ index 37d25c1..8ca0022 100644
                     }
                     lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 34daa73..c3eb23e 100644
+index c9d349a..1d9933f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1723,6 +1723,17 @@ public final class CraftServer implements Server {
+@@ -1719,6 +1719,17 @@ public final class CraftServer implements Server {
         return CraftMagicNumbers.INSTANCE;
     }
 
@ -211,5 +211,5 @@ index be2e31d..6d21c32 100644
         return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                 + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.9.0.windows.1
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ b/Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch
@ -1,4 +1,4 @@
-From a9a860d7ba36c3c64e242508ba5d5b2179a3aa66 Mon Sep 17 00:00:00 2001
+From 5c36bac6b665288e1217a6d54f3c41a1c5b3b886 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@ -33,7 +33,7 @@ index a41c931..453e600 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e83a422..eb1dc5a 100644
+index 2b9959a..fdbf02b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -25,17 +25,11 @@ import javax.imageio.ImageIO;
@ -56,7 +56,7 @@ index e83a422..eb1dc5a 100644
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarFlag;
 import org.bukkit.boss.BarStyle;
-@@ -1607,6 +1601,14 @@ public final class CraftServer implements Server {
+@@ -1603,6 +1597,14 @@ public final class CraftServer implements Server {
     }
 
     public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message) {
@ -71,7 +71,7 @@ index e83a422..eb1dc5a 100644
         if (!(sender instanceof EntityPlayer)) {
             return ImmutableList.of();
         }
-@@ -1614,7 +1616,7 @@ public final class CraftServer implements Server {
+@@ -1610,7 +1612,7 @@ public final class CraftServer implements Server {
         List<String> offers;
         Player player = ((EntityPlayer) sender).getBukkitEntity();
         if (message.startsWith("/")) {
@ -80,7 +80,7 @@ index e83a422..eb1dc5a 100644
         } else {
             offers = tabCompleteChat(player, message);
         }
-@@ -1623,11 +1625,20 @@ public final class CraftServer implements Server {
+@@ -1619,11 +1621,20 @@ public final class CraftServer implements Server {
         getPluginManager().callEvent(tabEvent);
 
         return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
@ -102,7 +102,7 @@ index e83a422..eb1dc5a 100644
         {
             return ImmutableList.of();
         }
-@@ -1635,7 +1646,14 @@ public final class CraftServer implements Server {
+@@ -1631,7 +1642,14 @@ public final class CraftServer implements Server {
 
         List<String> completions = null;
         try {
@ -156,5 +156,5 @@ index 0930d30..7461d04 100644
 
     public static CommandSender lastSender = null; // Nasty :(
 -- 
-2.9.0
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0060-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0060-Expose-server-CommandMap.patch
@ -1,14 +1,14 @@
-From a91cf68943834508930b5314c6cc67c15484194e Mon Sep 17 00:00:00 2001
+From 25e6aa19756ac7da6b70ebf5c66db4ed53f7eb97 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 73f5ea0..07a69d7 100644
+index fdbf02b..f3bad60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1561,6 +1561,7 @@ public final class CraftServer implements Server {
+@@ -1557,6 +1557,7 @@ public final class CraftServer implements Server {
         return helpMap;
     }
 
@ -17,5 +17,5 @@ index 73f5ea0..07a69d7 100644
         return commandMap;
     }
 -- 
-2.9.0
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0062-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-Server-Patches/0062-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@ -1,14 +1,14 @@
-From bec2920701b7661f4dfd3bc75d44f685a7832d0c Mon Sep 17 00:00:00 2001
+From 51bc2e377c4e43cf11a51ff4b0be4a8ce5d2885b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 07a69d7..274b83b 100644
+index f3bad60..59c8826 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1314,6 +1314,18 @@ public final class CraftServer implements Server {
+@@ -1310,6 +1310,18 @@ public final class CraftServer implements Server {
         return count;
     }
 
@ -28,7 +28,7 @@ index 07a69d7..274b83b 100644
     @Deprecated
     public OfflinePlayer getOfflinePlayer(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9955de3..88412f8 100644
+index e09dc78..b3e2e66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -56,5 +56,5 @@ index 9955de3..88412f8 100644
     public String getDisplayName() {
         return getHandle().displayName;
 -- 
-2.9.0
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0072-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0072-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,11 +1,11 @@
-From 93008463fc0aeff69213286894da86add44a934b Mon Sep 17 00:00:00 2001
+From cd875f12a2ab50bf384fce9ace013e478f46eeef Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 42ef70f..124811f 100644
+index 8aaab9e..89e6ef5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1307,10 +1307,12 @@ public abstract class EntityLiving extends Entity {
@ -22,10 +22,10 @@ index 42ef70f..124811f 100644
         this.datawatcher.set(EntityLiving.h, Integer.valueOf(i));
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f13ca63..16da1c9 100644
+index a123d5e..79d60a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -553,4 +553,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -559,4 +559,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public boolean isCollidable() {
         return getHandle().collides;
     }
@ -43,5 +43,5 @@ index f13ca63..16da1c9 100644
 +    // Paper end
 }
 -- 
-2.9.0
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch
@ -1,4 +1,4 @@
-From 7b978e01ccd8711bed786b41b9302bb1d4290d45 Mon Sep 17 00:00:00 2001
+From a182db1fa6f1be5543bab858e24b80a0bd0a900d Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b9c5ae9..8a591ab 100644
+index 7b4539f..db16ba8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1841,4 +1841,21 @@ public final class CraftServer implements Server {
+@@ -1837,4 +1837,21 @@ public final class CraftServer implements Server {
     {
         return spigot;
     }
@ -32,5 +32,5 @@ index b9c5ae9..8a591ab 100644
 +    // Paper end
 }
 -- 
-2.9.0
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch
@ -1,4 +1,4 @@
-From 7cf0e711c6c80eb556adeb298480439f15a9405f Mon Sep 17 00:00:00 2001
+From 973902abbfc253161bc46db73cd093935edcc851 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
@ -26,7 +26,7 @@ index 453e600..11770ad 100644
                 }
             }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8f08fa5..91d00dc 100644
+index e676a01..a9976f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -46,6 +46,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
@ -37,7 +37,7 @@ index 8f08fa5..91d00dc 100644
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.generator.CraftChunkData;
 import org.bukkit.craftbukkit.help.SimpleHelpMap;
-@@ -1865,5 +1866,14 @@ public final class CraftServer implements Server {
+@@ -1861,5 +1862,14 @@ public final class CraftServer implements Server {
             });
         }
     }
@ -53,5 +53,5 @@ index 8f08fa5..91d00dc 100644
     // Paper end
 }
 -- 
-2.9.0
+2.9.2.windows.1

--- a/Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From 138388e6bcda40de657f7031e90f74979868bbd6 Mon Sep 17 00:00:00 2001
+From 4fdfba5dd1fbe77d854e98dd627c01166c5ca6b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -52,10 +52,10 @@ index 1dc8af1..bb578d9 100644
 
     public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 91d00dc..7f1caa8 100644
+index a9976f4..62a598c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -946,7 +946,7 @@ public final class CraftServer implements Server {
+@@ -942,7 +942,7 @@ public final class CraftServer implements Server {
         System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
 
         if (internal.getWorld().getKeepSpawnInMemory()) {
@ -81,5 +81,5 @@ index 0c54005..cf76fd3 100644
                     loadChunk(chunkCoordX + x, chunkCoordZ + z);
                 } else {
 -- 
-2.9.0
+2.9.2.windows.1

--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 9335c0ba4cba58315c014ec460f734f180ab571d
+Subproject commit 18490e51b1665bf838cebd163d11f1aabde4cffe
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9
+Subproject commit 6053c5c8ac74f5e200fe1702fe7ae55bce618460