mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source 
Remove two features added upstream
This commit is contained in:
Zach Brown 2016-08-27 18:41:58 -05:00
parent 16a7cf1c01
commit b170e8cedb
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
151 changed files with 420 additions and 1094 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Spigot-API-Patches/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From bb78dbc2059b4beee7c9d8a36ebcba8c5bd53e0b Mon Sep 17 00:00:00 2001
From 3772e09053af9dd7d76f320160f2bd0cb38ea155 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -2933,10 +2933,10 @@ index 69720e9..f82cbaf 100644
* Sends the component to the player
*
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 0ba9b1c..548d570 100644
index ffbe5dd..4c86694 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -31,7 +31,8 @@ public abstract class Command {
@@ -32,7 +32,8 @@ public abstract class Command {
protected String usageMessage;
private String permission;
private String permissionMessage;
@ -2946,7 +2946,7 @@ index 0ba9b1c..548d570 100644
protected Command(String name) {
this(name, "", "/" + name, new ArrayList<String>());
@@ -45,7 +46,6 @@ public abstract class Command {
@@ -46,7 +47,6 @@ public abstract class Command {
this.usageMessage = usageMessage;
this.aliases = aliases;
this.activeAliases = new ArrayList<String>(aliases);
@ -2954,7 +2954,7 @@ index 0ba9b1c..548d570 100644
}
/**
@@ -229,7 +229,6 @@ public abstract class Command {
@@ -250,7 +250,6 @@ public abstract class Command {
public boolean setLabel(String name) {
this.nextLabel = name;
if (!isRegistered()) {
@ -2985,10 +2985,10 @@ index 3f07d7f..f89ad07 100644
return i >= j && i <= k;
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index e2fc282..66385c4 100644
index 5965514..466757b 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -30,7 +30,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
register("bukkit", new VersionCommand("version"));
register("bukkit", new ReloadCommand("reload"));
register("bukkit", new PluginsCommand("plugins"));
@ -2997,7 +2997,7 @@ index e2fc282..66385c4 100644
}
public void setFallbackCommands() {
@@ -59,6 +59,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -60,6 +60,7 @@ public class SimpleCommandMap implements CommandMap {
* {@inheritDoc}
*/
public boolean register(String label, String fallbackPrefix, Command command) {
@ -3005,7 +3005,7 @@ index e2fc282..66385c4 100644
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
boolean registered = register(label, command, false, fallbackPrefix);
@@ -134,6 +135,12 @@ public class SimpleCommandMap implements CommandMap {
@@ -135,6 +136,12 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
@ -3351,10 +3351,10 @@ index 1056186..4ee123e 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 7bf2fa6..4983ea8 100644
index a1d174f..6b159ed 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -39,7 +39,6 @@ import org.bukkit.plugin.PluginLoader;
@@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
import org.bukkit.plugin.RegisteredListener;
import org.bukkit.plugin.TimedRegisteredListener;
import org.bukkit.plugin.UnknownDependencyException;
@ -3362,15 +3362,15 @@ index 7bf2fa6..4983ea8 100644
import org.yaml.snakeyaml.error.YAMLException;
/**
@@ -50,7 +49,6 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -51,7 +50,6 @@ public final class JavaPluginLoader implements PluginLoader {
private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
private final Map<String, PluginClassLoader> loaders = new LinkedHashMap<String, PluginClassLoader>();
private final Map<String, PluginClassLoader> loaders = Collections.synchronizedMap(new LinkedHashMap<String, PluginClassLoader>());
- public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
/**
* This class was not meant to be constructed explicitly
@@ -293,26 +291,20 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -291,26 +289,20 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
- }
}
--
2.9.3
2.9.2.windows.1

169
Spigot-API-Patches/0013-Add-Location-support-to-tab-completers-vanilla-featu.patch
View file

@ -1,169 +0,0 @@
From 18a7c61b49b65c2a682a9b8274e0d81e11975cae Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Mon, 29 Feb 2016 19:37:41 -0600
Subject: [PATCH] Add Location support to tab completers (vanilla feature
missing in CraftBukkit)
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 548d570..18c54b3 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -8,6 +8,7 @@ import java.util.Set;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
+import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.entity.minecart.CommandMinecart;
@@ -109,6 +110,31 @@ public abstract class Command {
return matchedPlayers;
}
+ // Paper start - location tab-completes
+
+ /**
+ * Executed on tab completion for this command, returning a list of options the player can tab through. This method
+ * returns the {@link Location} of the block the player is looking at at the time of the tab complete.
+ * <p>
+ * Commands that want to use the Location information in their tab-complete implementations need to override this
+ * method. The Location provided by this method is the block that the player is currently looking at when the player
+ * attempts the tab complete. For this to be valid, the block must be highlighted by the player (i.e. the player is
+ * close enough to interact with the block).
+ *
+ * @param sender Source object which is executing this command
+ * @param alias the alias being used
+ * @param args All arguments passed to the command, split via ' '
+ * @param location the location of the block the player is looking at
+ * @return a list of tab-completions for the specified arguments. This
+ * will never be null. List may be immutable.
+ * @throws IllegalArgumentException if sender, alias, or args is null
+ */
+ public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
+ // Simply default to the standard tab-complete, subclasses can override this if needed
+ return tabComplete(sender, alias, args);
+ }
+ // Paper end
+
/**
* Returns the name of this command
*
diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
index 3bfa31f..9b93872 100644
--- a/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -3,6 +3,7 @@ package org.bukkit.command;
import java.util.List;
import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
import org.bukkit.plugin.Plugin;
/**
@@ -122,6 +123,15 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
*/
@Override
public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws CommandException, IllegalArgumentException {
+ return tabComplete(sender, alias, args, null); // Paper - The code from this method has been (slightly modified) moved to the Location method.
+ }
+
+ // PaperSpigot start - location tab-completes
+ /**
+ * This code was copied from tabComplete(CommandSender sender, String alias, String[] args)
+ */
+ @Override
+ public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws CommandException, IllegalArgumentException {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(args, "Arguments cannot be null");
Validate.notNull(alias, "Alias cannot be null");
@@ -129,10 +139,10 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
List<String> completions = null;
try {
if (completer != null) {
- completions = completer.onTabComplete(sender, this, alias, args);
+ completions = completer.onTabComplete(sender, this, alias, args, location); // Paper - add location argument
}
if (completions == null && executor instanceof TabCompleter) {
- completions = ((TabCompleter) executor).onTabComplete(sender, this, alias, args);
+ completions = ((TabCompleter) executor).onTabComplete(sender, this, alias, args, location); // Paper - add location argument
}
} catch (Throwable ex) {
StringBuilder message = new StringBuilder();
@@ -149,6 +159,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
}
return completions;
}
+ // Paper end
@Override
public String toString() {
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 66385c4..ba4d45c 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.lang.Validate;
+import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.command.defaults.*;
import org.bukkit.entity.Player;
@@ -172,6 +173,14 @@ public class SimpleCommandMap implements CommandMap {
}
public List<String> tabComplete(CommandSender sender, String cmdLine) {
+ return tabComplete(sender, cmdLine, null); // Paper - location tab-completes, code moved below
+ }
+
+ // Paper start - location tab-completes
+ /**
+ * This code was copied, except for the noted change, from tabComplete(CommandSender sender, String cmdLine)
+ */
+ public List<String> tabComplete(CommandSender sender, String cmdLine, Location location) {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(cmdLine, "Command line cannot null");
@@ -216,13 +225,14 @@ public class SimpleCommandMap implements CommandMap {
String[] args = PATTERN_ON_SPACE.split(argLine, -1);
try {
- return target.tabComplete(sender, commandName, args);
+ return target.tabComplete(sender, commandName, args, location); // Paper - add location argument
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {
throw new CommandException("Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target, ex);
}
}
+ // Paper end
public Collection<Command> getCommands() {
return Collections.unmodifiableCollection(knownCommands.values());
diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
index 6d61e3a..85b10e5 100644
--- a/src/main/java/org/bukkit/command/TabCompleter.java
+++ b/src/main/java/org/bukkit/command/TabCompleter.java
@@ -1,5 +1,7 @@
package org.bukkit.command;
+import org.bukkit.Location;
+
import java.util.List;
/**
@@ -19,4 +21,10 @@ public interface TabCompleter {
* to default to the command executor
*/
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args);
+
+ // Paper start - location tab-completes
+ default List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args, Location location) {
+ return onTabComplete(sender, command, alias, args);
+ }
+ // Paper end
}
--
2.9.2.windows.1

4
Spigot-API-Patches/0014-Made-EntityDismountEvent-Cancellable.patch → Spigot-API-Patches/0013-Made-EntityDismountEvent-Cancellable.patch
View file

@ -1,4 +1,4 @@
From 72bedfe51658b0464677c52347151e5525b85307 Mon Sep 17 00:00:00 2001
From c5908bf5ae2b8e9dc4058efb952dc182561ec098 Mon Sep 17 00:00:00 2001
From: Nik Gil <nikmanG@users.noreply.github.com>
Date: Mon, 29 Feb 2016 19:42:10 -0600
Subject: [PATCH] Made EntityDismountEvent Cancellable
@ -43,5 +43,5 @@ index 24d4942..ce989bb 100644
+ // Paper end
}
--
2.8.0
2.9.2.windows.1

8
Spigot-API-Patches/0015-Automatically-disable-plugins-that-fail-to-load.patch → Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch
View file

@ -1,14 +1,14 @@
From 9b9ccba2ed63a98b146b388fd175e9d350e05dfd Mon Sep 17 00:00:00 2001
From f57909e23aa879da0c747ea91b472cac307980d9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 19:45:21 -0600
Subject: [PATCH] Automatically disable plugins that fail to load
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 4983ea8..93a43dd 100644
index 6b159ed..a0c98c7 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -332,6 +332,10 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -330,6 +330,10 @@ public final class JavaPluginLoader implements PluginLoader {
jPlugin.setEnabled(true);
} catch (Throwable ex) {
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
@ -20,5 +20,5 @@ index 4983ea8..93a43dd 100644
// Perhaps abort here, rather than continue going, but as it stands,
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0016-Expose-server-CommandMap.patch → Spigot-API-Patches/0015-Expose-server-CommandMap.patch
View file

@ -1,4 +1,4 @@
From e56e4b8d652e65f05ed1102a811ec81508f7af4a Mon Sep 17 00:00:00 2001
From e4b1bdd2b710c3c09c0ba4946bf8a313c4f4296d Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
@ -70,5 +70,5 @@ index 6e23b0c..a1ce356 100644
* @see UnsafeValues
* @return the unsafe values instance
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch → Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View file

@ -1,4 +1,4 @@
From 544918f08d26a3d51fd444976d273fcd5b0609cb Mon Sep 17 00:00:00 2001
From ffdfb6f2ae07ecf3724c90500e09c71370c93ccf Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 19:54:32 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@ -99,5 +99,5 @@ index 0945c59..4c880b8 100644
* Forces an update of the player's entire inventory.
*
--
2.8.3
2.9.2.windows.1

4
Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch → Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
View file

@ -1,4 +1,4 @@
From 65e92020e42f6989a280c30ef0d5572d3e6dff92 Mon Sep 17 00:00:00 2001
From 9e70beca6caf7d6007ad0b0ab6f050aab7c14a0e Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 29 Feb 2016 20:02:40 -0600
Subject: [PATCH] Player Tab List and Title APIs
@ -507,5 +507,5 @@ index 4c880b8..bb31477 100644
--
2.8.3
2.9.2.windows.1

8
Spigot-API-Patches/0019-Add-exception-reporting-event.patch → Spigot-API-Patches/0018-Add-exception-reporting-event.patch
View file

@ -1,4 +1,4 @@
From 0a66e97d6b38306199e8b76d2459c3a53beff3c5 Mon Sep 17 00:00:00 2001
From f3ef3ba155ffb8398e2f421fb0ccb0df8b857c4e Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event
@ -458,7 +458,7 @@ index 0000000..5582999
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index ba4d45c..8e70b43 100644
index 466757b..08976cd 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -10,6 +10,9 @@ import java.util.List;
@ -482,7 +482,7 @@ index ba4d45c..8e70b43 100644
}
// return true as command was handled
@@ -229,7 +234,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -225,7 +230,9 @@ public class SimpleCommandMap implements CommandMap {
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {
@ -492,7 +492,7 @@ index ba4d45c..8e70b43 100644
+ throw new CommandException(msg, ex);
}
}
// Paper end
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 4ee123e..1302773 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java

4
Spigot-API-Patches/0020-Fix-ServerListPingEvent-flagging-as-Async.patch → Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch
View file

@ -1,4 +1,4 @@
From 40cea5b463eada81ab6b30330ed739615a97c9bd Mon Sep 17 00:00:00 2001
From 37e2bacf63a44311cddcf163a91f269e0b473008 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 20:26:39 -0600
Subject: [PATCH] Fix ServerListPingEvent flagging as Async
@ -50,5 +50,5 @@ index 343f238..3c38d85 100644
this.address = address;
this.motd = motd;
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch → Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
View file

@ -1,4 +1,4 @@
From 20f7cf3795004ee2e49b58c2bdcaae78f60dcd8f Mon Sep 17 00:00:00 2001
From bf151a7ca10280dff0ce41fe2ebbcce4bb2e1ad7 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 13:05:59 -0800
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
@ -60,5 +60,5 @@ index bb31477..99f148c 100644
/**
--
2.8.3
2.9.2.windows.1

2
Spigot-API-Patches/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch → Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View file

@ -1,4 +1,4 @@
From ebe7bf9e6ebef527817214387e1696bcb5ecd7ce Mon Sep 17 00:00:00 2001
From 4b969a109049472e8b5f46d689e7e033e2dd1196 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

4
Spigot-API-Patches/0023-Complete-resource-pack-API.patch → Spigot-API-Patches/0022-Complete-resource-pack-API.patch
View file

@ -1,4 +1,4 @@
From 915e61ece5914582a738ee9a9e43f37e910307c7 Mon Sep 17 00:00:00 2001
From 844f5ad7531209eaaa783727c8bbdab094b69900 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 22:59:54 -0400
Subject: [PATCH] Complete resource pack API
@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
* Gets the status of this pack.
*
--
2.8.3
2.9.2.windows.1

10
Spigot-API-Patches/0024-Use-ASM-for-event-executors.patch → Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
View file

@ -1,4 +1,4 @@
From 9c26223cc08641a0cc1ce815215a989c5867adbb Mon Sep 17 00:00:00 2001
From ed654de7f9903c5b96b87a9a9227151a48eaf21e Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors.
@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods.
diff --git a/pom.xml b/pom.xml
index 5e5e5e4..5b70369 100644
index 6646f4a..a7f6468 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,12 @@
@ -369,10 +369,10 @@ index 3b2c99e..f9316d6 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 93a43dd..7229b25 100644
index a0c98c7..b2c4ba8 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -291,20 +291,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -289,20 +289,7 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
@ -395,5 +395,5 @@ index 93a43dd..7229b25 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
--
2.9.0
2.9.2.windows.1

4
Spigot-API-Patches/0025-Add-a-call-helper-to-Event.patch → Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch
View file

@ -1,4 +1,4 @@
From 81c991a2a0e0f1f58a73b49bb276ab52884d433d Mon Sep 17 00:00:00 2001
From 544b5f21dd978f9b7ecd0a546421aa11b5c3a159 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 19 May 2013 20:36:58 -0400
Subject: [PATCH] Add a call helper to Event
@ -40,5 +40,5 @@ index 6677e1b..eaf6c49 100644
* Convenience method for providing a user-friendly identifier. By
* default, it is the event's class's {@linkplain Class#getSimpleName()
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0026-Add-sender-name-to-commands.yml-replacement.patch → Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
View file

@ -1,4 +1,4 @@
From 21d5ec9b192521a3502ad03fdc32d217651ab129 Mon Sep 17 00:00:00 2001
From 3f129e5794812a7a026249ae923b9acfa2849511 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 22 Jul 2015 18:50:41 -0400
Subject: [PATCH] Add sender name to commands.yml replacement
@ -41,5 +41,5 @@ index f89ad07..a3e9c63 100644
while (index != -1) {
int start = index;
--
2.8.0
2.9.2.windows.1

10
Spigot-API-Patches/0027-Add-command-to-reload-permissions.yml-and-require-co.patch → Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
View file

@ -1,4 +1,4 @@
From bd8ce76652697575ba15e5efec4710cf0dcd2bba Mon Sep 17 00:00:00 2001
From b9193c99b34c7ce136f4c8edee9672346e79617f Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f93ca2e..5e31665 100644
index 5b37396..b01cd7d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1182,6 +1182,13 @@ public final class Bukkit {
@ -24,7 +24,7 @@ index f93ca2e..5e31665 100644
public static Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 91bde81..6b1f2a4 100644
index 309fa3f..b527372 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1018,4 +1018,6 @@ public interface Server extends PluginMessageRecipient {
@ -84,7 +84,7 @@ index c70d512..ee29ebb 100644
+
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 49f5872..e988a7c 100644
index 1302773..9ce0a5d 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -750,4 +750,13 @@ public final class SimplePluginManager implements PluginManager {
@ -102,5 +102,5 @@ index 49f5872..e988a7c 100644
+
}
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0028-Custom-replacement-for-eaten-items.patch → Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch
View file

@ -1,4 +1,4 @@
From 9ffd06f684daada133fc1b90cc983c8598a6e328 Mon Sep 17 00:00:00 2001
From 33bc086f382a2e21d39d4ce384998ce5ed01bd19 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:05:21 -0400
Subject: [PATCH] Custom replacement for eaten items
@ -42,5 +42,5 @@ index 8ab76b1..42aad88 100644
return this.isCancelled;
}
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0029-Access-items-by-EquipmentSlot.patch → Spigot-API-Patches/0028-Access-items-by-EquipmentSlot.patch
View file

@ -1,4 +1,4 @@
From 0024ceed3f1fac5330f4bafd0054f54229489089 Mon Sep 17 00:00:00 2001
From 261076ee6c8f78815af83409d38da123ad3073c3 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 20 Mar 2016 06:44:49 -0400
Subject: [PATCH] Access items by EquipmentSlot
@ -32,5 +32,5 @@ index 557cc04..799f150 100644
+ // Paper end
}
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0030-Entity-AddTo-RemoveFrom-World-Events.patch → Spigot-API-Patches/0029-Entity-AddTo-RemoveFrom-World-Events.patch
View file

@ -1,4 +1,4 @@
From 159fec1e94abbed864b41a5aeeca483306863fba Mon Sep 17 00:00:00 2001
From afba862bcba12099ebab00ff767bf8d8ff49610b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:26:34 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@ -72,5 +72,5 @@ index 0000000..800be6a
+ }
+}
--
2.9.0
2.9.2.windows.1

4
Spigot-API-Patches/0031-EntityPathfindEvent.patch → Spigot-API-Patches/0030-EntityPathfindEvent.patch
View file

@ -1,4 +1,4 @@
From 0cbfd3f956fe731e9a2c1e0838afd8cb577e338b Mon Sep 17 00:00:00 2001
From 96bfcbd08007feae7b996d708c15a485ce665494 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 21:15:34 -0400
Subject: [PATCH] EntityPathfindEvent
@ -87,5 +87,5 @@ index 0000000..21cab26
+ }
+}
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch → Spigot-API-Patches/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch
View file

@ -1,4 +1,4 @@
From 04d794e4aeb4d0b185ed67c14a188f269fb7802b Mon Sep 17 00:00:00 2001
From 270a57e64ae5f5a383b35a424dab9a45aa781eaf Mon Sep 17 00:00:00 2001
From: crast <contact@jamescrasta.com>
Date: Sat, 1 Jun 2013 13:52:30 -0600
Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@ -101,5 +101,5 @@ index 093c144..64c0f0a 100644
for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
if (values.containsKey(owningPlugin)) {
--
2.8.3.windows.1
2.9.2.windows.1

4
Spigot-API-Patches/0033-Add-MetadataStoreBase.removeAll-Plugin.patch → Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
View file

@ -1,4 +1,4 @@
From 1e48496f8fce2c543a8bace6a565bce6ccbe1c97 Mon Sep 17 00:00:00 2001
From 804562f99c8f2bf6b5d9937d5a7816974c716502 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 16 Jul 2013 21:26:50 -0400
Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@ -37,5 +37,5 @@ index 64c0f0a..6da6abd 100644
* unique data from the subject with a metadataKey.
* <p>
--
2.8.3.windows.1
2.9.2.windows.1

8
Spigot-API-Patches/0034-Add-getEntity-by-UUID-API.patch → Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
View file

@ -1,11 +1,11 @@
From 5c9d87a6c795f9028600143e51fa59286c8a8192 Mon Sep 17 00:00:00 2001
From 1ec57a41072c805aeeb8efb10cac8b4738cb4aab Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Wed, 30 Mar 2016 01:19:51 -0500
Subject: [PATCH] Add getEntity by UUID API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5e31665..9d61cc5 100644
index b01cd7d..3161b87 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1189,6 +1189,16 @@ public final class Bukkit {
@ -26,7 +26,7 @@ index 5e31665..9d61cc5 100644
public static Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6b1f2a4..1c8140f 100644
index b527372..edf0d04 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1020,4 +1020,12 @@ public interface Server extends PluginMessageRecipient {
@ -43,5 +43,5 @@ index 6b1f2a4..1c8140f 100644
+ Entity getEntity(UUID uuid); // Paper
}
--
2.7.4
2.9.2.windows.1

4
Spigot-API-Patches/0035-Add-PlayerUseUnknownEntityEvent.patch → Spigot-API-Patches/0034-Add-PlayerUseUnknownEntityEvent.patch
View file

@ -1,4 +1,4 @@
From 248cfb570e0e1783f8342ab51c2eb7f8ac0de495 Mon Sep 17 00:00:00 2001
From 971c532dd73e22735d0b227aa4b467f3e9555a0b Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:08:36 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -53,5 +53,5 @@ index 0000000..70eeaf5
+ }
+}
--
2.7.4
2.9.2.windows.1

4
Spigot-API-Patches/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch → Spigot-API-Patches/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
View file

@ -1,4 +1,4 @@
From 82d3cb13bbd3fa88aabf928183e268849d789297 Mon Sep 17 00:00:00 2001
From a887f5c891c64b820b93ab938dea9ba8b0f89755 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 13 Apr 2016 20:20:18 -0700
Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -223,5 +223,5 @@ index 0000000..e44d03a
+ }
+}
--
2.8.0
2.9.2.windows.1

4
Spigot-API-Patches/0037-Arrow-pickup-rule-API.patch → Spigot-API-Patches/0036-Arrow-pickup-rule-API.patch
View file

@ -1,4 +1,4 @@
From 1d016100e49bc72ca46633c664e9d3632029ccda Mon Sep 17 00:00:00 2001
From 5c695da3419985b0d9250e6b312b252daa19d89c Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 4 Mar 2016 03:13:18 -0500
Subject: [PATCH] Arrow pickup rule API
@ -41,5 +41,5 @@ index e7a32f7..08095b9 100644
{
--
2.7.4
2.9.2.windows.1

4
Spigot-API-Patches/0038-EntityRegainHealthEvent-isFastRegen-API.patch → Spigot-API-Patches/0037-EntityRegainHealthEvent-isFastRegen-API.patch
View file

@ -1,4 +1,4 @@
From 986cb0451c93c28f6428f4f3f64e23fe5d5be998 Mon Sep 17 00:00:00 2001
From e9878408be4b8c493c04fa5adcd9c2c7fcd4297c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 01:43:11 -0500
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@ -46,5 +46,5 @@ index a7b3517..703520f 100644
/**
* Gets the amount of regained health
--
2.5.0
2.9.2.windows.1

4
Spigot-API-Patches/0039-LootTable-API.patch → Spigot-API-Patches/0038-LootTable-API.patch
View file

@ -1,4 +1,4 @@
From 88e00e6b7efb8fb48e035fbfdfd75b7887c96c44 Mon Sep 17 00:00:00 2001
From 2b1c15d0ea5602d9281d1306e0596a5a7f2d85e2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 15:19:49 -0400
Subject: [PATCH] LootTable API
@ -350,5 +350,5 @@ index e097157..26aff5a 100644
}
--
2.8.2
2.9.2.windows.1