From b210aa7dfe9fc8db295de6eb2f149d4503ef5b2e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 27 Mar 2016 20:48:50 -0500 Subject: [PATCH] Update upstream B/CB/Spigot and rebuild --- Bukkit | 2 +- CraftBukkit | 2 +- Spigot | 2 +- Spigot-API-Patches/0002-Timings-v2.patch | 8 +++--- ...working-with-arrows-stuck-in-living-.patch | 13 +++++----- Spigot-Server-Patches/0004-Timings-v2.patch | 26 +++++++++---------- .../0012-Player-Exhaustion-Multipliers.patch | 6 ++--- ...022-Further-improve-server-tick-loop.patch | 10 +++---- .../0033-Configurable-end-credits.patch | 10 +++---- .../0040-Add-player-view-distance-API.patch | 8 +++--- .../0041-Disable-explosion-knockback.patch | 12 ++++----- ...figurable-container-update-tick-rate.patch | 10 +++---- ...port-to-tab-completers-vanilla-featu.patch | 12 ++++----- .../0066-Expose-server-CommandMap.patch | 8 +++--- ...cord-chat-API-from-spigot-subclasses.patch | 10 +++---- ...working-with-arrows-stuck-in-living-.patch | 14 +++++----- ...llow-Reloading-of-Custom-Permissions.patch | 6 ++--- ...5-Custom-replacement-for-eaten-items.patch | 6 ++--- ...th-absorb-values-and-repair-bad-data.patch | 12 ++++----- 19 files changed, 88 insertions(+), 89 deletions(-) diff --git a/Bukkit b/Bukkit index 67b9a6f66b..21df80186f 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 67b9a6f66b74a8df1977067ef2bbf45274da1bdf +Subproject commit 21df80186f60e6f13ac9191c9f604a76b1b0b9d5 diff --git a/CraftBukkit b/CraftBukkit index 1ea1adc10f..15222c84b4 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 1ea1adc10f3f068f3d67f472469443fd732d8d2c +Subproject commit 15222c84b49f572175787202ac82cb8efe640477 diff --git a/Spigot b/Spigot index 53e65c99d2..2038f4a1ee 160000 --- a/Spigot +++ b/Spigot @@ -1 +1 @@ -Subproject commit 53e65c99d236cba48e641458aca98993fd11d7bd +Subproject commit 2038f4a1ee03c4152ac216589a008bcdd099cd67 diff --git a/Spigot-API-Patches/0002-Timings-v2.patch b/Spigot-API-Patches/0002-Timings-v2.patch index 588d73bdef..123b287b1f 100644 --- a/Spigot-API-Patches/0002-Timings-v2.patch +++ b/Spigot-API-Patches/0002-Timings-v2.patch @@ -1,4 +1,4 @@ -From 115a69756eb8f99a16be4b602e75edce84128684 Mon Sep 17 00:00:00 2001 +From ffc094f33f81e73c7067ef740dc22183e4553369 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -3160,10 +3160,10 @@ index fc59aa3..0000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 649cd45..3242c69 100644 +index 8e38006..19f7ae7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1356,6 +1356,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1360,6 +1360,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } @@ -3538,5 +3538,5 @@ index 8d98297..7e89b97 100644 - } } -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 234173c7af..1ae4fdf758 100644 --- a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,23 +1,22 @@ -From 4a940f6fb654c6297cb3aa11127d0ed03027c578 Mon Sep 17 00:00:00 2001 +From ed0f87d97dc3b1e85e2ef56ba8d6ec1e871df32d Mon Sep 17 00:00:00 2001 From: mrapple 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 8827c6c..9d25133 100644 +index 22de9f7..570da41 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -394,4 +394,20 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti - * @return true if the entity has AI, otherwise false. +@@ -416,4 +416,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti + * @return collision status */ - boolean hasAI(); + boolean isCollidable(); + + // Paper start -+ + /** + * Get the number of arrows stuck in this entity -+ * * @return Number of arrows stuck ++ * @return Number of arrows stuck + */ + int getArrowsStuck(); + diff --git a/Spigot-Server-Patches/0004-Timings-v2.patch b/Spigot-Server-Patches/0004-Timings-v2.patch index cdcc6627bd..00b3c2fc92 100644 --- a/Spigot-Server-Patches/0004-Timings-v2.patch +++ b/Spigot-Server-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 15b0477798ca18b841f8ce8f5b5d66003a159b9f Mon Sep 17 00:00:00 2001 +From 66aac33b3c5fdc29d155afdca2a5cdfaaa492ad4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -328,7 +328,7 @@ index 3665f8a..146223a 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 5755e44..42ae9fd 100644 +index 1609977..569ab24 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -24,7 +24,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; @@ -340,7 +340,7 @@ index 5755e44..42ae9fd 100644 public abstract class EntityLiving extends Entity { -@@ -1690,7 +1690,6 @@ public abstract class EntityLiving extends Entity { +@@ -1691,7 +1691,6 @@ public abstract class EntityLiving extends Entity { } public void m() { @@ -348,7 +348,7 @@ index 5755e44..42ae9fd 100644 super.m(); this.cu(); if (!this.world.isClientSide) { -@@ -1763,9 +1762,7 @@ public abstract class EntityLiving extends Entity { +@@ -1764,9 +1763,7 @@ public abstract class EntityLiving extends Entity { } } @@ -358,7 +358,7 @@ index 5755e44..42ae9fd 100644 double d0 = this.locX - this.lastX; double d1 = this.locZ - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -1834,8 +1831,6 @@ public abstract class EntityLiving extends Entity { +@@ -1835,8 +1832,6 @@ public abstract class EntityLiving extends Entity { } else { this.bo = 0; } @@ -367,7 +367,7 @@ index 5755e44..42ae9fd 100644 } protected float h(float f, float f1) { -@@ -1900,7 +1895,6 @@ public abstract class EntityLiving extends Entity { +@@ -1901,7 +1896,6 @@ public abstract class EntityLiving extends Entity { } this.world.methodProfiler.a("ai"); @@ -375,7 +375,7 @@ index 5755e44..42ae9fd 100644 if (this.cf()) { this.bc = false; this.bd = 0.0F; -@@ -1911,7 +1905,6 @@ public abstract class EntityLiving extends Entity { +@@ -1912,7 +1906,6 @@ public abstract class EntityLiving extends Entity { this.doTick(); this.world.methodProfiler.b(); } @@ -383,7 +383,7 @@ index 5755e44..42ae9fd 100644 this.world.methodProfiler.b(); this.world.methodProfiler.a("jump"); -@@ -1934,14 +1927,10 @@ public abstract class EntityLiving extends Entity { +@@ -1935,14 +1928,10 @@ public abstract class EntityLiving extends Entity { this.be *= 0.98F; this.bf *= 0.9F; this.r(); @@ -715,10 +715,10 @@ index 4f9136d..10e06d6 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 7e5870f..fbfb2ab 100644 +index 7fae554..3f27fe6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1715,6 +1715,7 @@ public final class CraftServer implements Server { +@@ -1719,6 +1719,7 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { @@ -726,7 +726,7 @@ index 7e5870f..fbfb2ab 100644 @Override public YamlConfiguration getConfig() { -@@ -1722,6 +1723,24 @@ public final class CraftServer implements Server { +@@ -1726,6 +1727,24 @@ public final class CraftServer implements Server { } @Override @@ -931,7 +931,7 @@ index 41d2d87..0000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c137882..c9c30eb 100644 +index 70580f7..dfa5962 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -951,7 +951,7 @@ index c137882..c9c30eb 100644 import org.bukkit.craftbukkit.map.CraftMapView; import org.bukkit.craftbukkit.map.RenderData; import org.bukkit.craftbukkit.scoreboard.CraftScoreboard; -@@ -1531,6 +1525,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1528,6 +1522,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } diff --git a/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch index c4cc8e9b4f..658dbd7ad8 100644 --- a/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch @@ -1,4 +1,4 @@ -From 2dd4146d10140fbee261290a58dbfd30171659ff Mon Sep 17 00:00:00 2001 +From a289c8985b7dfb59cc21e064a1e1a01c5cde7be4 Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 1 Mar 2016 13:43:16 -0600 Subject: [PATCH] Player Exhaustion Multipliers @@ -36,10 +36,10 @@ index 88e1e98..0f71013 100644 ItemStack itemstack1 = this.u(iblockdata); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0e6c7c7..c599b6a 100644 +index e8c13ea..8e143f7 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1450,13 +1450,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1448,13 +1448,13 @@ public abstract class EntityHuman extends EntityLiving { i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.q, i); diff --git a/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch index 44d924147c..3f8f087ecf 100644 --- a/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 3b042cc2cd7d071aa70a1b4b92b2cec2340ed91b Mon Sep 17 00:00:00 2001 +From 44424f7123cadb3774379d741192c9bef237146d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 81c1246..6ae06a5 100644 +index d901d2c..e9bb02f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -109,17 +109,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -148,10 +148,10 @@ index 81c1246..6ae06a5 100644 } lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ebee7ee..b27d95a 100644 +index 52155e8..14e5647 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1712,6 +1712,17 @@ public final class CraftServer implements Server { +@@ -1716,6 +1716,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.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0033-Configurable-end-credits.patch b/Spigot-Server-Patches/0033-Configurable-end-credits.patch index cdedb4bb9b..414591a90e 100644 --- a/Spigot-Server-Patches/0033-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0033-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From a0fe380f5153cbc63cf9c9243bc64b2d1542bfa0 Mon Sep 17 00:00:00 2001 +From fa94c2db66e9f3505e95e813ef9282fc287d404a Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits @@ -20,10 +20,10 @@ index e0e9a65..3a57c8e 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8f57b21..47ba1e3 100644 +index 3e33f49..8d04c82 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -523,6 +523,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return this.world.pvpMode; } @@ -39,7 +39,7 @@ index 8f57b21..47ba1e3 100644 public Entity c(int i) { //this.cj = true; // CraftBukkit - Moved down and into PlayerList#changeDimension if (this.dimension == 1 && i == 1) { -@@ -530,7 +539,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -515,7 +524,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.world.kill(this); if (!this.viewingCredits) { this.viewingCredits = true; @@ -52,5 +52,5 @@ index 8f57b21..47ba1e3 100644 } else { this.b((Statistic) AchievementList.D); -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch index 6442209cf4..aab139bcbf 100644 --- a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From cd242a9551a73a6e3cd0d3fd844b0db333f59dd3 Mon Sep 17 00:00:00 2001 +From e4208537faca7d7cfacd8f03c0e5230962f9179d 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 47ba1e3..35d96ff 100644 +index 8d04c82..ed307bc 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -53,6 +53,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -16,7 +16,7 @@ index 47ba1e3..35d96ff 100644 // CraftBukkit start public String displayName; -@@ -83,6 +84,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -68,6 +69,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) { super(worldserver, gameprofile); @@ -88,7 +88,7 @@ index 8ef7eb2..5421026 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 471ad38..fe5768a 100644 +index 8370d94..8e94ddd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1416,6 +1416,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch index ca3b5e0dae..c804290852 100644 --- a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch @@ -1,11 +1,11 @@ -From e1f95b252b35b6a9e5aae2357396a2864a151ab7 Mon Sep 17 00:00:00 2001 +From 3af943e6034e05afb56355211d24a9fe2c9c994c Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 78a1e59..6fce2b3 100644 +index 095f3b6..491a8a7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -221,4 +221,9 @@ public class PaperWorldConfig { @@ -19,10 +19,10 @@ index 78a1e59..6fce2b3 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1ad0594..d477466 100644 +index 569ab24..da52fe7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -854,12 +854,14 @@ public abstract class EntityLiving extends Entity { +@@ -855,12 +855,14 @@ public abstract class EntityLiving extends Entity { } } @@ -37,7 +37,7 @@ index 1ad0594..d477466 100644 this.world.broadcastEntityEffect(this, (byte) 2); } -@@ -883,6 +885,8 @@ public abstract class EntityLiving extends Entity { +@@ -884,6 +886,8 @@ public abstract class EntityLiving extends Entity { } } @@ -69,5 +69,5 @@ index 5bb2510..418ee29 100644 } } -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0048-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0048-Configurable-container-update-tick-rate.patch index a67019041b..73a582a622 100644 --- a/Spigot-Server-Patches/0048-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0048-Configurable-container-update-tick-rate.patch @@ -1,11 +1,11 @@ -From f9a7bf0e0462b0d9845e64a9cb8e51c79c787730 Mon Sep 17 00:00:00 2001 +From c945db505af96a5c252515ac904218fabbce5f58 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2cfeb9c..a4d9b16 100644 +index 8d97890..91eb5de 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -247,4 +247,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 2cfeb9c..a4d9b16 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 35d96ff..f93b6a1 100644 +index ed307bc..2681aa5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -54,6 +54,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -30,7 +30,7 @@ index 35d96ff..f93b6a1 100644 // CraftBukkit start public String displayName; -@@ -215,7 +216,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -200,7 +201,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { --this.noDamageTicks; } @@ -45,5 +45,5 @@ index 35d96ff..f93b6a1 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch b/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch index 76abad2cc4..dc40d7072e 100644 --- a/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch +++ b/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch @@ -1,4 +1,4 @@ -From f5d0f96c004c8bbae8fc9a036da32ffd36db3dad Mon Sep 17 00:00:00 2001 +From fcf90d0153ab06175704b06e7e439750b96d2869 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Thu, 3 Mar 2016 01:44:39 -0600 Subject: [PATCH] Add Location support to tab completers (vanilla feature @@ -20,7 +20,7 @@ index 1f97e59..ca11cd7 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a30b019..6aaba5e 100644 +index 5076aa3..d628a32 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1186,7 +1186,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -33,7 +33,7 @@ index a30b019..6aaba5e 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5a24d38..8073c20 100644 +index c6cee80..3a288bd 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 5a24d38..8073c20 100644 import org.bukkit.boss.BarColor; import org.bukkit.boss.BarFlag; import org.bukkit.boss.BarStyle; -@@ -1602,21 +1596,38 @@ public final class CraftServer implements Server { +@@ -1606,21 +1600,38 @@ public final class CraftServer implements Server { } public List tabComplete(net.minecraft.server.ICommandListener sender, String message) { @@ -97,7 +97,7 @@ index 5a24d38..8073c20 100644 { return ImmutableList.of(); } -@@ -1624,7 +1635,14 @@ public final class CraftServer implements Server { +@@ -1628,7 +1639,14 @@ public final class CraftServer implements Server { List completions = null; try { @@ -151,5 +151,5 @@ index 100d84a..a40218c 100644 public static CommandSender lastSender = null; // Nasty :( -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch index efbacc3e02..b35adc6ffc 100644 --- a/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From 8fd763183a1bd1de2cebe68ef6a31a67bca01231 Mon Sep 17 00:00:00 2001 +From 81735e45cd45e6dfecd4012238991f8e920c1727 Mon Sep 17 00:00:00 2001 From: kashike 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 8073c20..76f50ae 100644 +index 3a288bd..794a2c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1556,6 +1556,7 @@ public final class CraftServer implements Server { +@@ -1560,6 +1560,7 @@ public final class CraftServer implements Server { return helpMap; } @@ -17,5 +17,5 @@ index 8073c20..76f50ae 100644 return commandMap; } -- -2.7.2 +2.7.4 diff --git a/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 7435562a29..725444236f 100644 --- a/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,14 +1,14 @@ -From 31b6e1bf9da0e6bd894023fc7ef1b062233c4061 Mon Sep 17 00:00:00 2001 +From 82df621abfd19841957920d11a85c01578fe37f5 Mon Sep 17 00:00:00 2001 From: Zach Brown 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 76f50ae..cb9906a 100644 +index 794a2c9..53bfbc4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1309,6 +1309,22 @@ public final class CraftServer implements Server { +@@ -1313,6 +1313,22 @@ public final class CraftServer implements Server { return count; } @@ -32,7 +32,7 @@ index 76f50ae..cb9906a 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 582ab4c..10bf160 100644 +index 8e94ddd..f5a48f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -156,6 +156,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -59,5 +59,5 @@ index 582ab4c..10bf160 100644 public String getDisplayName() { return getHandle().displayName; -- -2.7.2 +2.7.4 diff --git a/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch index f6e00ddf54..cfc5453d12 100644 --- a/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,14 +1,14 @@ -From ea1fa24b9dba982cd21c482ccb91a2e870d7de54 Mon Sep 17 00:00:00 2001 +From 64a5ce6845ec10f63c342d57c304a2c498025462 Mon Sep 17 00:00:00 2001 From: mrapple 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 0891ff1..8be17ae 100644 +index da52fe7..2363b1f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1271,10 +1271,12 @@ public abstract class EntityLiving extends Entity { +@@ -1272,10 +1272,12 @@ public abstract class EntityLiving extends Entity { return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue(); } @@ -22,12 +22,12 @@ index 0891ff1..8be17ae 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 85c88b5..55bdd06 100644 +index aed3e4f..0502593 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -543,4 +543,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - public boolean hasAI() { - return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename +@@ -553,4 +553,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + public boolean isCollidable() { + return getHandle().collides; } + + // Paper start diff --git a/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch index e16f8a5a0f..e85139671f 100644 --- a/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 893bd0213743e6ad60d20639bee6a893fccc8244 Mon Sep 17 00:00:00 2001 +From ab5c2b319d6632eeb2e56ff9300380eca3fa469e Mon Sep 17 00:00:00 2001 From: William 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 2493a23..0aea5df 100644 +index 8ffc06b..29244e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1834,4 +1834,12 @@ public final class CraftServer implements Server { +@@ -1838,4 +1838,12 @@ public final class CraftServer implements Server { { return spigot; } diff --git a/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch index 7f2a88c609..b5636476dd 100644 --- a/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch @@ -1,14 +1,14 @@ -From a47ac50f9f616f25c470b95d7b2e8ead462326eb Mon Sep 17 00:00:00 2001 +From 6997b32417354b476329fec2cef26611865260aa Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8be17ae..efeb9a0 100644 +index 2363b1f..624730a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2215,12 +2215,25 @@ public abstract class EntityLiving extends Entity { +@@ -2216,12 +2216,25 @@ public abstract class EntityLiving extends Entity { ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.bm.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this); // CraftBukkit end diff --git a/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 83f63ed26f..2498cd344b 100644 --- a/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,14 +1,14 @@ -From bf7b898c3b64fe3eec538d0659a1345c736d57e5 Mon Sep 17 00:00:00 2001 +From 2f5d4809b3c6bae28732715efc769cfcb6896155 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index efeb9a0..58be7c8 100644 +index 624730a..7883ba7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -457,7 +457,13 @@ public abstract class EntityLiving extends Entity { +@@ -458,7 +458,13 @@ public abstract class EntityLiving extends Entity { } public void a(NBTTagCompound nbttagcompound) { @@ -23,7 +23,7 @@ index efeb9a0..58be7c8 100644 if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) { GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10)); } -@@ -742,6 +748,10 @@ public abstract class EntityLiving extends Entity { +@@ -743,6 +749,10 @@ public abstract class EntityLiving extends Entity { } public void setHealth(float f) { @@ -34,7 +34,7 @@ index efeb9a0..58be7c8 100644 // CraftBukkit start - Handle scaled health if (this instanceof EntityPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); -@@ -2085,7 +2095,7 @@ public abstract class EntityLiving extends Entity { +@@ -2086,7 +2096,7 @@ public abstract class EntityLiving extends Entity { } public void setAbsorptionHearts(float f) { @@ -44,7 +44,7 @@ index efeb9a0..58be7c8 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index da99440..8b1daaf 100644 +index a168a77..fe5084e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1371,6 +1371,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {