OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-24 01:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

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
Show stats 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

10
Spigot-Server-Patches/0002-Paper-config-files.patch
View file

@ -1,4 +1,4 @@
From 6533449019b5309292af4ce05cfeabcd43bcae3c Mon Sep 17 00:00:00 2001
From 794c519d459912de2f16cfb8fc95ad0df40c2f82 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 21:02:09 -0600
Subject: [PATCH] Paper config files
@ -289,10 +289,10 @@ index fcd90be..e649435 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c906eee..1ef30a3 100644
index 0658647..e7e9941 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -693,6 +693,7 @@ public final class CraftServer implements Server {
@@ -694,6 +694,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -300,7 +300,7 @@ index c906eee..1ef30a3 100644
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -708,12 +709,14 @@ public final class CraftServer implements Server {
@@ -709,12 +710,14 @@ public final class CraftServer implements Server {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
world.spigotConfig.init(); // Spigot
@ -335,5 +335,5 @@ index 337aa29..979adad 100644
};
--
2.9.0.windows.1
2.9.2.windows.1

361
Spigot-Server-Patches/0005-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From d1e7f412be2eb89f538516a4aad9605d3aedd7d4 Mon Sep 17 00:00:00 2001
From a6eea0b71f9783fbe8c3d2faceb4c634a015b3e6 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
@ -23,10 +23,10 @@ index 4ae34c8..63aaa7a 100644
<version>3.0.3</version>
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
new file mode 100644
index 0000000..2dff5e3
index 0000000..0f8315c
--- /dev/null
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -0,0 +1,114 @@
@@ -0,0 +1,110 @@
+package co.aikar.timings;
+
+import net.minecraft.server.*;
@ -136,149 +136,13 @@ index 0000000..2dff5e3
+ public static Timing getBlockTiming(Block block) {
+ return Timings.ofSafe("## Scheduled Block: " + block.getName());
+ }
+
+ public static Timing getStructureTiming(StructureGenerator structureGenerator) {
+ return Timings.ofSafe("Structure Generator - " + structureGenerator.getName());
+ }
+}
diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
new file mode 100644
index 0000000..2bf5b66
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
@@ -0,0 +1,126 @@
+/*
+ * This file is licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2014-2016 Daniel Ennis <http://aikar.co>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package co.aikar.timings;
+
+import net.minecraft.server.BiomeBase.BiomeMeta;
+import net.minecraft.server.BlockPosition;
+import net.minecraft.server.Chunk;
+import net.minecraft.server.EnumCreatureType;
+import net.minecraft.server.World;
+import net.minecraft.server.WorldServer;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.generator.InternalChunkGenerator;
+import org.bukkit.generator.BlockPopulator;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Random;
+
+public class TimedChunkGenerator extends InternalChunkGenerator {
+ private final WorldServer world;
+ private final InternalChunkGenerator timedGenerator;
+
+ public TimedChunkGenerator(WorldServer worldServer, InternalChunkGenerator gen) {
+ world = worldServer;
+ timedGenerator = gen;
+ }
+
+ @Override
+ @Deprecated
+ public byte[] generate(org.bukkit.World world, Random random, int x, int z) {
+ return timedGenerator.generate(world, random, x, z);
+ }
+
+ @Override
+ @Deprecated
+ public short[][] generateExtBlockSections(org.bukkit.World world, Random random, int x, int z,
+ BiomeGrid biomes) {
+ return timedGenerator.generateExtBlockSections(world, random, x, z, biomes);
+ }
+
+ @Override
+ @Deprecated
+ public byte[][] generateBlockSections(org.bukkit.World world, Random random, int x, int z,
+ BiomeGrid biomes) {
+ return timedGenerator.generateBlockSections(world, random, x, z, biomes);
+ }
+
+ @Override
+ public ChunkData generateChunkData(org.bukkit.World world, Random random, int x, int z, BiomeGrid biome) {
+ return timedGenerator.generateChunkData(world, random, x, z, biome);
+ }
+
+ @Override
+ public boolean canSpawn(org.bukkit.World world, int x, int z) {
+ return timedGenerator.canSpawn(world, x, z);
+ }
+
+ @Override
+ public List<BlockPopulator> getDefaultPopulators(org.bukkit.World world) {
+ return timedGenerator.getDefaultPopulators(world);
+ }
+
+ @Override
+ public Location getFixedSpawnLocation(org.bukkit.World world, Random random) {
+ return timedGenerator.getFixedSpawnLocation(world, random);
+ }
+
+ @Override
+ public Chunk getOrCreateChunk(int i, int j) {
+ try (Timing ignored = world.timings.chunkGeneration.startTiming()) {
+ return timedGenerator.getOrCreateChunk(i, j);
+ }
+ }
+
+ @Override
+ public void recreateStructures(int i, int j) {
+ try (Timing ignored = world.timings.syncChunkLoadStructuresTimer.startTiming()) {
+ timedGenerator.recreateStructures(i, j);
+ }
+ }
+
+ @Override
+ public boolean a(Chunk chunk, int i, int j) {
+ return timedGenerator.a(chunk, i, j);
+ }
+
+ @Override
+ public List<BiomeMeta> getMobsFor(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
+ return timedGenerator.getMobsFor(enumcreaturetype, blockposition);
+ }
+
+ @Override
+ @Nullable
+ public BlockPosition findNearestMapFeature(World world, String s, BlockPosition blockposition) {
+ return timedGenerator.findNearestMapFeature(world, s, blockposition);
+ }
+
+ @Override
+ public void recreateStructures(Chunk chunk, int i, int j) {
+ try (Timing ignored = world.timings.syncChunkLoadStructuresTimer.startTiming()) {
+ timedGenerator.recreateStructures(chunk, i, j);
+ }
+ }
+}
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
new file mode 100644
index 0000000..36aafb2
index 0000000..741da72
--- /dev/null
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -0,0 +1,91 @@
@@ -0,0 +1,85 @@
+package co.aikar.timings;
+
+import net.minecraft.server.World;
@ -294,7 +158,6 @@ index 0000000..36aafb2
+ public final Timing scheduledBlocksCleanup;
+ public final Timing scheduledBlocksTicking;
+ public final Timing chunkTicks;
+ public final Timing lightChunk;
+ public final Timing chunkTicksBlocks;
+ public final Timing doVillages;
+ public final Timing doChunkMap;
@ -319,12 +182,10 @@ index 0000000..36aafb2
+ public final Timing syncChunkLoadTimer;
+ public final Timing syncChunkLoadDataTimer;
+ public final Timing syncChunkLoadStructuresTimer;
+ public final Timing syncChunkLoadEntitiesTimer;
+ public final Timing syncChunkLoadTileEntitiesTimer;
+ public final Timing syncChunkLoadTileTicksTimer;
+ public final Timing syncChunkLoadPostTimer;
+ public final Timing syncChunkLoadNBTTimer;
+ public final Timing syncChunkLoadPopulateNeighbors;
+ public final Timing chunkGeneration;
+ public final Timing chunkIOStage1;
+ public final Timing chunkIOStage2;
+
+ public WorldTimingsHandler(World server) {
+ String name = server.worldData.getName() +" - ";
@ -335,7 +196,6 @@ index 0000000..36aafb2
+ scheduledBlocksCleanup = Timings.ofSafe(name + "Scheduled Blocks - Cleanup");
+ scheduledBlocksTicking = Timings.ofSafe(name + "Scheduled Blocks - Ticking");
+ chunkTicks = Timings.ofSafe(name + "Chunk Ticks");
+ lightChunk = Timings.ofSafe(name + "Light Chunk");
+ chunkTicksBlocks = Timings.ofSafe(name + "Chunk Ticks - Blocks");
+ doVillages = Timings.ofSafe(name + "doVillages");
+ doChunkMap = Timings.ofSafe(name + "doChunkMap");
@ -356,13 +216,11 @@ index 0000000..36aafb2
+
+ syncChunkLoadTimer = Timings.ofSafe(name + "syncChunkLoad");
+ syncChunkLoadDataTimer = Timings.ofSafe(name + "syncChunkLoad - Data");
+ syncChunkLoadStructuresTimer = Timings.ofSafe(name + "chunkLoad - recreateStructures");
+ syncChunkLoadStructuresTimer = Timings.ofSafe(name + "chunkLoad - Structures");
+ syncChunkLoadEntitiesTimer = Timings.ofSafe(name + "chunkLoad - Entities");
+ syncChunkLoadTileEntitiesTimer = Timings.ofSafe(name + "chunkLoad - TileEntities");
+ syncChunkLoadTileTicksTimer = Timings.ofSafe(name + "chunkLoad - TileTicks");
+ syncChunkLoadPostTimer = Timings.ofSafe(name + "chunkLoad - Post");
+ syncChunkLoadNBTTimer = Timings.ofSafe(name + "chunkLoad - NBT");
+ syncChunkLoadPopulateNeighbors = Timings.ofSafe(name + "chunkLoad - Populate Neighbors");
+ chunkGeneration = Timings.ofSafe(name + "chunkGeneration");
+ chunkIOStage1 = Timings.ofSafe(name + "ChunkIO Stage 1 - DiskIO");
+ chunkIOStage2 = Timings.ofSafe(name + "ChunkIO Stage 2 - Post Load");
+
+ tracker1 = Timings.ofSafe(name + "tracker stage 1");
+ tracker2 = Timings.ofSafe(name + "tracker stage 2");
@ -434,94 +292,6 @@ index a106e44..d17160a 100644
public static int getId(Block block) {
return Block.REGISTRY.a(block); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index b651edc..5807bb8 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -900,7 +900,7 @@ public class Chunk {
// CraftBukkit start
public void loadNearby(IChunkProvider ichunkprovider, ChunkGenerator chunkgenerator, boolean newChunk) {
- world.timings.syncChunkLoadPostTimer.startTiming(); // Spigot
+ world.timings.syncChunkLoadPostTimer.startTiming(); // Paper
Server server = world.getServer();
if (server != null) {
/*
@@ -926,7 +926,8 @@ public class Chunk {
}
}
// CraftBukkit end
-
+ world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper
+ world.timings.syncChunkLoadPopulateNeighbors.startTiming(); // Paper
Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1);
Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ);
Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1);
@@ -951,7 +952,7 @@ public class Chunk {
chunk4.a(chunkgenerator);
}
}
- world.timings.syncChunkLoadPostTimer.stopTiming(); // Spigot
+ world.timings.syncChunkLoadPopulateNeighbors.stopTiming(); // Paper
}
@@ -1164,6 +1165,7 @@ public class Chunk {
}
public void o() {
+ world.timings.lightChunk.startTiming(); // Paper
this.done = true;
this.lit = true;
BlockPosition blockposition = new BlockPosition(this.locX << 4, 0, this.locZ << 4);
@@ -1197,6 +1199,7 @@ public class Chunk {
}
}
+ world.timings.lightChunk.stopTiming(); // Paper
}
private void z() {
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 3de34be..31eb342 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -387,7 +387,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
// CraftBukkit end
- world.timings.syncChunkLoadEntitiesTimer.startTiming(); // Spigot
+ world.timings.syncChunkLoadNBTTimer.startTiming(); // Spigot
NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
if (nbttaglist1 != null) {
@@ -398,8 +398,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
chunk.g(true);
}
}
- world.timings.syncChunkLoadEntitiesTimer.stopTiming(); // Spigot
- world.timings.syncChunkLoadTileEntitiesTimer.startTiming(); // Spigot
NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10);
if (nbttaglist2 != null) {
@@ -412,8 +410,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
- world.timings.syncChunkLoadTileEntitiesTimer.stopTiming(); // Spigot
- world.timings.syncChunkLoadTileTicksTimer.startTiming(); // Spigot
if (nbttagcompound.hasKeyOfType("TileTicks", 9)) {
NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10);
@@ -433,7 +429,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
- world.timings.syncChunkLoadTileTicksTimer.stopTiming(); // Spigot
+ world.timings.syncChunkLoadNBTTimer.stopTiming(); // Spigot
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 11a49a3..e70d5c5 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
@ -695,7 +465,7 @@ index 5432e70..72cd51a 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3d76e54..0024d3d 100644
index 26f8467..891c7ea 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -45,7 +45,7 @@ import org.bukkit.Bukkit;
@ -986,48 +756,6 @@ index d5dd29b..13a6cfe 100644
// this.minecraftServer.getCommandHandler().a(this.player, s);
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
index 8dd434c..c965af1 100644
--- a/src/main/java/net/minecraft/server/StructureGenerator.java
+++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import co.aikar.timings.MinecraftTimings;
+import co.aikar.timings.Timing;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import java.util.Iterator;
@@ -8,11 +10,13 @@ import java.util.Random;
public abstract class StructureGenerator extends WorldGenBase {
+ private final Timing timing = MinecraftTimings.getStructureTiming(this); // Paper
private PersistentStructure a;
protected Long2ObjectMap<StructureStart> c = new Long2ObjectOpenHashMap(1024);
public StructureGenerator() {}
+ public String getName() { return a(); } // Paper // OBF HELPER
public abstract String a();
protected final synchronized void a(World world, final int i, final int j, int k, int l, ChunkSnapshot chunksnapshot) {
@@ -68,6 +72,7 @@ public abstract class StructureGenerator extends WorldGenBase {
}
public synchronized boolean a(World world, Random random, ChunkCoordIntPair chunkcoordintpair) {
+ timing.startTiming(); // Paper
this.a(world);
int i = (chunkcoordintpair.x << 4) + 8;
int j = (chunkcoordintpair.z << 4) + 8;
@@ -84,6 +89,7 @@ public abstract class StructureGenerator extends WorldGenBase {
this.a(structurestart.e(), structurestart.f(), structurestart);
}
}
+ timing.stopTiming(); // Paper
return flag;
}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 42f37df..2b82312 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
@ -1155,7 +883,7 @@ index e649435..b73f64e 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0668887..94d07eb 100644
index 0668887..e0f448d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -245,13 +245,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -1235,20 +963,11 @@ index 0668887..94d07eb 100644
this.methodProfiler.b();
this.U.clear();
@@ -842,7 +850,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
gen = new org.bukkit.craftbukkit.generator.NormalChunkGenerator(this, this.getSeed());
}
- return new ChunkProviderServer(this, ichunkloader, gen);
+ return new ChunkProviderServer(this, ichunkloader, new co.aikar.timings.TimedChunkGenerator(this, gen)); // Paper
// CraftBukkit end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 03169db..a519b71 100644
index e7e9941..5f2a9b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1722,6 +1722,7 @@ public final class CraftServer implements Server {
@@ -1727,6 +1727,7 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{
@ -1256,7 +975,7 @@ index 03169db..a519b71 100644
@Override
public YamlConfiguration getConfig()
{
@@ -1729,6 +1730,24 @@ public final class CraftServer implements Server {
@@ -1734,6 +1735,24 @@ public final class CraftServer implements Server {
}
@Override
@ -1460,50 +1179,6 @@ index 41d2d87..0000000
- }
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
index 3a95b44..b5efb9c 100644
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
@@ -1,6 +1,8 @@
package org.bukkit.craftbukkit.chunkio;
import java.io.IOException;
+
+import co.aikar.timings.Timing;
import net.minecraft.server.Chunk;
import net.minecraft.server.ChunkCoordIntPair;
import net.minecraft.server.ChunkRegionLoader;
@@ -16,7 +18,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
// async stuff
public Chunk callStage1(QueuedChunk queuedChunk) throws RuntimeException {
- try {
+ try (Timing ignored = queuedChunk.provider.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper
ChunkRegionLoader loader = queuedChunk.loader;
Object[] data = loader.loadChunk(queuedChunk.world, queuedChunk.x, queuedChunk.z);
@@ -38,6 +40,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
queuedChunk.provider.originalGetChunkAt(queuedChunk.x, queuedChunk.z);
return;
}
+ try (Timing ignored = queuedChunk.provider.world.timings.chunkIOStage2.startTimingIfSync()) { // Paper
queuedChunk.loader.loadEntities(chunk, queuedChunk.compound.getCompound("Level"), queuedChunk.world);
chunk.setLastSaved(queuedChunk.provider.world.getTime());
@@ -45,12 +48,11 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
chunk.addEntities();
if (queuedChunk.provider.chunkGenerator != null) {
- queuedChunk.provider.world.timings.syncChunkLoadStructuresTimer.startTiming(); // Spigot
queuedChunk.provider.chunkGenerator.recreateStructures(chunk, queuedChunk.x, queuedChunk.z);
- queuedChunk.provider.world.timings.syncChunkLoadStructuresTimer.stopTiming(); // Spigot
}
chunk.loadNearby(queuedChunk.provider, queuedChunk.provider.chunkGenerator, false);
+ } // Paper
}
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3c75538..5874554 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@ -1736,5 +1411,5 @@ index 30efc99..eb30abe 100644
}
}
--
2.9.3
2.9.2.windows.1

10
Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View file

@ -1,4 +1,4 @@
From acc975233d5156a27b006b1fb3c2d6f60af97aa2 Mon Sep 17 00:00:00 2001
From 2053173e8972809f9e883ec0633d325101aad5c9 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -20,7 +20,7 @@ index a8b5079..ebbc1fc 100644
EULA.a.warn("Failed to save {}", new Object[] { this.b, exception});
} finally {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0024d3d..37d25c1 100644
index 891c7ea..062cfd6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1030,7 +1030,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -33,10 +33,10 @@ index 0024d3d..37d25c1 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c880d85..34daa73 100644
index 5f2a9b0..4ac573f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -131,7 +131,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@@ -132,7 +132,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
public final class CraftServer implements Server {
private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644
log.log( Level.SEVERE, "------------------------------" );
//
--
2.9.0.windows.1
2.9.2.windows.1

8
Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
View file

@ -1,4 +1,4 @@
From 78b963270f4b2957d9c9b4bbcafc34e2b109a68a Mon Sep 17 00:00:00 2001
From 047c0e003720a57493daadd0211932a833a55331 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
@ -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 37d25c1..8ca0022 100644
index 062cfd6..1363472 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 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 c9d349a..1d9933f 100644
index 4ac573f..b5132cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1719,6 +1719,17 @@ public final class CraftServer implements Server {
@@ -1724,6 +1724,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}

18
Spigot-Server-Patches/0031-Lighting-Queue.patch
View file

@ -1,4 +1,4 @@
From f8a9a1de88d6073309d39ae803d9627284d2657d Mon Sep 17 00:00:00 2001
From 6a7b6bc589f136582c083249c2ccaca5d436c5bb Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue
@ -6,19 +6,19 @@ Subject: [PATCH] Lighting Queue
This provides option to queue lighting updates to ensure they do not cause the server lag
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
index 36aafb2..90bdbf0 100644
index 741da72..8b3aa17 100644
--- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -45,6 +45,8 @@ public class WorldTimingsHandler {
public final Timing chunkIOStage1;
public final Timing chunkIOStage2;
@@ -42,6 +42,8 @@ public class WorldTimingsHandler {
public final Timing syncChunkLoadTileTicksTimer;
public final Timing syncChunkLoadPostTimer;
+ public final Timing lightingQueueTimer;
+
public WorldTimingsHandler(World server) {
String name = server.worldData.getName() +" - ";
@@ -87,5 +89,7 @@ public class WorldTimingsHandler {
@@ -81,5 +83,7 @@ public class WorldTimingsHandler {
tracker2 = Timings.ofSafe(name + "tracker stage 2");
doTick = Timings.ofSafe(name + "doTick");
tickEntities = Timings.ofSafe(name + "tickEntities");
@ -42,7 +42,7 @@ index d78b688..158db3a 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 445419f..76130c9 100644
index 015a223..0fae95d 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -33,6 +33,7 @@ public class Chunk {
@ -97,7 +97,7 @@ index 5682f03..5eeefe8 100644
// Update neighbor counts
for (int x = -2; x < 3; x++) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8ca0022..7f6a29d 100644
index 1363472..d0060d0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -709,7 +709,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -235,5 +235,5 @@ index 8fb8176..672167a 100644
}
--
2.9.3
2.9.2.windows.1

10
Spigot-Server-Patches/0035-Generator-Settings.patch
View file

@ -1,4 +1,4 @@
From 1a7f83a720833355b7b0afa6b14d1f4a47a106c6 Mon Sep 17 00:00:00 2001
From 98c93c01ba0a797b56fb0d268689f5ff3be93913 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 02:17:54 -0600
Subject: [PATCH] Generator Settings
@ -245,10 +245,10 @@ index 6e6ecd8..e95175e 100644
}
}
diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
index c965af1..3ce4449 100644
index 8dd434c..4248a36 100644
--- a/src/main/java/net/minecraft/server/StructureGenerator.java
+++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -95,6 +95,7 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -89,6 +89,7 @@ public abstract class StructureGenerator extends WorldGenBase {
}
public boolean b(BlockPosition blockposition) {
@ -256,7 +256,7 @@ index c965af1..3ce4449 100644
this.a(this.g);
return this.c(blockposition) != null;
}
@@ -122,6 +123,7 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -116,6 +117,7 @@ public abstract class StructureGenerator extends WorldGenBase {
}
public synchronized boolean b(World world, BlockPosition blockposition) { // CraftBukkit - synchronized
@ -265,5 +265,5 @@ index c965af1..3ce4449 100644
Iterator iterator = this.c.values().iterator();
--
2.9.3
2.9.2.windows.1

10
Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch
View file

@ -1,4 +1,4 @@
From be3b69bb55a7198a0526725468880dae5e342cc5 Mon Sep 17 00:00:00 2001
From ba0189de9deaa9bdd967c32551bdb726c63979d6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async
@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
that it is happening so that plugin authors can fix their code to stop executing commands async.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5bbb644..9abe333 100644
index 06f394b..7d67e67 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1266,6 +1266,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -48,10 +48,10 @@ index 5bbb644..9abe333 100644
} else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
// Do nothing, this is coming from a plugin
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 408ef34..541b8d8 100644
index b5132cd..8e501b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -643,6 +643,29 @@ public final class CraftServer implements Server {
@@ -644,6 +644,29 @@ public final class CraftServer implements Server {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(commandLine, "CommandLine cannot be null");
@ -82,5 +82,5 @@ index 408ef34..541b8d8 100644
return true;
}
--
2.9.0
2.9.2.windows.1

160
Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch
View file

@ -1,160 +0,0 @@
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
missing in CraftBukkit)
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index b302cb7..75e7b78 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -249,4 +249,9 @@ public class PaperWorldConfig {
private void allChunksAreSlimeChunks() {
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
}
+
+ public boolean allowBlockLocationTabCompletion;
+ private void allowBlockLocationTabCompletion() {
+ allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a41c931..453e600 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1158,7 +1158,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
return arraylist;
}
*/
- return server.tabComplete(icommandlistener, s); // PAIL : todo args
+ return server.tabComplete(icommandlistener, s, blockposition); // PAIL : todo args // Paper - add Location arg
// CraftBukkit end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
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;
import net.minecraft.server.*;
-import org.bukkit.BanList;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.UnsafeValues;
+import net.minecraft.server.WorldType;
+import org.bukkit.*;
import org.bukkit.Warning.WarningState;
import org.bukkit.World;
import org.bukkit.World.Environment;
-import org.bukkit.WorldCreator;
import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarFlag;
import org.bukkit.boss.BarStyle;
@@ -1603,6 +1597,14 @@ public final class CraftServer implements Server {
}
public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message) {
+ return tabComplete(sender, message, null); // Paper - location tab-completes. Original code here moved below
+ }
+
+ // Paper start - add BlockPosition support
+ /*
+ this code is copied, except for the noted change, from the original tabComplete(net.minecraft.server.ICommandListener sender, String message) method
+ */
+ public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message, BlockPosition blockPosition) {
if (!(sender instanceof EntityPlayer)) {
return ImmutableList.of();
}
@@ -1610,7 +1612,7 @@ public final class CraftServer implements Server {
List<String> offers;
Player player = ((EntityPlayer) sender).getBukkitEntity();
if (message.startsWith("/")) {
- offers = tabCompleteCommand(player, message);
+ offers = tabCompleteCommand(player, message, blockPosition);
} else {
offers = tabCompleteChat(player, message);
}
@@ -1619,11 +1621,20 @@ public final class CraftServer implements Server {
getPluginManager().callEvent(tabEvent);
return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
+ // Paper end
}
public List<String> tabCompleteCommand(Player player, String message) {
+ return tabCompleteCommand(player, message, null); // Paper - location tab-completes. Original code here moved below
+ }
+
+ // Paper start - add BlockPosition support
+ /*
+ this code is copied, except for the noted change, from the original tabComplete(net.minecraft.server.ICommandListener sender, String message) method
+ */
+ public List<String> tabCompleteCommand(Player player, String message, BlockPosition blockPosition) {
// Spigot Start
- if ( (org.spigotmc.SpigotConfig.tabComplete < 0 || message.length() <= org.spigotmc.SpigotConfig.tabComplete) && !message.contains( " " ) )
+ if ( (org.spigotmc.SpigotConfig.tabComplete < 0 || message.length() <= org.spigotmc.SpigotConfig.tabComplete) && !message.contains( " " ) )
{
return ImmutableList.of();
}
@@ -1631,7 +1642,14 @@ public final class CraftServer implements Server {
List<String> completions = null;
try {
- completions = getCommandMap().tabComplete(player, message.substring(1));
+ // send location info if presen
+ // completions = getCommandMap().tabComplete(player, message.substring(1));
+ if (blockPosition == null || !((CraftWorld) player.getWorld()).getHandle().paperConfig.allowBlockLocationTabCompletion) {
+ completions = getCommandMap().tabComplete(player, message.substring(1));
+ } else {
+ completions = getCommandMap().tabComplete(player, message.substring(1), new Location(player.getWorld(), blockPosition.getX(), blockPosition.getY(), blockPosition.getZ()));
+ }
+ // Paper end
} catch (CommandException ex) {
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
index 0930d30..7461d04 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
@@ -7,6 +7,7 @@ import net.minecraft.server.*;
import org.apache.commons.lang.Validate;
import org.apache.logging.log4j.Level;
+import org.bukkit.Location;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
@@ -39,10 +40,23 @@ public final class VanillaCommandWrapper extends VanillaCommand {
@Override
public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
+ return tabComplete(sender, alias, args, null); // Paper - location tab-completes. Original code moved below
+ }
+
+ // Paper start - location tab-completes
+ /*
+ this code is copied, except for the noted change, from the original tabComplete(CommandSender sender, String alias, String[] args) method
+ */
+ @Override
+ public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(args, "Arguments cannot be null");
Validate.notNull(alias, "Alias cannot be null");
- return (List<String>) vanillaCommand.tabComplete(MinecraftServer.getServer(), getListener(sender), args, new BlockPosition(0, 0, 0));
+ if (location == null) { // PaperSpigot use location information if available
+ return (List<String>) vanillaCommand.tabComplete(MinecraftServer.getServer(), getListener(sender), args, new BlockPosition(0, 0, 0));
+ } else {
+ return (List<String>) vanillaCommand.tabComplete(MinecraftServer.getServer(), getListener(sender), args, new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
+ }
}
public static CommandSender lastSender = null; // Nasty :(
--
2.9.2.windows.1

4
Spigot-Server-Patches/0058-Optimize-Pathfinding.patch → Spigot-Server-Patches/0057-Optimize-Pathfinding.patch
View file

@ -1,4 +1,4 @@
From 6dc93d12b7697e416a6e8fdcbaefaafc78cc8a2b Mon Sep 17 00:00:00 2001
From 945883cc3c1607c13de3b07dc660287c8d5d87ac Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:02:07 -0600
Subject: [PATCH] Optimize Pathfinding
@ -47,5 +47,5 @@ index c9cfe3f..b1a90c1 100644
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0059-Avoid-hopper-searches-if-there-are-no-items.patch → Spigot-Server-Patches/0058-Avoid-hopper-searches-if-there-are-no-items.patch
View file

@ -1,4 +1,4 @@
From 4218b818924a5051199822173d5fe96a416ed53d Mon Sep 17 00:00:00 2001
From fb9bba1325d10fa5e1b3b026cf23084d07259544 Mon Sep 17 00:00:00 2001
From: CullanP <cullanpage@gmail.com>
Date: Thu, 3 Mar 2016 02:13:38 -0600
Subject: [PATCH] Avoid hopper searches if there are no items
@ -95,5 +95,5 @@ index 0fae95d..684e5f7 100644
while (iterator.hasNext()) {
--
2.9.0
2.9.2.windows.1

6
Spigot-Server-Patches/0060-Expose-server-CommandMap.patch → Spigot-Server-Patches/0059-Expose-server-CommandMap.patch
View file

@ -1,14 +1,14 @@
From 25e6aa19756ac7da6b70ebf5c66db4ed53f7eb97 Mon Sep 17 00:00:00 2001
From c3907844a571935fcc6702d446cdb9a4f86c4354 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 fdbf02b..f3bad60 100644
index 8e501b6..c7cd3f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1557,6 +1557,7 @@ public final class CraftServer implements Server {
@@ -1564,6 +1564,7 @@ public final class CraftServer implements Server {
return helpMap;
}

4
Spigot-Server-Patches/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch → Spigot-Server-Patches/0060-Be-a-bit-more-informative-in-maxHealth-exception.patch
View file

@ -1,11 +1,11 @@
From 37ad3a919da6d26ad26533012762804c0c852000 Mon Sep 17 00:00:00 2001
From 2d0f7682e747d6066192545d2d664a974b7fd112 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index feef438..5b7eae5 100644
index cffa778..a123d5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -92,7 +92,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

8
Spigot-Server-Patches/0062-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch → Spigot-Server-Patches/0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View file

@ -1,14 +1,14 @@
From 51bc2e377c4e43cf11a51ff4b0be4a8ce5d2885b Mon Sep 17 00:00:00 2001
From 24439dcdd7417c184668ebb038d974f5abea1224 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 f3bad60..59c8826 100644
index c7cd3f7..b44808f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1310,6 +1310,18 @@ public final class CraftServer implements Server {
@@ -1317,6 +1317,18 @@ public final class CraftServer implements Server {
return count;
}
@ -28,7 +28,7 @@ index f3bad60..59c8826 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 e09dc78..b3e2e66 100644
index 75c7ece..ed69814 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 {

6
Spigot-Server-Patches/0063-Player-Tab-List-and-Title-APIs.patch → Spigot-Server-Patches/0062-Player-Tab-List-and-Title-APIs.patch
View file

@ -1,4 +1,4 @@
From 1608cd40656ac9b476859d2d2def639550f4874f Mon Sep 17 00:00:00 2001
From 759dd716bdc7dfccd3b4450b6ea6321cf7114434 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 02:32:10 -0600
Subject: [PATCH] Player Tab List and Title APIs
@ -78,7 +78,7 @@ index 31a2b21..8a0839c 100644
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 88412f8..d9dd3eb 100644
index ed69814..86286a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,6 @@
@ -173,5 +173,5 @@ index 88412f8..d9dd3eb 100644
@Override
--
2.9.0
2.9.2.windows.1

2
Spigot-Server-Patches/0064-Ensure-inv-drag-is-in-bounds.patch → Spigot-Server-Patches/0063-Ensure-inv-drag-is-in-bounds.patch
View file

@ -1,4 +1,4 @@
From 64331394e7398883d753bf51736ac1f9144705e1 Mon Sep 17 00:00:00 2001
From 95706d529b7c7d6d68f3c5d9ab39b8c00db8febe Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:33:53 -0600
Subject: [PATCH] Ensure inv drag is in bounds

2
Spigot-Server-Patches/0065-Change-implementation-of-tile-entity-removal-list.patch → Spigot-Server-Patches/0064-Change-implementation-of-tile-entity-removal-list.patch
View file

@ -1,4 +1,4 @@
From 0c9284853514a380de8e9f43d7826acf7d6e4841 Mon Sep 17 00:00:00 2001
From e13c2b098cff6523e0f9bdaabe9fbb759c7b173f Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:39:54 -0600
Subject: [PATCH] Change implementation of (tile)entity removal list

12
Spigot-Server-Patches/0066-Add-configurable-portal-search-radius.patch → Spigot-Server-Patches/0065-Add-configurable-portal-search-radius.patch
View file

@ -1,16 +1,16 @@
From 3e529ff8e46271ef3e60ec7f9268f11735d97990 Mon Sep 17 00:00:00 2001
From 0f11e06322d6f8d2678033081b477196fb5d9d77 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:46:17 -0600
Subject: [PATCH] Add configurable portal search radius
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 75e7b78..5807609 100644
index b302cb7..086cab0 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -254,4 +254,9 @@ public class PaperWorldConfig {
private void allowBlockLocationTabCompletion() {
allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
@@ -249,4 +249,9 @@ public class PaperWorldConfig {
private void allChunksAreSlimeChunks() {
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
}
+
+ public int portalSearchRadius;
@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
private boolean canCreatePortal = true;
--
2.9.0
2.9.2.windows.1

6
Spigot-Server-Patches/0067-Add-velocity-warnings.patch → Spigot-Server-Patches/0066-Add-velocity-warnings.patch
View file

@ -1,11 +1,11 @@
From e89c6191576e753b2742b027227a378963d67b72 Mon Sep 17 00:00:00 2001
From e03a75ce7f4d8561cd2ae428ed4b5c4a2d1054cb Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 5e81076..43f2c68 100644
index 6f6b90b..719dd66 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -205,6 +205,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -22,5 +22,5 @@ index 5e81076..43f2c68 100644
entity.motY = vel.getY();
entity.motZ = vel.getZ();
--
2.9.0
2.9.2.windows.1

10
Spigot-Server-Patches/0068-Fix-inter-world-teleportation-glitches.patch → Spigot-Server-Patches/0067-Fix-inter-world-teleportation-glitches.patch
View file

@ -1,4 +1,4 @@
From 2f889b7b96695761c43f97cc3541d53d6726b1f9 Mon Sep 17 00:00:00 2001
From 6b98bfa4a580925dc777e7182ab2d6e17d7b381a Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Thu, 3 Mar 2016 02:50:31 -0600
Subject: [PATCH] Fix inter-world teleportation glitches
@ -11,10 +11,10 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 5807609..034369a 100644
index 086cab0..aabd629 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -259,4 +259,9 @@ public class PaperWorldConfig {
@@ -254,4 +254,9 @@ public class PaperWorldConfig {
private void portalSearchRadius() {
portalSearchRadius = getInt("portal-search-radius", 128);
}
@ -25,7 +25,7 @@ index 5807609..034369a 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d9dd3eb..101dc2b 100644
index 86286a5..a6851e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -572,7 +572,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -39,5 +39,5 @@ index d9dd3eb..101dc2b 100644
return true;
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0069-Add-exception-reporting-event.patch → Spigot-Server-Patches/0068-Add-exception-reporting-event.patch
View file

@ -1,4 +1,4 @@
From 570d621bb13515e668ed7a282e0d24f348f1cb82 Mon Sep 17 00:00:00 2001
From 108eb9cb891131532840f1a0cc670a5ae1f92409 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -372,5 +372,5 @@ index 2a22697..d82dddf 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
--
2.9.0.windows.1
2.9.2.windows.1

4
Spigot-Server-Patches/0070-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch → Spigot-Server-Patches/0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
View file

@ -1,4 +1,4 @@
From e11bae4003629ef3f93d618965611e3248a3024f Mon Sep 17 00:00:00 2001
From a829086a2ebc2b827c4b58d4c2fba1b0d5d14728 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 18:28:43 -0800
Subject: [PATCH] Don't nest if we don't need to when cerealising text
@ -26,5 +26,5 @@ index c0e1199..bc6c054 100644
packetdataserializer.a(this.a);
}
--
2.9.0
2.9.2.windows.1

6
Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch → Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch
View file

@ -1,4 +1,4 @@
From c668d31b904f5c02b31e7aa742a746114525e9cb Mon Sep 17 00:00:00 2001
From 1004124199af96178875ccfa205bbd2b881fdba0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 8 Mar 2016 23:25:45 -0500
Subject: [PATCH] Disable Scoreboards for non players by default
@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
logic which is most likely to be true.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 034369a..308dfdd 100644
index aabd629..047fa5f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -264,4 +264,9 @@ public class PaperWorldConfig {
@@ -259,4 +259,9 @@ public class PaperWorldConfig {
private void disableTeleportationSuffocationCheck() {
disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
}

2
Spigot-Server-Patches/0072-Add-methods-for-working-with-arrows-stuck-in-living-.patch → Spigot-Server-Patches/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View file

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

6
Spigot-Server-Patches/0073-Complete-resource-pack-API.patch → Spigot-Server-Patches/0072-Complete-resource-pack-API.patch
View file

@ -1,4 +1,4 @@
From 23fc12506a96c04c5b860836943e912fbf12192c Mon Sep 17 00:00:00 2001
From 07bd002edcb8a62463ae788686c76f84ac2474d2 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
@ -24,7 +24,7 @@ index 7d67e67..d5e06f0 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0c0906a..e372761 100644
index a6851e6..8ac7ec5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -72,5 +72,5 @@ index 0c0906a..e372761 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.9.0.windows.1
2.9.2.windows.1

25
Spigot-Server-Patches/0074-Chunk-save-queue-improvements.patch → Spigot-Server-Patches/0073-Chunk-save-queue-improvements.patch
View file

@ -1,4 +1,4 @@
From 4a5adb304339d69522e2f49cbea50203ec692b3e Mon Sep 17 00:00:00 2001
From cb7cba1492fa45cb0b8d20862147e971ff40b9c4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 4 Mar 2016 18:18:37 -0600
Subject: [PATCH] Chunk save queue improvements
@ -41,7 +41,7 @@ index 9ab6445..d01bca1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 11ee148..e6e7626 100644
index ff450f4..73b8b8b 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -12,14 +12,17 @@ import java.util.Map;
@ -77,7 +77,7 @@ index 11ee148..e6e7626 100644
// Paper start - Don't create region files when checking that they exist
final RegionFile region = RegionFileCache.a(this.d, i, j, false);
@@ -143,28 +146,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -143,35 +146,32 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
protected void a(ChunkCoordIntPair chunkcoordintpair, NBTTagCompound nbttagcompound) {
@ -91,7 +91,10 @@ index 11ee148..e6e7626 100644
}
public boolean c() {
- if (this.b.isEmpty()) {
- // CraftBukkit start
- Iterator<Map.Entry<ChunkCoordIntPair, NBTTagCompound>> iter = this.b.entrySet().iterator();
- if (!iter.hasNext()) {
- // CraftBukkit end
+ // Paper start - Chunk queue improvements
+ QueuedChunk chunk = queue.poll();
+ if (chunk == null) {
@ -102,20 +105,24 @@ index 11ee148..e6e7626 100644
return false;
} else {
- ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair) this.b.keySet().iterator().next();
- // CraftBukkit start
- Map.Entry<ChunkCoordIntPair, NBTTagCompound> entry = iter.next();
- iter.remove(); // Pop single entry
- ChunkCoordIntPair chunkcoordintpair = entry.getKey();
- // CraftBukkit end
+ ChunkCoordIntPair chunkcoordintpair = chunk.coords; // Paper - Chunk queue improvements
boolean flag;
try {
- this.c.add(chunkcoordintpair);
- NBTTagCompound nbttagcompound = (NBTTagCompound) this.b.remove(chunkcoordintpair);
- NBTTagCompound nbttagcompound = (NBTTagCompound) entry.getValue(); // CraftBukkit
+ //this.c.add(chunkcoordintpair);
+ NBTTagCompound nbttagcompound = chunk.compound; // Paper - Chunk queue improvements
if (nbttagcompound != null) {
try {
@@ -173,10 +180,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -180,10 +180,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
ChunkRegionLoader.a.error("Failed to save chunk", exception);
}
}
@ -128,7 +135,7 @@ index 11ee148..e6e7626 100644
}
return flag;
@@ -547,4 +555,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -558,4 +559,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
return entity;
}
}
@ -170,5 +177,5 @@ index acfdd52..fdbaf5f 100644
if (this.b.isEmpty()) {
--
2.9.3
2.9.2.windows.1

4
Spigot-Server-Patches/0075-Chunk-Save-Reattempt.patch → Spigot-Server-Patches/0074-Chunk-Save-Reattempt.patch
View file

@ -1,4 +1,4 @@
From 09c3d37924ed5bec863e09c7591700d4c93e9e0e Mon Sep 17 00:00:00 2001
From 5f1fd279518e6cd364df680680f68e978bdff8ec Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Mar 2013 23:46:10 -0500
Subject: [PATCH] Chunk Save Reattempt
@ -42,5 +42,5 @@ index c9bd856..1fe5019 100644
}
--
2.9.0
2.9.2.windows.1

10
Spigot-Server-Patches/0076-Default-loading-permissions.yml-before-plugins.patch → Spigot-Server-Patches/0075-Default-loading-permissions.yml-before-plugins.patch
View file

@ -1,4 +1,4 @@
From e2700ddea0cdb9c5baedbb0a8dad2f2179f759be Mon Sep 17 00:00:00 2001
From aac4eafc0b5c966555720e61adea0f17d43be2e6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins
@ -30,10 +30,10 @@ index d01bca1..2e17397 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 910ac7e..b9c5ae9 100644
index b44808f..034f8ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -307,6 +307,7 @@ public final class CraftServer implements Server {
@@ -314,6 +314,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) {
helpMap.clear();
helpMap.initializeGeneralTopics();
@ -41,7 +41,7 @@ index 910ac7e..b9c5ae9 100644
}
Plugin[] plugins = pluginManager.getPlugins();
@@ -324,7 +325,7 @@ public final class CraftServer implements Server {
@@ -331,7 +332,7 @@ public final class CraftServer implements Server {
setVanillaCommands(false);
// Spigot end
commandMap.registerServerAliases();
@ -51,5 +51,5 @@ index 910ac7e..b9c5ae9 100644
CraftDefaultPermissions.registerCorePermissions();
helpMap.initializeCommands();
--
2.9.0
2.9.2.windows.1

6
Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch → Spigot-Server-Patches/0076-Allow-Reloading-of-Custom-Permissions.patch
View file

@ -1,4 +1,4 @@
From a182db1fa6f1be5543bab858e24b80a0bd0a900d Mon Sep 17 00:00:00 2001
From ac5650f87ce333c15cb6386da4243c8132497ba6 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 7b4539f..db16ba8 100644
index 034f8ed..1609b07 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1837,4 +1837,21 @@ public final class CraftServer implements Server {
@@ -1824,4 +1824,21 @@ public final class CraftServer implements Server {
{
return spigot;
}

8
Spigot-Server-Patches/0078-Remove-Metadata-on-reload.patch → Spigot-Server-Patches/0077-Remove-Metadata-on-reload.patch
View file

@ -1,4 +1,4 @@
From 05209debaec88abb32dc726e7b60b8f3021f657c Mon Sep 17 00:00:00 2001
From d473ed0e9183c9884c773f74eda8649df8a67a1f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:50:14 -0400
Subject: [PATCH] Remove Metadata on reload
@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8a591ab..8f08fa5 100644
index 1609b07..15bef42 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -730,6 +730,14 @@ public final class CraftServer implements Server {
@@ -737,6 +737,14 @@ public final class CraftServer implements Server {
world.paperConfig.init(); // Paper
}
@ -26,5 +26,5 @@ index 8a591ab..8f08fa5 100644
commandMap.clearCommands();
resetRecipes();
--
2.9.0
2.9.2.windows.1

8
Spigot-Server-Patches/0079-Undead-horse-leashing.patch → Spigot-Server-Patches/0078-Undead-horse-leashing.patch
View file

@ -1,4 +1,4 @@
From 2d2f5317a0195e8eba7635ce037baf05c6e14f6d Mon Sep 17 00:00:00 2001
From 7279a750c265627cbc2a1fae0b3b55e7ef3dd626 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 14:19:19 -0400
Subject: [PATCH] Undead horse leashing
@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
default false to match vanilla, but option to allow undead horse types to be leashed.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 308dfdd..55253d6 100644
index 047fa5f..d136807 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -269,4 +269,9 @@ public class PaperWorldConfig {
@@ -264,4 +264,9 @@ public class PaperWorldConfig {
private void nonPlayerEntitiesOnScoreboards() {
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
}
@ -32,5 +32,5 @@ index ef429c1..38c4f61 100644
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0080-Fix-Furnace-cook-time-bug.patch → Spigot-Server-Patches/0079-Fix-Furnace-cook-time-bug.patch
View file

@ -1,4 +1,4 @@
From 2a84e2d7242ff8c813cb8afabb05db08a9239546 Mon Sep 17 00:00:00 2001
From 20fc130a9938e0150010d5167509874426a80209 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 14:24:53 -0400
Subject: [PATCH] Fix Furnace cook time bug
@ -22,5 +22,5 @@ index fd6c246..db235c3 100644
this.burn();
flag1 = true;
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0081-Handle-Item-Meta-Inconsistencies.patch → Spigot-Server-Patches/0080-Handle-Item-Meta-Inconsistencies.patch
View file

@ -1,4 +1,4 @@
From 09d029f665f56b85ab440b31391ffbf75bf404a5 Mon Sep 17 00:00:00 2001
From 402afb8adba1a22e669b87d6b4cfadc466393385 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 28 May 2015 23:00:19 -0400
Subject: [PATCH] Handle Item Meta Inconsistencies
@ -293,5 +293,5 @@ index 22cc267..94f2ba0 100644
private final Spigot spigot = new Spigot()
{
--
2.9.0
2.9.2.windows.1

8
Spigot-Server-Patches/0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch → Spigot-Server-Patches/0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch
View file

@ -1,4 +1,4 @@
From 2b5b8fd3777fea8ced8a2f4b1f4b9911183c8fa9 Mon Sep 17 00:00:00 2001
From e721477da0a544ce6a720cb99d03bafa9e068547 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 15:12:22 -0400
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
Can set a much shorter despawn rate for arrows that players can not pick up.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 55253d6..f528fd1 100644
index d136807..b701e5e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -274,4 +274,13 @@ public class PaperWorldConfig {
@@ -269,4 +269,13 @@ public class PaperWorldConfig {
private void allowLeashingUndeadHorse() {
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
}
@ -37,5 +37,5 @@ index ccbf47e..b7ac5f7 100644
}
} else {
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0083-Add-World-Util-Methods.patch → Spigot-Server-Patches/0082-Add-World-Util-Methods.patch
View file

@ -1,4 +1,4 @@
From c49dc8b884a9576492347c1a6dabbc30ef685595 Mon Sep 17 00:00:00 2001
From 3ef8c34d7825dbf1baedc8ce07899569f7248ada Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 20:16:03 -0400
Subject: [PATCH] Add World Util Methods
@ -93,5 +93,5 @@ index 48c0e14..a3bce9a 100644
// CraftBukkit start - tree generation
if (captureTreeGeneration) {
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0084-Optimized-Light-Level-Comparisons.patch → Spigot-Server-Patches/0083-Optimized-Light-Level-Comparisons.patch
View file

@ -1,4 +1,4 @@
From dfa581d6e4d69f851765dc7be7739f5f812c228f Mon Sep 17 00:00:00 2001
From f3e4a3fcceff16f90d7c8ea2d84e5130ca202dac Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 21:22:56 -0400
Subject: [PATCH] Optimized Light Level Comparisons
@ -131,5 +131,5 @@ index 6981185..798b9c5 100644
if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D, EntityHuman.affectsSpawningFilter()) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { // Paper - affectsSpawning filter
this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0085-Pass-world-to-Village-creation.patch → Spigot-Server-Patches/0084-Pass-world-to-Village-creation.patch
View file

@ -1,4 +1,4 @@
From f5b65114209cfe77109f54a144a5af824c4ab7f8 Mon Sep 17 00:00:00 2001
From 73fca77c401a155b2b8106d07ef9e21f3b2d99fe Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 19 Mar 2016 15:16:54 -0400
Subject: [PATCH] Pass world to Village creation
@ -32,5 +32,5 @@ index 1fa7cb2..fc3a6ab 100644
this.d = BlockPosition.ZERO;
this.j = new TreeMap();
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0086-Custom-replacement-for-eaten-items.patch → Spigot-Server-Patches/0085-Custom-replacement-for-eaten-items.patch
View file

@ -1,4 +1,4 @@
From 3ab439efa030a2b5b9f9170663966ce97ccc6aa8 Mon Sep 17 00:00:00 2001
From 10d82cfe5366d9756a1ef587ded186f646f0c834 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400
Subject: [PATCH] Custom replacement for eaten items
@ -34,5 +34,5 @@ index 89e6ef5..ad320c2 100644
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0087-Set-health-before-death-event.patch → Spigot-Server-Patches/0086-Set-health-before-death-event.patch
View file

@ -1,4 +1,4 @@
From 64d014a384f05fcf4128d9ea5cbad530cf68f171 Mon Sep 17 00:00:00 2001
From 3d192ba83e69c17fb5d9b21a9e30b0f1c72a4076 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 19 Jul 2015 16:51:38 -0400
Subject: [PATCH] Set health before death event
@ -19,7 +19,7 @@ index 2e17397..f0f8cb2 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index ff17545..7fdd89f 100644
index 79d60a6..b807a3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -98,11 +98,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

6
Spigot-Server-Patches/0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch → Spigot-Server-Patches/0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View file

@ -1,4 +1,4 @@
From 34eca3f612837f249380d60d7b6ae2fc2cb5cc3b Mon Sep 17 00:00:00 2001
From 471a920a25cd0d6f11228593543823c7a0b967a8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
@ -44,7 +44,7 @@ index ad320c2..d66e766 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e372761..d6b2974 100644
index 8ac7ec5..d5aed11 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1390,6 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -56,5 +56,5 @@ index e372761..d6b2974 100644
}
--
2.9.0
2.9.2.windows.1

2
Spigot-Server-Patches/0089-Catch-Async-PlayerChunkMap-operations.patch → Spigot-Server-Patches/0088-Catch-Async-PlayerChunkMap-operations.patch
View file

@ -1,4 +1,4 @@
From e3f1de4b334cfc96f9a55a02bc54ba7439f65c2f Mon Sep 17 00:00:00 2001
From bec543d7b63fca82cd25dde00b15f8f631eb247f Mon Sep 17 00:00:00 2001
From: Daniel Ennis <dennis@icontact.com>
Date: Sun, 20 Mar 2016 15:22:42 -0400
Subject: [PATCH] Catch Async PlayerChunkMap operations

4
Spigot-Server-Patches/0090-Support-offline-mode-in-whitelist-command-as-well.patch → Spigot-Server-Patches/0089-Support-offline-mode-in-whitelist-command-as-well.patch
View file

@ -1,4 +1,4 @@
From ecf329a1fbe4583de3e4ec9f0e07004db9c960d6 Mon Sep 17 00:00:00 2001
From c1334946dd4f272895db6244f2c3a453edf42916 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 21 Mar 2016 00:19:18 -0500
Subject: [PATCH] Support offline mode in whitelist command as well
@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644
+ // Paper end
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0091-Fix-SkullCache-case-bug.patch → Spigot-Server-Patches/0090-Fix-SkullCache-case-bug.patch
View file

@ -1,4 +1,4 @@
From 8ab22bafccd2e2e4c48e3f1a7ad4e7cd728bf1da Mon Sep 17 00:00:00 2001
From 24e61a8f91668f86b4113d87034bb68bbf65cecc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Jan 2016 21:48:24 -0500
Subject: [PATCH] Fix SkullCache case bug
@ -18,5 +18,5 @@ index 654b51d..a8adbcb 100644
callback.apply(profile);
} else {
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0092-Waving-banner-workaround.patch → Spigot-Server-Patches/0091-Waving-banner-workaround.patch
View file

@ -1,4 +1,4 @@
From 505e41c56fd3272ec2ff4e2e938ba521174913e7 Mon Sep 17 00:00:00 2001
From 977583ad1bb17c4efb0d70b9c9516e7b248283ba Mon Sep 17 00:00:00 2001
From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
Date: Sat, 19 Mar 2016 22:25:11 +0100
Subject: [PATCH] Waving banner workaround
@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644
public void a(PacketDataSerializer packetdataserializer) throws IOException {
--
2.9.2
2.9.2.windows.1

2
Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch → Spigot-Server-Patches/0092-Use-a-Shared-Random-for-Entities.patch
View file

@ -1,4 +1,4 @@
From 90236406c3f251ce3d4b4ddd27c64c5c93c88949 Mon Sep 17 00:00:00 2001
From b87a7a33be7a5198c4839566f7b13de67dc3a1a4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:33:47 -0400
Subject: [PATCH] Use a Shared Random for Entities

2
Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch → Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch
View file

@ -1,4 +1,4 @@
From d1a67cfcf8e2dca784c8088bd33c3235d297bf7d Mon Sep 17 00:00:00 2001
From a4255bbf6008b8eef25c4aeb9cc78e54621c28a8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:55:23 -0400
Subject: [PATCH] Don't teleport dead entities

4
Spigot-Server-Patches/0095-Optimize-Chunk-Access.patch → Spigot-Server-Patches/0094-Optimize-Chunk-Access.patch
View file

@ -1,4 +1,4 @@
From 76004dc47689f92b507e3921fb05f2959e793918 Mon Sep 17 00:00:00 2001
From 329cc97ccf1645837c504b25c06fd42f7f06ee78 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 27 Aug 2015 01:15:02 -0400
Subject: [PATCH] Optimize Chunk Access
@ -42,5 +42,5 @@ index 299cc91..9077696 100644
public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
--
2.9.0
2.9.2.windows.1

8
Spigot-Server-Patches/0096-Configurable-spawn-chances-for-skeleton-horses.patch → Spigot-Server-Patches/0095-Configurable-spawn-chances-for-skeleton-horses.patch
View file

@ -1,14 +1,14 @@
From 37849503dd781ad0afeb4096add22308691508e3 Mon Sep 17 00:00:00 2001
From 65acc19909c2fccb23de55b6c1a11a6e61d1f17c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 22 Mar 2016 12:04:28 -0500
Subject: [PATCH] Configurable spawn chances for skeleton horses
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index f528fd1..1b996ba 100644
index b701e5e..d29f2a4 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -283,4 +283,12 @@ public class PaperWorldConfig {
@@ -278,4 +278,12 @@ public class PaperWorldConfig {
}
log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
}
@ -35,5 +35,5 @@ index 60696ea..72a604a 100644
entityhorse.setType(EnumHorseType.SKELETON);
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch → Spigot-Server-Patches/0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
View file

@ -1,4 +1,4 @@
From 2782f0fbc0c4a40216b1ce0591f3b21b839b7bc2 Mon Sep 17 00:00:00 2001
From af32c8a3329ffeab7d8d49f4ee952da1a917c2b2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -255,5 +255,5 @@ index a3bce9a..b683c3e 100644
} else {
Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0098-Use-correct-item-in-arrow-pickup-event.patch → Spigot-Server-Patches/0097-Use-correct-item-in-arrow-pickup-event.patch
View file

@ -1,4 +1,4 @@
From da4991273ded9806e86a36f9e87b3cff0768bbdd Mon Sep 17 00:00:00 2001
From 29da1473760184b2509d1dca0926be9cbf52a558 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 22 Mar 2016 16:00:16 -0400
Subject: [PATCH] Use correct item in arrow pickup event
@ -27,5 +27,5 @@ index b7ac5f7..37cb17c 100644
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0099-Fix-cooked-fish-legacy-import.patch → Spigot-Server-Patches/0098-Fix-cooked-fish-legacy-import.patch
View file

@ -1,4 +1,4 @@
From eaa0d207c201b635cb0d461a7fc88c7e05a306b4 Mon Sep 17 00:00:00 2001
From 3dcbfd6d24e6d06d0efc34c3150a5402a3813eed Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 04:32:08 -0500
Subject: [PATCH] Fix cooked fish legacy import
@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
DataConverterMaterialId.a[352] = "minecraft:bone";
DataConverterMaterialId.a[353] = "minecraft:sugar";
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch → Spigot-Server-Patches/0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
View file

@ -1,4 +1,4 @@
From 5981293c0b82225d853afa9535fba868f4b58665 Mon Sep 17 00:00:00 2001
From 96c5e2c3cce309b02bc2705fd29713388aa9ea59 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Sat, 26 Mar 2016 21:36:05 -0500
Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
@ -87,5 +87,5 @@ index 704faa9..d6cc51b 100644
this.b.b = i;
this.b.c = j;
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0101-Access-items-by-EquipmentSlot.patch → Spigot-Server-Patches/0100-Access-items-by-EquipmentSlot.patch
View file

@ -1,4 +1,4 @@
From 46a65354e4c97fd90db2c37c7aa04c030c4b51d2 Mon Sep 17 00:00:00 2001
From d791d634713d7e261e2100d77e4b80edd40f74b2 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 20 Mar 2016 06:45:01 -0400
Subject: [PATCH] Access items by EquipmentSlot
@ -64,5 +64,5 @@ index 51a8b4e..47654a0 100644
+ // Paper end
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0102-Check-async-remove-unused-vars-GH-159.patch → Spigot-Server-Patches/0101-Check-async-remove-unused-vars-GH-159.patch
View file

@ -1,4 +1,4 @@
From 7ef0019c92436a06b26d1d981ff5d9de40b471c2 Mon Sep 17 00:00:00 2001
From 7474360dfd11de2dce0e701f7a0ea28ec251007c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 27 Mar 2016 20:24:05 -0500
Subject: [PATCH] Check async, remove unused vars, GH-159
@ -28,5 +28,5 @@ index b3edaee..ea0a145 100644
if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
--
2.9.0
2.9.2.windows.1

8
Spigot-Server-Patches/0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch → Spigot-Server-Patches/0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
View file

@ -1,4 +1,4 @@
From b929da4abcfbe4e644f9611943d23599a22a577d Mon Sep 17 00:00:00 2001
From 70d03c83ecc34c518360084ab4a0e5e2ba5cec37 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 19:55:45 -0400
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
by saving millions of event calls on redstone heavy servers.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 1b996ba..ca0673e 100644
index d29f2a4..9628c06 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -291,4 +291,9 @@ public class PaperWorldConfig {
@@ -286,4 +286,9 @@ public class PaperWorldConfig {
skeleHorseSpawnChance = 0.05D; // Vanilla
}
}
@ -67,5 +67,5 @@ index 72a604a..d448277 100644
timing.stopTiming(); // Paper
} else {
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0104-Entity-AddTo-RemoveFrom-World-Events.patch → Spigot-Server-Patches/0103-Entity-AddTo-RemoveFrom-World-Events.patch
View file

@ -1,4 +1,4 @@
From ab3f55e597d417d561f9925fc43ff0d092643760 Mon Sep 17 00:00:00 2001
From fbe7a5ea13e1cebf44901f7561480ed2e78a06b9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:32:58 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@ -25,5 +25,5 @@ index 0c7558f..a494569 100644
}
--
2.9.0
2.9.2.windows.1

12
Spigot-Server-Patches/0105-Configurable-Chunk-Inhabited-Timer.patch → Spigot-Server-Patches/0104-Configurable-Chunk-Inhabited-Timer.patch
View file

@ -1,4 +1,4 @@
From 69126a742a8bea124915824db8694e880a6126ca Mon Sep 17 00:00:00 2001
From 6aa657efe8c229a5f5a2af8f9d325a430f2eb2cf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:46:14 -0400
Subject: [PATCH] Configurable Chunk Inhabited Timer
@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
For people who want all chunks to be treated equally, you can disable the timer.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index ca0673e..7d60d5e 100644
index 9628c06..6eb0a2d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -296,4 +296,9 @@ public class PaperWorldConfig {
@@ -291,4 +291,9 @@ public class PaperWorldConfig {
private void firePhysicsEventForRedstone() {
firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
}
@ -23,10 +23,10 @@ index ca0673e..7d60d5e 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 63e11aa..74ffa66 100644
index c7452d9..e36525a 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1405,7 +1405,7 @@ public class Chunk {
@@ -1402,7 +1402,7 @@ public class Chunk {
}
public long x() {
@ -36,5 +36,5 @@ index 63e11aa..74ffa66 100644
public void c(long i) {
--
2.9.3
2.9.2.windows.1

4
Spigot-Server-Patches/0106-EntityPathfindEvent.patch → Spigot-Server-Patches/0105-EntityPathfindEvent.patch
View file

@ -1,4 +1,4 @@
From 434efe8e1de761b4b5f03eba30068a48eade6eb0 Mon Sep 17 00:00:00 2001
From dc12e66c9b125599754adf9ad30cde24a3a63122 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 21:22:26 -0400
Subject: [PATCH] EntityPathfindEvent
@ -35,5 +35,5 @@ index b1a90c1..5d0b5a4 100644
float f = this.h();
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch → Spigot-Server-Patches/0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
View file

@ -1,4 +1,4 @@
From 83984746d42831aaa8967591b2b41d038414b945 Mon Sep 17 00:00:00 2001
From 84d52cc4bf3b5ec096d1c29e0042ccfd83734aec Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 22:03:09 -0400
Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
@ -48,5 +48,5 @@ index 0336b9c..044ad71 100644
if (this.material == Material.LAVA) {
this.fizz(world, blockposition);
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0108-Minecart-drop-name-workaround.patch → Spigot-Server-Patches/0107-Minecart-drop-name-workaround.patch
View file

@ -1,4 +1,4 @@
From 53d91e9777d3e6d77a574fb718cb2c9e230792d7 Mon Sep 17 00:00:00 2001
From e035cc22efde49cb0ce7a107bc992be863a6bd42 Mon Sep 17 00:00:00 2001
From: Fabse <fabse@uwmc.info>
Date: Mon, 28 Mar 2016 00:46:46 +0200
Subject: [PATCH] Minecart drop name workaround
@ -20,5 +20,5 @@ index 4438d83..9df7dfc 100644
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0109-Reduce-IO-ops-opening-a-new-region-file.patch → Spigot-Server-Patches/0108-Reduce-IO-ops-opening-a-new-region-file.patch
View file

@ -1,4 +1,4 @@
From 4f3972729ecb4d8907d6bd0abfe9e32425e98abc Mon Sep 17 00:00:00 2001
From cdc7c47397def03707027d5f174d8ff691533397 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Tue, 29 Mar 2016 06:56:23 +0300
Subject: [PATCH] Reduce IO ops opening a new region file.
@ -49,5 +49,5 @@ index 1fe5019..45d490e 100644
}
} catch (IOException ioexception) {
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0110-Sanitise-RegionFileCache-and-make-configurable.patch → Spigot-Server-Patches/0109-Sanitise-RegionFileCache-and-make-configurable.patch
View file

@ -1,4 +1,4 @@
From ab291bae71dad9b49b855648c8de79023920a594 Mon Sep 17 00:00:00 2001
From 767ab4912331bac74784499d8dccb5f3db99ef6e Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Tue, 29 Mar 2016 08:22:55 +0300
Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@ -77,5 +77,5 @@ index 2121e84..a7ab262 100644
Iterator iterator = RegionFileCache.a.values().iterator();
--
2.9.0
2.9.2.windows.1

10
Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch → Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch
View file

@ -1,11 +1,11 @@
From 973902abbfc253161bc46db73cd093935edcc851 Mon Sep 17 00:00:00 2001
From 62a310de3066ba26bb9498a0d9e322fc5da49505 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
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 453e600..11770ad 100644
index d1d268f..ac8dd76 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1508,6 +1508,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -26,10 +26,10 @@ 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 e676a01..a9976f4 100644
index 15bef42..703aff1 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;
@@ -53,6 +53,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
import org.bukkit.conversations.Conversable;
import org.bukkit.craftbukkit.boss.CraftBossBar;
import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
@ -37,7 +37,7 @@ index e676a01..a9976f4 100644
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.generator.CraftChunkData;
import org.bukkit.craftbukkit.help.SimpleHelpMap;
@@ -1861,5 +1862,14 @@ public final class CraftServer implements Server {
@@ -1848,5 +1849,14 @@ public final class CraftServer implements Server {
});
}
}

4
Spigot-Server-Patches/0112-Use-Optimized-Collections.patch → Spigot-Server-Patches/0111-Use-Optimized-Collections.patch
View file

@ -1,4 +1,4 @@
From b3c34e97f0d695b18c0cee6df10138d8c8d485be Mon Sep 17 00:00:00 2001
From 3b0df507ab8e1866e84440941a95d178563bfd08 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 30 Mar 2016 02:13:24 -0400
Subject: [PATCH] Use Optimized Collections
@ -47,5 +47,5 @@ index 47968a8..1f5e6c0 100644
private boolean f = true;
private boolean g;
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0113-Do-not-load-chunks-for-light-checks.patch → Spigot-Server-Patches/0112-Do-not-load-chunks-for-light-checks.patch
View file

@ -1,4 +1,4 @@
From 9ab85f6bdb0237697f5686f7978aee997674191a Mon Sep 17 00:00:00 2001
From 8ee19cf90c31e5ee9d29eccf64670bbb789ea2c7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 31 Mar 2016 19:17:58 -0400
Subject: [PATCH] Do not load chunks for light checks
@ -19,5 +19,5 @@ index a494569..1dc8af1 100644
Chunk chunk = this.getChunkAtWorldCoords(blockposition);
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0114-Add-PlayerUseUnknownEntityEvent.patch → Spigot-Server-Patches/0113-Add-PlayerUseUnknownEntityEvent.patch
View file

@ -1,4 +1,4 @@
From 2943a23d314737435d4bb0578ad99ab3c151cf1d Mon Sep 17 00:00:00 2001
From e849a26b3b600023fd469653db936bb0f93e3530 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:09:16 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -39,5 +39,5 @@ index d5e06f0..b983540 100644
}
--
2.9.0
2.9.2.windows.1

6
Spigot-Server-Patches/0115-Fix-reducedDebugInfo-not-initialized-on-client.patch → Spigot-Server-Patches/0114-Fix-reducedDebugInfo-not-initialized-on-client.patch
View file

@ -1,11 +1,11 @@
From 35afe0d12467dfff5f128eacc110141c54415865 Mon Sep 17 00:00:00 2001
From fd9bf3fcdb8a1c280df5edf173d1b74ad9f69486 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 20:37:03 -0400
Subject: [PATCH] Fix reducedDebugInfo not initialized on client
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index b202c97..2ff205c 100644
index e88e918..a41bc5f 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -152,6 +152,7 @@ public abstract class PlayerList {
@ -17,5 +17,5 @@ index b202c97..2ff205c 100644
entityplayer.getStatisticManager().d();
entityplayer.getStatisticManager().updateStatistics(entityplayer);
--
2.9.0
2.9.2.windows.1

8
Spigot-Server-Patches/0116-Configurable-Grass-Spread-Tick-Rate.patch → Spigot-Server-Patches/0115-Configurable-Grass-Spread-Tick-Rate.patch
View file

@ -1,14 +1,14 @@
From 9aa856267caa2068b19700bf134c7be3480219b1 Mon Sep 17 00:00:00 2001
From d04763e1d3778c4157f814243105fec5e36ff613 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Apr 2016 16:28:17 -0400
Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 7d60d5e..486ada4 100644
index 6eb0a2d..bc3515c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -301,4 +301,10 @@ public class PaperWorldConfig {
@@ -296,4 +296,10 @@ public class PaperWorldConfig {
private void useInhabitedTime() {
useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
}
@ -32,5 +32,5 @@ index 21e722d..e41f2b2 100644
int lightLevel = -1; // Paper
if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
--
2.9.0
2.9.2.windows.1

12
Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch → Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View file

@ -1,4 +1,4 @@
From 4fdfba5dd1fbe77d854e98dd627c01166c5ca6b8 Mon Sep 17 00:00:00 2001
From 19e01440cce4627ca287b60b5b40870897a8f804 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
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
This lets you disable it for some worlds and lower it for others.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 486ada4..203dafc 100644
index bc3515c..84694b2 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -307,4 +307,10 @@ public class PaperWorldConfig {
@@ -302,4 +302,10 @@ public class PaperWorldConfig {
grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
log("Grass Spread Tick Rate: " + grassUpdateRate);
}
@ -21,7 +21,7 @@ index 486ada4..203dafc 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 11770ad..89b8595 100644
index ac8dd76..1a7a0ee 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -349,8 +349,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -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 a9976f4..62a598c 100644
index 703aff1..100142e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -942,7 +942,7 @@ public final class CraftServer implements Server {
@@ -949,7 +949,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()) {

4
Spigot-Server-Patches/0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch → Spigot-Server-Patches/0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
View file

@ -1,4 +1,4 @@
From cfd8d89b541a964adfaf6212de5473647a1b10a5 Mon Sep 17 00:00:00 2001
From 8d455ccf4c75da5b9448642a71e465e709692ca8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Apr 2016 17:48:50 -0400
Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
@ -17,5 +17,5 @@ index bb578d9..4452107 100644
this.e(blockposition.east(), block);
this.e(blockposition.down(), block);
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch → Spigot-Server-Patches/0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
View file

@ -1,4 +1,4 @@
From 9ecc819d5041374d6faab2ae9b1e585ee251b8ef Mon Sep 17 00:00:00 2001
From 7aecf78faa71b889cafcca8b21e7b6fb23a5f89f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 19:42:22 -0400
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@ -31,5 +31,5 @@ index e30d346..d1b2d15 100644
}
}
--
2.9.0
2.9.2.windows.1

4
Spigot-Server-Patches/0120-Remove-Debug-checks-from-DataBits.patch → Spigot-Server-Patches/0119-Remove-Debug-checks-from-DataBits.patch
View file

@ -1,4 +1,4 @@
From 327cd944a22ef905afc3abcf10d50d8c36077209 Mon Sep 17 00:00:00 2001
From a1156e2f6d4fa43ce44ad0c868ab98b3098d6458 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 21:38:58 -0400
Subject: [PATCH] Remove Debug checks from DataBits
@ -42,5 +42,5 @@ index f3a6799..fa0fd8a 100644
int k = j / 64;
int l = ((i + 1) * this.b - 1) / 64;
--
2.9.0
2.9.2.windows.1

6
Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch → Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
View file

@ -1,14 +1,14 @@
From c9541f52a6d03f5c73959d649b1b67b8b4c7e2f2 Mon Sep 17 00:00:00 2001
From 7dcf96b882df0d252851dd1f5362fda7f74e7688 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 6 Apr 2016 01:04:23 -0500
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 203dafc..66cd256 100644
index 84694b2..64e20d5 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -313,4 +313,9 @@ public class PaperWorldConfig {
@@ -308,4 +308,9 @@ public class PaperWorldConfig {
keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
}

Some files were not shown because too many files have changed in this diff Show more