From e36ba8dd96d6bd7da60bab07b94f8e4c69f47012 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 7 Aug 2013 17:16:57 +1000 Subject: [PATCH] Upstream merge --- Bukkit | 2 +- Bukkit-Patches/0001-POM-Changes.patch | 6 ++--- Bukkit-Patches/0004-Enchanced-Timings.patch | 25 +++++++------------ Bukkit-Patches/0006-BungeeCord-Support.patch | 6 ++--- Bukkit-Patches/0008-Add-Particle-API.patch | 10 ++++---- ...lSessionData-to-the-Conversation-API.patch | 8 +++--- .../0015-Catch-Conversation-API-Errors.patch | 8 +++--- .../0016-Player-Collision-API.patch | 6 ++--- CraftBukkit | 2 +- CraftBukkit-Patches/0001-POM-Changes.patch | 8 +++--- CraftBukkit-Patches/0024-Netty.patch | 10 ++++---- ...44-Do-Not-Search-for-Offline-Players.patch | 6 ++--- ...low-Disabling-of-Command-TabComplete.patch | 6 ++--- 13 files changed, 48 insertions(+), 55 deletions(-) diff --git a/Bukkit b/Bukkit index bf832ee9d..e7f3d5522 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit bf832ee9d60b348f0b003631c411c5f3fe23226c +Subproject commit e7f3d552215a9d117a4616801e14e715d4425efb diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index c9aab588e..fb3e2e4b0 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 9db1438e367a3affd9f1d5bd9c884e132372053a Mon Sep 17 00:00:00 2001 +From af02a7e6f7a94b882fc13435e78e9f2eca684060 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 2401f81..95d042b 100644 +index fbdc3c3..34c13e9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,43 +1,23 @@ @@ -23,7 +23,7 @@ index 2401f81..95d042b 100644 + + org.spigotmc + spigot-api - 1.6.2-R0.1-SNAPSHOT + 1.6.2-R0.2-SNAPSHOT - Bukkit - http://www.bukkit.org + Spigot-API diff --git a/Bukkit-Patches/0004-Enchanced-Timings.patch b/Bukkit-Patches/0004-Enchanced-Timings.patch index 4031ba69c..7fe3f786c 100644 --- a/Bukkit-Patches/0004-Enchanced-Timings.patch +++ b/Bukkit-Patches/0004-Enchanced-Timings.patch @@ -1,4 +1,4 @@ -From 197ca3eeed436bb69e5b42db246dc8537d796134 Mon Sep 17 00:00:00 2001 +From 945cdf1a3e7eec1f1b2b4ed7c3a7f8d408a76530 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 11:17:05 +1000 Subject: [PATCH] Enchanced Timings @@ -17,7 +17,7 @@ index fb3c90f..ffbcac1 100644 Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Reload complete."); diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -index e3777ea..d2f5d29 100644 +index 7c28b75..b9c19de 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java @@ -35,7 +35,7 @@ public class TimingsCommand extends BukkitCommand { @@ -87,14 +87,7 @@ index e3777ea..d2f5d29 100644 int index = 0; int pluginIdx = 0; File timingFolder = new File("timings"); -@@ -99,12 +126,15 @@ public class TimingsCommand extends BukkitCommand { - totalTime += time; - Event event = trl.getEvent(); - if (count > 0 && event != null) { -- fileTimings.println(" " + event.getClass().getSimpleName() + (trl.hasMultiple() ? " (and others)" : "") + " Time: " + time + " Count: " + count + " Avg: " + avg); -+ fileTimings.println(" " + event.getClass().getSimpleName() + (trl.hasMultiple() ? " (and others)" : "") + " Time: " + time + " Count: " + count + " Avg: " + avg + " Violations: " + trl.violations); // Spigot - } - } +@@ -105,6 +132,9 @@ public class TimingsCommand extends BukkitCommand { } fileTimings.println(" Total time " + totalTime + " (" + totalTime / 1000000000 + "s)"); } @@ -113,7 +106,7 @@ index e3777ea..d2f5d29 100644 } catch (IOException e) { } finally { diff --git a/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java b/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java -index ed25e17..064a320 100644 +index d86805b..4b744ea 100644 --- a/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java +++ b/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java @@ -11,6 +11,10 @@ import org.bukkit.event.Listener; @@ -124,7 +117,7 @@ index ed25e17..064a320 100644 + public long curTickTotal = 0; + public long violations = 0; + // Spigot end - private Event event; + private Class eventClass; private boolean multiple = false; @@ -20,6 +24,13 @@ public class TimedRegisteredListener extends RegisteredListener { @@ -132,7 +125,7 @@ index ed25e17..064a320 100644 @Override public void callEvent(Event event) throws EventException { + // Spigot start -+ if ( !org.bukkit.Bukkit.getServer().getPluginManager().useTimings() ) ++ if ( org.bukkit.Bukkit.getServer() != null && !org.bukkit.Bukkit.getServer().getPluginManager().useTimings() ) + { + super.callEvent( event ); + return; @@ -141,7 +134,7 @@ index ed25e17..064a320 100644 if (event.isAsynchronous()) { super.callEvent(event); return; -@@ -33,7 +44,11 @@ public class TimedRegisteredListener extends RegisteredListener { +@@ -34,7 +45,11 @@ public class TimedRegisteredListener extends RegisteredListener { } long start = System.nanoTime(); super.callEvent(event); @@ -153,8 +146,8 @@ index ed25e17..064a320 100644 + // Spigot end } - /** -@@ -42,6 +57,10 @@ public class TimedRegisteredListener extends RegisteredListener { + private static Class getCommonSuperclass(Class class1, Class class2) { +@@ -50,6 +65,10 @@ public class TimedRegisteredListener extends RegisteredListener { public void reset() { count = 0; totalTime = 0; diff --git a/Bukkit-Patches/0006-BungeeCord-Support.patch b/Bukkit-Patches/0006-BungeeCord-Support.patch index cc7249201..925b1d3a4 100644 --- a/Bukkit-Patches/0006-BungeeCord-Support.patch +++ b/Bukkit-Patches/0006-BungeeCord-Support.patch @@ -1,14 +1,14 @@ -From d7c8f70a489cad01a1194e49861173e0089f955a Mon Sep 17 00:00:00 2001 +From d4a9dfb80cd5f9f6a45bd291e8297a749f665b2c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d492790..115103b 100644 +index ab022b5..39d3800 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -705,4 +705,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -709,4 +709,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @see Player#setHealthScaled(boolean) */ public double getHealthScale(); diff --git a/Bukkit-Patches/0008-Add-Particle-API.patch b/Bukkit-Patches/0008-Add-Particle-API.patch index 117cfec1d..78f9523f0 100644 --- a/Bukkit-Patches/0008-Add-Particle-API.patch +++ b/Bukkit-Patches/0008-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From 3210cbac122199792cd0215e413c8a6b10c55f76 Mon Sep 17 00:00:00 2001 +From 67d547e70742f6fe39e9b675cb1ede34f413ceed Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API @@ -259,10 +259,10 @@ index 175750f..ae1f4fd 100644 + public enum Type {SOUND, VISUAL, PARTICLE} } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e14fe40..9ae9b2d 100644 +index c86cfbc..186bb77 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1063,6 +1063,56 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1066,6 +1066,56 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public boolean isGameRule(String rule); @@ -320,10 +320,10 @@ index e14fe40..9ae9b2d 100644 * Represents various map environment types that a world may be */ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8402be7..a809f18 100644 +index 39d3800..be2f4dc 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -720,6 +720,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -724,6 +724,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0014-Added-getAllSessionData-to-the-Conversation-API.patch b/Bukkit-Patches/0014-Added-getAllSessionData-to-the-Conversation-API.patch index b405bfbbd..9f45c3877 100644 --- a/Bukkit-Patches/0014-Added-getAllSessionData-to-the-Conversation-API.patch +++ b/Bukkit-Patches/0014-Added-getAllSessionData-to-the-Conversation-API.patch @@ -1,14 +1,14 @@ -From 7dcd6e3e77ee83a18170832951b483718b7543e3 Mon Sep 17 00:00:00 2001 +From 1f0602e700904904b1d77ec02b066f955dcf6ea0 Mon Sep 17 00:00:00 2001 From: Alex Bennett Date: Thu, 11 Jul 2013 15:31:32 -0500 Subject: [PATCH] Added getAllSessionData() to the Conversation API. diff --git a/src/main/java/org/bukkit/conversations/ConversationContext.java b/src/main/java/org/bukkit/conversations/ConversationContext.java -index 4ff9858..22aa1a9 100644 +index 7a5b5ed..6b4bcac 100644 --- a/src/main/java/org/bukkit/conversations/ConversationContext.java +++ b/src/main/java/org/bukkit/conversations/ConversationContext.java -@@ -42,6 +42,14 @@ public class ConversationContext { +@@ -44,6 +44,14 @@ public class ConversationContext { } /** @@ -22,7 +22,7 @@ index 4ff9858..22aa1a9 100644 + /** * Gets session data shared between all {@link Prompt} invocations. Use this as a way * to pass data through each Prompt as the conversation develops. - * @param key The session data key. + * -- 1.8.1.2 diff --git a/Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch b/Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch index 292132f68..26b5b0327 100644 --- a/Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch +++ b/Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch @@ -1,14 +1,14 @@ -From 516fc890c3adab13a5432549d0767f07849c4611 Mon Sep 17 00:00:00 2001 +From fb52162279c4bf3d6c38cf9f731e60addeffb073 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 22 Jul 2013 19:09:43 +1000 Subject: [PATCH] Catch Conversation API Errors diff --git a/src/main/java/org/bukkit/conversations/Conversation.java b/src/main/java/org/bukkit/conversations/Conversation.java -index 43cc362..219e13e 100644 +index a30745f..55c9785 100644 --- a/src/main/java/org/bukkit/conversations/Conversation.java +++ b/src/main/java/org/bukkit/conversations/Conversation.java -@@ -181,6 +181,7 @@ public class Conversation { +@@ -193,6 +193,7 @@ public class Conversation { * @param input The user's chat text. */ public void acceptInput(String input) { @@ -16,7 +16,7 @@ index 43cc362..219e13e 100644 if (currentPrompt != null) { // Echo the user's input -@@ -200,6 +201,12 @@ public class Conversation { +@@ -212,6 +213,12 @@ public class Conversation { currentPrompt = currentPrompt.acceptInput(context, input); outputNextPrompt(); } diff --git a/Bukkit-Patches/0016-Player-Collision-API.patch b/Bukkit-Patches/0016-Player-Collision-API.patch index eb41d0264..0696d9745 100644 --- a/Bukkit-Patches/0016-Player-Collision-API.patch +++ b/Bukkit-Patches/0016-Player-Collision-API.patch @@ -1,14 +1,14 @@ -From 36b0eed14a6230d0e47ac5484186ce568ae60490 Mon Sep 17 00:00:00 2001 +From 9836664f97abdff7f7eaa35ee496e496976270e0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:20:50 +1000 Subject: [PATCH] Player Collision API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a809f18..fb21501 100644 +index be2f4dc..cb99199 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -725,6 +725,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -729,6 +729,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/CraftBukkit b/CraftBukkit index 5af5f5df2..e74e4dc8a 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 5af5f5df2581d478828fc77e0f8672f749ebb7a9 +Subproject commit e74e4dc8a231c11c659bda97221be19dcb5cd524 diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index f0bf368a7..604abdb8e 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From fd0c4c152a4a3c0d4bc8d5c4471715695c9c6b4b Mon Sep 17 00:00:00 2001 +From f286b76dd6551fc08ca2f1a0a83e3498f2454cd9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 8139fbf..afe0225 100644 +index a46ecbd..0e6c422 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,20 @@ @@ -25,7 +25,7 @@ index 8139fbf..afe0225 100644 + org.spigotmc + spigot jar - 1.6.2-R0.1-SNAPSHOT + 1.6.2-R0.2-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot @@ -140,7 +140,7 @@ index 8139fbf..afe0225 100644 package diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6cb50b7..00326c1 100644 +index df2efe2..d9396f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -208,7 +208,7 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0024-Netty.patch b/CraftBukkit-Patches/0024-Netty.patch index 27885bc2c..cba71c889 100644 --- a/CraftBukkit-Patches/0024-Netty.patch +++ b/CraftBukkit-Patches/0024-Netty.patch @@ -1,11 +1,11 @@ -From 6a0aa29e1762ab96b8f3f1f1957c266925e06fec Mon Sep 17 00:00:00 2001 +From 147b1c393ad343fe4f3449ed7c61ee9430947587 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 09:06:29 +1000 Subject: [PATCH] Netty diff --git a/pom.xml b/pom.xml -index afe0225..8be284c 100644 +index 0e6c422..401dd2d 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,21 @@ @@ -15,12 +15,12 @@ index afe0225..8be284c 100644 + + io.netty + netty-codec -+ 4.0.4.Final ++ 4.0.6.Final + + + io.netty + netty-handler -+ 4.0.4.Final ++ 4.0.6.Final + + + org.javassist @@ -160,7 +160,7 @@ index c9e187e..b433c60 100644 this.b = true; } catch (Exception exception) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index a0d5047..736ba25 100644 +index 8499c7f..e5a09b3 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -6,6 +6,8 @@ import java.io.IOException; diff --git a/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch index c40711cf0..63baeebb1 100644 --- a/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch +++ b/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch @@ -1,4 +1,4 @@ -From 11737192759a711cb1692aadb207692b3f003f91 Mon Sep 17 00:00:00 2001 +From ba298d9ef487cec55284286782d87dcba11a9f05 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 16 Jun 2013 08:20:26 +1000 Subject: [PATCH] Do Not Search for Offline Players @@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e65c752..389f80e 100644 +index 84ff542..c127f2a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1094,7 +1094,7 @@ public final class CraftServer implements Server { +@@ -1098,7 +1098,7 @@ public final class CraftServer implements Server { } public OfflinePlayer getOfflinePlayer(String name) { diff --git a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch index d030849fa..34860bd3f 100644 --- a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch @@ -1,14 +1,14 @@ -From 0609e78093f3d90c3cffe1c7592b3260b4283244 Mon Sep 17 00:00:00 2001 +From 31f79e7e3a92d88ec1e3290104c71311d20b5d93 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 389f80e..267605b 100644 +index c127f2a..0fa69ea 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1361,7 +1361,7 @@ public final class CraftServer implements Server { +@@ -1365,7 +1365,7 @@ public final class CraftServer implements Server { public List tabCompleteCommand(Player player, String message) { List completions = null; try {