diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index cfc220c5ad..d051a09325 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 6fbd2dbbb48a9fd96971d79992af9b9f1e5487dd Mon Sep 17 00:00:00 2001 +From a8ffb9f5823bbfe973233e2f4c4e5f45cb4ea5cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -3139,7 +3139,7 @@ index 000000000..5989ee212 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index bbc68de0a..a85b8b860 100644 +index 82bc43aa9..279236a45 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -574,7 +574,6 @@ public final class Bukkit { @@ -3151,10 +3151,10 @@ index bbc68de0a..a85b8b860 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 042db4f53..f4f0f3da2 100644 +index 83ce6a86e..d00a289de 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1248,6 +1248,26 @@ public interface Server extends PluginMessageRecipient { +@@ -1260,6 +1260,26 @@ public interface Server extends PluginMessageRecipient { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index a635d4ea8d..ac9c4d847d 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,14 +1,14 @@ -From 510b3804346327935a0f02423c54a46b68649235 Mon Sep 17 00:00:00 2001 +From 9a5fb9b80a46a450067b0620831174013dd92ad1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 940c643d..9f87f333 100644 +index 279236a45..3faccfea7 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1311,6 +1311,17 @@ public final class Bukkit { +@@ -1325,6 +1325,17 @@ public final class Bukkit { return server.getEntity(uuid); } @@ -27,10 +27,10 @@ index 940c643d..9f87f333 100644 * Get the advancement specified by this key. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c197e381..e1dfa92a 100644 +index d00a289de..51efc5f71 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1096,6 +1096,16 @@ public interface Server extends PluginMessageRecipient { +@@ -1108,6 +1108,16 @@ public interface Server extends PluginMessageRecipient { @Nullable Entity getEntity(@NotNull UUID uuid); @@ -48,5 +48,5 @@ index c197e381..e1dfa92a 100644 * Get the advancement specified by this key. * -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index a8291c2d70..d63fc9d09c 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From 7664bee9fabc104e5e97b7122e1e60bd112e747b Mon Sep 17 00:00:00 2001 +From e4691bd2dccf7c9841bb40ec8aa4ee86fc6f81b7 Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 29 Feb 2016 19:48:59 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f712d27b..487ecdad 100644 +index 3faccfea7..c9f473641 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1485,6 +1485,19 @@ public final class Bukkit { +@@ -1499,6 +1499,19 @@ public final class Bukkit { return server.getUnsafe(); } @@ -29,10 +29,10 @@ index f712d27b..487ecdad 100644 public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index be17dcc6..425d8781 100644 +index 51efc5f71..121367cd0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1106,6 +1106,15 @@ public interface Server extends PluginMessageRecipient { +@@ -1118,6 +1118,15 @@ public interface Server extends PluginMessageRecipient { public double[] getTPS(); // Paper end diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch index 4a69ed4e4c..7710af886a 100644 --- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -1,4 +1,4 @@ -From a11adba8d108fa72b7cebd2e84f0cceff1098f7c Mon Sep 17 00:00:00 2001 +From 8eab30f6cf58217f754d15de6e771436218a5c35 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml and require confirm to @@ -6,10 +6,10 @@ 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 f152a60f6..58a183b9d 100644 +index 348e5411f..8f5aa9068 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1516,6 +1516,13 @@ public final class Bukkit { +@@ -1530,6 +1530,13 @@ public final class Bukkit { public static org.bukkit.command.CommandMap getCommandMap() { return server.getCommandMap(); } @@ -24,10 +24,10 @@ index f152a60f6..58a183b9d 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 74f9d2bbc..ca0b63fa0 100644 +index 743dbfe89..88306726c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1336,4 +1336,6 @@ public interface Server extends PluginMessageRecipient { +@@ -1348,4 +1348,6 @@ public interface Server extends PluginMessageRecipient { @NotNull Spigot spigot(); // Spigot end diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch index 8cff9aaacc..7afb73c504 100644 --- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 716d04a625ad53d7c23629e6b0d9e169fcc3878e Mon Sep 17 00:00:00 2001 +From 8204b1c42ea2dd1e6159e94f54bd6993c0d8281b Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 58a183b9..a8fe9925 100644 +index 8f5aa9068..52599c907 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1523,6 +1523,15 @@ public final class Bukkit { +@@ -1537,6 +1537,15 @@ public final class Bukkit { public static void reloadPermissions() { server.reloadPermissions(); } @@ -26,10 +26,10 @@ index 58a183b9..a8fe9925 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index ca0b63fa..9e59c9bf 100644 +index 88306726c..b68098b6d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1338,4 +1338,6 @@ public interface Server extends PluginMessageRecipient { +@@ -1350,4 +1350,6 @@ public interface Server extends PluginMessageRecipient { // Spigot end void reloadPermissions(); // Paper @@ -37,7 +37,7 @@ index ca0b63fa..9e59c9bf 100644 + boolean reloadCommandAliases(); // Paper } diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java -index bd2c7a69..864c263b 100644 +index bd2c7a696..864c263bb 100644 --- a/src/main/java/org/bukkit/command/CommandMap.java +++ b/src/main/java/org/bukkit/command/CommandMap.java @@ -128,4 +128,14 @@ public interface CommandMap { @@ -56,7 +56,7 @@ index bd2c7a69..864c263b 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index adfc7aae..460fda05 100644 +index adfc7aae2..460fda05a 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap { @@ -72,7 +72,7 @@ index adfc7aae..460fda05 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index c62da413..af8ab73f 100644 +index c62da4131..af8ab73fe 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand { diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch index a395087c1e..15cf6a9a8a 100644 --- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From a8e01b9271318336993e03ebd734cf22ec5472a6 Mon Sep 17 00:00:00 2001 +From 1255c19720c7ce036ff87708f203d015b8230830 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:24 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a8fe9925..b4fef76b 100644 +index 52599c907..d0119b3b7 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1532,6 +1532,16 @@ public final class Bukkit { +@@ -1546,6 +1546,16 @@ public final class Bukkit { public static boolean reloadCommandAliases() { return server.reloadCommandAliases(); } @@ -27,10 +27,10 @@ index a8fe9925..b4fef76b 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9e59c9bf..c108478a 100644 +index b68098b6d..403a1e17d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1340,4 +1340,14 @@ public interface Server extends PluginMessageRecipient { +@@ -1352,4 +1352,14 @@ public interface Server extends PluginMessageRecipient { void reloadPermissions(); // Paper boolean reloadCommandAliases(); // Paper @@ -46,7 +46,7 @@ index 9e59c9bf..c108478a 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java -index 7f153000..1e126487 100644 +index 7f153000e..1e126487d 100644 --- a/src/main/java/org/bukkit/command/PluginCommand.java +++ b/src/main/java/org/bukkit/command/PluginCommand.java @@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index 942085f690..5c70781529 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 9cf9ffe4e56840183e198f65002c4d260a422437 Mon Sep 17 00:00:00 2001 +From 59ebf71478418359fd0f3967e2394f6148f5a5de Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 21:46:46 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java new file mode 100644 -index 00000000..476151d2 +index 000000000..476151d2a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java @@ -0,0 +1,145 @@ @@ -158,7 +158,7 @@ index 00000000..476151d2 +} diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java new file mode 100644 -index 00000000..7b3b6ef5 +index 000000000..7b3b6ef53 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java @@ -0,0 +1,72 @@ @@ -235,10 +235,10 @@ index 00000000..7b3b6ef5 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b4fef76b..c3bcc653 100644 +index d0119b3b7..c1f96b46f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1542,6 +1542,40 @@ public final class Bukkit { +@@ -1556,6 +1556,40 @@ public final class Bukkit { public static boolean suggestPlayerNamesWhenNullTabCompletions() { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -280,10 +280,10 @@ index b4fef76b..c3bcc653 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c108478a..48d8c967 100644 +index 403a1e17d..a5e87a4ab 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1349,5 +1349,33 @@ public interface Server extends PluginMessageRecipient { +@@ -1361,5 +1361,33 @@ public interface Server extends PluginMessageRecipient { * @return true if player names should be suggested */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch index b21d9a2eee..8d228b9927 100644 --- a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch +++ b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch @@ -1,14 +1,14 @@ -From eb23a61d24f7150eb24130ce0ac936cb7fd8d93f Mon Sep 17 00:00:00 2001 +From d679f9f4ab62f832886c60b2d24f66d3674b98ba Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:44:54 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d1ac7856..ee03abae 100644 +index 95b8f4cf3..389180290 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1557,6 +1557,15 @@ public final class Bukkit { +@@ -1571,6 +1571,15 @@ public final class Bukkit { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -25,10 +25,10 @@ index d1ac7856..ee03abae 100644 * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 409c1624..e9e64060 100644 +index 6ad677bda..fbb21b4a3 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1362,6 +1362,13 @@ public interface Server extends PluginMessageRecipient { +@@ -1374,6 +1374,13 @@ public interface Server extends PluginMessageRecipient { */ boolean suggestPlayerNamesWhenNullTabCompletions(); @@ -43,7 +43,7 @@ index 409c1624..e9e64060 100644 * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 03bdc162..0b0d1bd7 100644 +index 03bdc1622..0b0d1bd7c 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -185,7 +185,7 @@ public abstract class Command { diff --git a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch index 199d58eada..eda132fc76 100644 --- a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch +++ b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch @@ -1,4 +1,4 @@ -From 0d5124c6ebb38a898767c1b991bafecacc3bc1dd Mon Sep 17 00:00:00 2001 +From 150224b84389e4e41390bb346b9789e8f8a6152f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:39:01 -0400 Subject: [PATCH] Flip some Spigot API null annotations @@ -9,10 +9,10 @@ a ton of noise to plugin developers. These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 2148a3c2..6db69159 100644 +index 389180290..93de987d5 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1153,7 +1153,7 @@ public final class Bukkit { +@@ -1167,7 +1167,7 @@ public final class Bukkit { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -21,7 +21,7 @@ index 2148a3c2..6db69159 100644 public static ScoreboardManager getScoreboardManager() { return server.getScoreboardManager(); } -@@ -1450,7 +1450,7 @@ public final class Bukkit { +@@ -1464,7 +1464,7 @@ public final class Bukkit { * @param clazz the class of the tag entries * @return the tag or null */ @@ -31,7 +31,7 @@ index 2148a3c2..6db69159 100644 return server.getTag(registry, tag, clazz); } diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6e1a1124..77d9cd0a 100644 +index 6e1a1124a..77d9cd0a1 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -62,10 +62,10 @@ index 6e1a1124..77d9cd0a 100644 if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1cbb9bc6..27d3b5ad 100644 +index fbb21b4a3..2733793a5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -962,7 +962,7 @@ public interface Server extends PluginMessageRecipient { +@@ -974,7 +974,7 @@ public interface Server extends PluginMessageRecipient { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -74,7 +74,7 @@ index 1cbb9bc6..27d3b5ad 100644 ScoreboardManager getScoreboardManager(); /** -@@ -1232,7 +1232,7 @@ public interface Server extends PluginMessageRecipient { +@@ -1244,7 +1244,7 @@ public interface Server extends PluginMessageRecipient { * @param clazz the class of the tag entries * @return the tag or null */ @@ -84,7 +84,7 @@ index 1cbb9bc6..27d3b5ad 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 3cada348..03ba2265 100644 +index 3cada3487..03ba22659 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -3,6 +3,7 @@ package org.bukkit.inventory; @@ -105,7 +105,7 @@ index 3cada348..03ba2265 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index f2c3d2ac..5426e7c2 100644 +index 4940ba6a9..d7d6a3e83 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -8,6 +8,7 @@ import java.util.Set; // Paper diff --git a/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch b/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch index 3b2eb11537..a2a49e88a2 100644 --- a/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch +++ b/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch @@ -1,4 +1,4 @@ -From 93548ddd969d1473484e7793511d8019c7d430ec Mon Sep 17 00:00:00 2001 +From ed28e81070e65d81b3033caf1f2ad6399194f63f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Oct 2019 21:24:28 -0500 Subject: [PATCH] Name the specific custom world gen plugin class that throws a @@ -6,10 +6,10 @@ Subject: [PATCH] Name the specific custom world gen plugin class that throws a diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java -index 5b847bb3..6c9d313f 100644 +index 70f20fb64..59138238b 100644 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java -@@ -109,7 +109,10 @@ public abstract class ChunkGenerator { +@@ -114,7 +114,10 @@ public abstract class ChunkGenerator { */ @NotNull public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) { @@ -22,5 +22,5 @@ index 5b847bb3..6c9d313f 100644 /** -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch index d035891a46..275ae1d06e 100644 --- a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch +++ b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch @@ -1,14 +1,14 @@ -From 4684a91a8eb0975c778bf782b33c512fc9b8aeb9 Mon Sep 17 00:00:00 2001 +From a4dde4633566bd37253986617541e91a46ac204f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Apr 2019 19:47:29 -0500 Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 570c5bc8..388c2bbf 100644 +index 93de987d5..355bd2e22 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1599,6 +1599,10 @@ public final class Bukkit { +@@ -1613,6 +1613,10 @@ public final class Bukkit { public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) { return server.createProfile(uuid, name); } @@ -20,10 +20,10 @@ index 570c5bc8..388c2bbf 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 5e94b2b0..a1371730 100644 +index 2733793a5..98e7ba900 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1396,5 +1396,12 @@ public interface Server extends PluginMessageRecipient { +@@ -1408,5 +1408,12 @@ public interface Server extends PluginMessageRecipient { */ @NotNull com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name); diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 6f902cce60..37be6f9088 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From 3ed4ec15e40b966cf7f295587891181cdc06efec Mon Sep 17 00:00:00 2001 +From 8e5b8c219622b92757c01e0ae591b206e8512802 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 0000000000..db899937be +index 000000000..db899937b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,247 @@ @@ -259,7 +259,7 @@ index 0000000000..db899937be +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 0000000000..273cdb598b +index 000000000..273cdb598 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +1,184 @@ @@ -449,7 +449,7 @@ index 0000000000..273cdb598b +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 0000000000..a738657394 +index 000000000..a73865739 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +1,67 @@ @@ -521,7 +521,7 @@ index 0000000000..a738657394 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 136d1b50f1..9eed98e379 100644 +index 136d1b50f..9eed98e37 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -170,6 +170,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -541,7 +541,7 @@ index 136d1b50f1..9eed98e379 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f14b37e51a..34cb00b0ba 100644 +index f14b37e51..34cb00b0b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -558,7 +558,7 @@ index f14b37e51a..34cb00b0ba 100644 public long aa; public long ab; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index ddca89a132..f937b72945 100644 +index ddca89a13..f937b7294 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -581,7 +581,7 @@ index ddca89a132..f937b72945 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index cdd254a7e5..f0deeb3d28 100644 +index cdd254a7e..f0deeb3d2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,6 +68,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -602,10 +602,10 @@ index cdd254a7e5..f0deeb3d28 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 4243460e4d..57ad50403b 100644 +index 5a6142eb7..0c9d5d231 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -757,6 +757,7 @@ public final class CraftServer implements Server { +@@ -759,6 +759,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -613,7 +613,7 @@ index 4243460e4d..57ad50403b 100644 for (WorldServer world : console.getWorlds()) { world.worldData.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -772,6 +773,7 @@ public final class CraftServer implements Server { +@@ -774,6 +775,7 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot @@ -621,7 +621,7 @@ index 4243460e4d..57ad50403b 100644 } pluginManager.clearPlugins(); -@@ -779,6 +781,7 @@ public final class CraftServer implements Server { +@@ -781,6 +783,7 @@ public final class CraftServer implements Server { resetRecipes(); reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot @@ -629,7 +629,7 @@ index 4243460e4d..57ad50403b 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -1962,4 +1965,35 @@ public final class CraftServer implements Server { +@@ -1978,4 +1981,35 @@ public final class CraftServer implements Server { { return spigot; } @@ -666,7 +666,7 @@ index 4243460e4d..57ad50403b 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 766e0f6b1d..3a0c01852d 100644 +index 766e0f6b1..3a0c01852 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -129,6 +129,14 @@ public class Main { @@ -685,7 +685,7 @@ index 766e0f6b1d..3a0c01852d 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 34964d2853..5686a4f1a0 100644 +index 5597d4100..4965a48c3 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,36 +39,36 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index b0a7ea5485..417412b5d6 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 9ab11077cbfaab8088f7a407153b156636f5a9b9 Mon Sep 17 00:00:00 2001 +From 7ebe7afb5067c436e7e9bc2b5b21c90729204fbe Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -375,7 +375,7 @@ index e58dd3e6d..0b32179b7 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 4dd804e9c..b09868e2d 100644 +index f558ae441..2107ddc48 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -227,11 +227,13 @@ public class ChunkProviderServer extends IChunkProvider { @@ -944,7 +944,7 @@ index b4a0bd795..4dc691775 100644 this.methodProfiler.exit(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index e24889371..1f289047f 100644 +index 93d838ec2..2a6955f85 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,7 +1,9 @@ @@ -1258,7 +1258,7 @@ index 304dfac06..da3eb20d4 100644 CrashReport crashreport = CrashReport.a(throwable, "Ticking entity"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked"); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2aaf679df..ebc252a61 100644 +index 8a5ac6f69..069898bad 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,6 +1,8 @@ @@ -1383,10 +1383,10 @@ index 2aaf679df..ebc252a61 100644 // CraftBukkit start - moved from MinecraftServer.saveChunks diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 57ad50403..038928789 100644 +index 0c9d5d231..49be263ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1935,12 +1935,31 @@ public final class CraftServer implements Server { +@@ -1951,12 +1951,31 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index db5cd15639..f364f6e9d8 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From f2c62a81754d979f3fa97d173a70a27352ccb8c7 Mon Sep 17 00:00:00 2001 +From 8a221ba603796ddcd676abfad8c3e5995288e624 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -32,10 +32,10 @@ index 4dc691775..2b3844ae5 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 038928789..bcac697b2 100644 +index 49be263ae..03ad9e005 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -197,7 +197,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; +@@ -199,7 +199,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; import net.md_5.bungee.api.chat.BaseComponent; // Spigot public final class CraftServer implements Server { @@ -116,5 +116,5 @@ index 54fa83c12..73fa74e3c 100644 log.log( Level.SEVERE, "------------------------------" ); // -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch index 4171d6fde7..91edc61afc 100644 --- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 5892731b5b164988c9063a63a9df78d6a7af129c Mon Sep 17 00:00:00 2001 +From a4b1083f69dd3c49e34f3c05d70e300f1dcc451c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -140,10 +140,10 @@ index 2b3844ae5..7b8c523e6 100644 if (this.T) { this.T = false; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bcac697b2..0f84f3243 100644 +index 03ad9e005..88bd1ff20 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1932,6 +1932,17 @@ public final class CraftServer implements Server { +@@ -1948,6 +1948,17 @@ public final class CraftServer implements Server { return CraftMagicNumbers.INSTANCE; } @@ -203,5 +203,5 @@ index be2e31dea..6d21c3269 100644 return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch index f8d3163657..d00a74f003 100644 --- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From 5e6c1c9f400ed29514f3a5ff3ee87014e56f529e Mon Sep 17 00:00:00 2001 +From 635ddb856eddff4a429c4583f3f3b49b37043342 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:17:12 -0600 Subject: [PATCH] Ensure commands are not ran async @@ -48,10 +48,10 @@ index b7beb058d..fae57fc2c 100644 } else if (this.player.getChatFlags() == 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 0f84f3243..3fe8c34b8 100644 +index 88bd1ff20..50deb7187 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -708,6 +708,29 @@ public final class CraftServer implements Server { +@@ -710,6 +710,29 @@ public final class CraftServer implements Server { Validate.notNull(commandLine, "CommandLine cannot be null"); org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot @@ -118,5 +118,5 @@ index e7b953ca3..ccea803f5 100644 { String[] split = restartScript.split( " " ); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch index 98c31dcaa5..d21dd3218a 100644 --- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From e9d95dfb7c49005ccf7726b8a13e3657aafc2f34 Mon Sep 17 00:00:00 2001 +From 9a80933d548ed314930de177c6c441af7cdb69bf Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3fe8c34b8..20d454052 100644 +index 50deb7187..37d3e2c80 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1591,6 +1591,7 @@ public final class CraftServer implements Server { +@@ -1607,6 +1607,7 @@ public final class CraftServer implements Server { return helpMap; } @@ -17,5 +17,5 @@ index 3fe8c34b8..20d454052 100644 return commandMap; } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch index 1ac6ea6aec..087ad09e94 100644 --- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch @@ -1,14 +1,14 @@ -From 098fda9a90e274c5aa35932340f5d97283e09d86 Mon Sep 17 00:00:00 2001 +From 0b36e22794f7672b7b3b4a4f14132ee0afaa3d4e Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 20d454052..1e90c9c92 100644 +index 37d3e2c80..096053c0a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -232,6 +232,7 @@ public final class CraftServer implements Server { +@@ -234,6 +234,7 @@ public final class CraftServer implements Server { public boolean ignoreVanillaPermissions = false; private final List playerView; public int reloadCount; @@ -88,5 +88,5 @@ index 73fa74e3c..d96100061 100644 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch index b56fc45aa5..dffd48b476 100644 --- a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 67e3542b25005e84a8d915f65f0430ff933efd2b Mon Sep 17 00:00:00 2001 +From 29c0ae1b797b1e2e823dd04220e6c8e12aa89fd9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -30,10 +30,10 @@ index f402a29b0..6ef5bb9f3 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1e90c9c92..cb7ca7d77 100644 +index 096053c0a..9c9f7cee6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -368,6 +368,7 @@ public final class CraftServer implements Server { +@@ -370,6 +370,7 @@ public final class CraftServer implements Server { if (type == PluginLoadOrder.STARTUP) { helpMap.clear(); helpMap.initializeGeneralTopics(); @@ -41,7 +41,7 @@ index 1e90c9c92..cb7ca7d77 100644 } Plugin[] plugins = pluginManager.getPlugins(); -@@ -387,7 +388,7 @@ public final class CraftServer implements Server { +@@ -389,7 +390,7 @@ public final class CraftServer implements Server { commandMap.registerServerAliases(); DefaultPermissions.registerCorePermissions(); CraftDefaultPermissions.registerCorePermissions(); @@ -51,5 +51,5 @@ index 1e90c9c92..cb7ca7d77 100644 syncCommands(); } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch index c328ccb939..6d53d8342d 100644 --- a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 2c7034fa47ef57dab2edd1e776bfc9da6f206adf Mon Sep 17 00:00:00 2001 +From a958059458de755538ab3105bd1360b2c5803d21 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cb7ca7d77..f723f01bf 100644 +index 9c9f7cee6..117b349c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2051,5 +2051,23 @@ public final class CraftServer implements Server { +@@ -2067,5 +2067,23 @@ public final class CraftServer implements Server { return null; } } @@ -34,5 +34,5 @@ index cb7ca7d77..f723f01bf 100644 // Paper end } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index fcc91cbfbb..0e7f4a4166 100644 --- a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From ae42e08590dd44660b344e7976bf65094fb8e4bc Mon Sep 17 00:00:00 2001 +From b098719121fc98fcaf4d0640e38972bd497722e7 Mon Sep 17 00:00:00 2001 From: Aikar 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 f723f01bf..c745d0baa 100644 +index 117b349c0..1cfdfcdd3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -801,8 +801,18 @@ public final class CraftServer implements Server { +@@ -803,8 +803,18 @@ public final class CraftServer implements Server { world.paperConfig.init(); // Paper } @@ -30,5 +30,5 @@ index f723f01bf..c745d0baa 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch index 5f366b6f1f..3061956a69 100644 --- a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch @@ -1,4 +1,4 @@ -From 9cc11ae8d02de119cafb4bab6df76135c53f09ab Mon Sep 17 00:00:00 2001 +From 503fadc7cc634f8a4aac5fd3039066def6718be5 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status @@ -45,10 +45,10 @@ index 1422503e1..d3c2e1bed 100644 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c745d0baa..6a8c22b6b 100644 +index 1cfdfcdd3..6c5a140a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1361,7 +1361,8 @@ public final class CraftServer implements Server { +@@ -1377,7 +1377,8 @@ public final class CraftServer implements Server { // Spigot Start GameProfile profile = null; // Only fetch an online UUID in online mode @@ -59,5 +59,5 @@ index c745d0baa..6a8c22b6b 100644 profile = console.getUserCache().getProfile( name ); } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch index f29a07b33a..cf5a628402 100644 --- a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 98f58de854300bb08212ed7cac99461d45a3cbd6 Mon Sep 17 00:00:00 2001 +From dfd88925fe2a40a2bd6189d19d4065eaa8b7d09e Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6a8c22b6b..e79d037a4 100644 +index 6c5a140a8..c2636df6b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2080,5 +2080,24 @@ public final class CraftServer implements Server { +@@ -2096,5 +2096,24 @@ public final class CraftServer implements Server { DefaultPermissions.registerCorePermissions(); CraftDefaultPermissions.registerCorePermissions(); } @@ -35,5 +35,5 @@ index 6a8c22b6b..e79d037a4 100644 // Paper end } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch index 633cea7f3a..89534b56f1 100644 --- a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 0cd9a212baf7752ed5a6b1c7a30dae36bdc8305d Mon Sep 17 00:00:00 2001 +From b38e2ce60d5ae0311eb67bc508840ddf27ac1aa2 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -49,14 +49,16 @@ index 078cc2523..6756c79b3 100644 // CraftBukkit start - Fire ProjectileHitEvent diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 7a8b8b0d6..8ad0d0db1 100644 +index 39e3bd379..0a17715a1 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -214,7 +214,16 @@ public class EntityFishingHook extends Entity { +@@ -214,8 +214,19 @@ public class EntityFishingHook extends Entity { return !entity.isSpectator() && (entity.isInteractable() || entity instanceof EntityItem) && (entity != this.owner || this.g >= 5); }, RayTrace.BlockCollisionOption.COLLIDER, true); - if (movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.MISS) { ++ if (movingobjectposition != null && movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.MISS) { // Paper - add null check in case cancelled + org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // CraftBukkit - Call event + // Paper start - Call ProjectileCollideEvent + if (movingobjectposition instanceof MovingObjectPositionEntity) { + com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, (MovingObjectPositionEntity)movingobjectposition); @@ -66,10 +68,11 @@ index 7a8b8b0d6..8ad0d0db1 100644 + } + // Paper end + -+ if (movingobjectposition != null && movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.MISS) { // Paper - add null check in case cancelled - org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Craftbukkit - Call event ++ ++ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Craftbukkit - Call event if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) { this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity(); + this.n(); diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java index 2e4c9d426..724b78b5d 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java @@ -114,5 +117,5 @@ index 95973558e..c45b7c15f 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index c27ba5e264..9d8bfb2f95 100644 --- a/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From fdd7f9c24922595b93467af3066548f518ee3e39 Mon Sep 17 00:00:00 2001 +From d768b8e59b7df30a1bcff3d8b325b1986f8a74d8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -8,7 +8,7 @@ Adds lots of information about why this orb exists. Replaces isFromBottle() with logic that persists entity reloads too. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 5de881371a..5f261b9b92 100644 +index 5de881371..5f261b9b9 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -511,13 +511,13 @@ public class Block implements IMaterial { @@ -28,7 +28,7 @@ index 5de881371a..5f261b9b92 100644 } diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java -index 2d2cd09ad1..ed88e208d0 100644 +index 2d2cd09ad..ed88e208d 100644 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java @@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container { @@ -41,7 +41,7 @@ index 2d2cd09ad1..ed88e208d0 100644 world.triggerEffect(1042, blockposition, 0); diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 8762577696..138e2ea56a 100644 +index 876257769..138e2ea56 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -616,7 +616,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -54,7 +54,7 @@ index 8762577696..138e2ea56a 100644 } diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 0447800d9d..d4275e733d 100644 +index 0447800d9..d4275e733 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity { @@ -134,10 +134,10 @@ index 0447800d9d..d4275e733d 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 8ad0d0db18..8d48154e5b 100644 +index 0a17715a1..cbd30b33b 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -401,7 +401,7 @@ public class EntityFishingHook extends Entity { +@@ -403,7 +403,7 @@ public class EntityFishingHook extends Entity { this.world.addEntity(entityitem); // CraftBukkit start - this.random.nextInt(6) + 1 -> playerFishEvent.getExpToDrop() if (playerFishEvent.getExpToDrop() > 0) { @@ -147,7 +147,7 @@ index 8ad0d0db18..8d48154e5b 100644 // CraftBukkit end if (itemstack1.getItem().a(TagsItem.FISHES)) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dd1caec9da..2775afc327 100644 +index dd1caec9d..2775afc32 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1379,7 +1379,8 @@ public abstract class EntityLiving extends Entity { @@ -161,7 +161,7 @@ index dd1caec9da..2775afc327 100644 this.expToDrop = 0; } diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java -index 0bfc0a773d..ba2f90cc6a 100644 +index 0bfc0a773..ba2f90cc6 100644 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java @@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable { @@ -174,7 +174,7 @@ index 0bfc0a773d..ba2f90cc6a 100644 this.die(); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index c73cc9ae4b..76296119a1 100644 +index c73cc9ae4..76296119a 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -510,7 +510,7 @@ public class EntityTurtle extends EntityAnimal { @@ -187,7 +187,7 @@ index c73cc9ae4b..76296119a1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 5e3835851d..6ca4fa43c4 100644 +index 5e3835851..6ca4fa43c 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -509,7 +509,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -200,7 +200,7 @@ index 5e3835851d..6ca4fa43c4 100644 } diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java -index 530c699964..2ad8dba5c0 100644 +index 530c69996..2ad8dba5c 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract { @@ -213,7 +213,7 @@ index 530c699964..2ad8dba5c0 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java -index 1ab2668e91..2b708761d0 100644 +index 1ab2668e9..2b708761d 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal { @@ -226,7 +226,7 @@ index 1ab2668e91..2b708761d0 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index f6c6ea4aaf..dff3eb1188 100644 +index f6c6ea4aa..dff3eb118 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -374,7 +374,7 @@ public class PlayerInteractManager { @@ -239,7 +239,7 @@ index f6c6ea4aaf..dff3eb1188 100644 return true; diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java -index d2698e847c..edc4a5c34e 100644 +index d2698e847..edc4a5c34 100644 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java @@ -2,7 +2,7 @@ package net.minecraft.server; @@ -252,7 +252,7 @@ index d2698e847c..edc4a5c34e 100644 public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 8dc47452a4..560e2f42b7 100644 +index 8dc47452a..560e2f42b 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I @@ -265,7 +265,7 @@ index 8dc47452a4..560e2f42b7 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 81fa77946b..cd6cf07f82 100644 +index 26ac7546f..67d94e1d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1775,7 +1775,7 @@ public class CraftWorld implements World { @@ -278,7 +278,7 @@ index 81fa77946b..cd6cf07f82 100644 entity = new EntityLightning(world, x, y, z, false); } else if (Firework.class.isAssignableFrom(clazz)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java -index 1b512cc45c..fbad045675 100644 +index 1b512cc45..fbad04567 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java @@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { diff --git a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch index 895e241b4e..8fffc0d24c 100644 --- a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 98a89361832d2bdcdd02d7eeaa540682474a1f39 Mon Sep 17 00:00:00 2001 +From 007be296248007d9e800ec40cdb8abdae8de49c5 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:34 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -20,10 +20,10 @@ index 5a83fc21c..295b8390c 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e79d037a4..f01d3d382 100644 +index c2636df6b..ffead57b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2099,5 +2099,10 @@ public final class CraftServer implements Server { +@@ -2115,5 +2115,10 @@ public final class CraftServer implements Server { commandMap.registerServerAliases(); return true; } @@ -35,5 +35,5 @@ index e79d037a4..f01d3d382 100644 // Paper end } -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch index 4865ad031a..7fe26dd628 100644 --- a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 8ce843a66ffed6165d5f5b0a90a0c8c6e0bfc5ad Mon Sep 17 00:00:00 2001 +From bab73747580758ee7e5ffd7b81c24d51f7b04864 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index ee7d3d521e..93c1a04bc6 100644 +index 3dc6c2a3f..b1f008738 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,27 @@ @@ -75,7 +75,7 @@ index ee7d3d521e..93c1a04bc6 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java new file mode 100644 -index 0000000000..cd6e259239 +index 000000000..cd6e25923 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -0,0 +1,40 @@ @@ -121,7 +121,7 @@ index 0000000000..cd6e259239 +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 0000000000..685deaa0e5 +index 000000000..685deaa0e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -143,7 +143,7 @@ index 0000000000..685deaa0e5 + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 4b1f8c5373..d34f772fae 100644 +index 4b1f8c537..d34f772fa 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -86,6 +86,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -185,7 +185,7 @@ index 4b1f8c5373..d34f772fae 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e41352681a..7016dac2d7 100644 +index e41352681..7016dac2d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -57,7 +57,7 @@ import org.apache.commons.lang3.Validate; @@ -244,7 +244,7 @@ index e41352681a..7016dac2d7 100644 public KeyPair getKeyPair() { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 1eb53f67ef..308bc3baf2 100644 +index 1eb53f67e..308bc3baf 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -76,8 +76,7 @@ public abstract class PlayerList { @@ -258,18 +258,18 @@ index 1eb53f67ef..308bc3baf2 100644 this.k = new GameProfileBanList(PlayerList.b); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f01d3d3823..05efbd67d9 100644 +index ffead57b5..2b2cacd90 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -41,7 +41,6 @@ import java.util.function.Consumer; - import java.util.logging.Level; +@@ -42,7 +42,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.imageio.ImageIO; + import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import jline.console.ConsoleReader; import net.minecraft.server.Advancement; import net.minecraft.server.ArgumentEntity; import net.minecraft.server.Block; -@@ -1094,9 +1093,13 @@ public final class CraftServer implements Server { +@@ -1096,9 +1095,13 @@ public final class CraftServer implements Server { return logger; } @@ -284,7 +284,7 @@ index f01d3d3823..05efbd67d9 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 40e7c895c2..d1636ce218 100644 +index 40e7c895c..d1636ce21 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -13,7 +13,7 @@ import java.util.logging.Logger; @@ -335,7 +335,7 @@ index 40e7c895c2..d1636ce218 100644 } catch (Throwable t) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 -index fdf2f075e2..0000000000 +index fdf2f075e..000000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -1,72 +0,0 @@ @@ -412,7 +412,7 @@ index fdf2f075e2..0000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index befcc19f9b..5510266fb1 100644 +index befcc19f9..5510266fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -4,20 +4,31 @@ import java.util.Collections; @@ -495,7 +495,7 @@ index befcc19f9b..5510266fb1 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 70f8d42992..449e99d1b6 100644 +index 70f8d4299..449e99d1b 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread { @@ -509,7 +509,7 @@ index 70f8d42992..449e99d1b6 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java deleted file mode 100644 -index 99564fed7c..0000000000 +index 99564fed7..000000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -1,58 +0,0 @@ @@ -573,13 +573,13 @@ index 99564fed7c..0000000000 -} diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties new file mode 100644 -index 0000000000..0694b21465 +index 000000000..0694b2146 --- /dev/null +++ b/src/main/resources/log4j2.component.properties @@ -0,0 +1 @@ +log4j.skipJansi=true diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 722ca84968..620b9490e5 100644 +index 722ca8496..620b9490e 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,17 +1,14 @@ diff --git a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch index 1e72867a13..b2f3fd0887 100644 --- a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch @@ -1,14 +1,14 @@ -From 22f20b3211a21e4111863b3e7a30173e598c81db Mon Sep 17 00:00:00 2001 +From a8d4ba39f05bceef26afcbc595f109265bb44775 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:21 -0400 Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 05efbd67d..530156f70 100644 +index 2b2cacd90..d4d5c66f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -77,6 +77,7 @@ import net.minecraft.server.WorldServer; +@@ -79,6 +79,7 @@ import net.minecraft.server.WorldServer; import net.minecraft.server.WorldSettings; import net.minecraft.server.WorldType; import org.apache.commons.lang.Validate; @@ -16,7 +16,7 @@ index 05efbd67d..530156f70 100644 import org.bukkit.BanList; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -@@ -148,6 +149,7 @@ import org.bukkit.craftbukkit.util.Versioning; +@@ -150,6 +151,7 @@ import org.bukkit.craftbukkit.util.Versioning; import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -24,7 +24,7 @@ index 05efbd67d..530156f70 100644 import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerChatTabCompleteEvent; import org.bukkit.event.server.BroadcastMessageEvent; -@@ -738,7 +740,13 @@ public final class CraftServer implements Server { +@@ -740,7 +742,13 @@ public final class CraftServer implements Server { // Spigot start if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) { @@ -40,5 +40,5 @@ index 05efbd67d..530156f70 100644 // Spigot end -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch index 175705f4fc..b713e2cb25 100644 --- a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 60ac711495320c6a94f4032fb25a0cd98facd648 Mon Sep 17 00:00:00 2001 +From 3706499c4b6d89de159fce38463917abc89729f3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java new file mode 100644 -index 0000000000..b151a13c1b +index 000000000..b151a13c1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -0,0 +1,280 @@ @@ -293,7 +293,7 @@ index 0000000000..b151a13c1b +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java new file mode 100644 -index 0000000000..25836b975b +index 000000000..25836b975 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java @@ -0,0 +1,30 @@ @@ -329,7 +329,7 @@ index 0000000000..25836b975b +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java new file mode 100644 -index 0000000000..3bcdb8f93f +index 000000000..3bcdb8f93 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java @@ -0,0 +1,17 @@ @@ -352,7 +352,7 @@ index 0000000000..3bcdb8f93f +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java new file mode 100644 -index 0000000000..4b2a67423f +index 000000000..4b2a67423 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -0,0 +1,29 @@ @@ -387,7 +387,7 @@ index 0000000000..4b2a67423f +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java new file mode 100644 -index 0000000000..3aceb0ea8a +index 000000000..3aceb0ea8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java @@ -0,0 +1,11 @@ @@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a + } +} diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index ee2174a9ca..2a22bc6f3e 100644 +index ee2174a9c..2a22bc6f3 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -1,7 +1,10 @@ @@ -429,7 +429,7 @@ index ee2174a9ca..2a22bc6f3e 100644 * Calculates distance between 2 entities * @param e1 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7016dac2d7..c15ca642d0 100644 +index 7016dac2d..c15ca642d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1296,7 +1296,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -72,10 +72,10 @@ index 9af8e947e..ad2a36627 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 96112243a..3fa327eb3 100644 +index e306c17f2..e68b40be6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1671,7 +1671,7 @@ public final class CraftServer implements Server { +@@ -1687,7 +1687,7 @@ public final class CraftServer implements Server { offers = tabCompleteChat(player, message); } @@ -129,5 +129,5 @@ index 5510266fb..a51202ed5 100644 Waitable> waitable = new Waitable>() { @Override -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch index 902291e3d0..48f02af3da 100644 --- a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 7ddb76f31f9ac6e7eef564305d6e6297bc1c56bf Mon Sep 17 00:00:00 2001 +From efb1975e4adc557e74ebf67a23ce8edb8651e459 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3fa327eb3..489f12152 100644 +index e68b40be6..eecb5353f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1364,6 +1364,26 @@ public final class CraftServer implements Server { +@@ -1380,6 +1380,26 @@ public final class CraftServer implements Server { return recipients.size(); } @@ -40,5 +40,5 @@ index 3fa327eb3..489f12152 100644 @Deprecated public OfflinePlayer getOfflinePlayer(String name) { -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch index bbdcb51462..b3bb2b49e5 100644 --- a/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From d1a090be753e2a0dab2b26a37116d269d426c16b Mon Sep 17 00:00:00 2001 +From 39f26f9908b8088f518a3cf39cb65c115fb4df84 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Wed, 8 Aug 2018 15:30:52 -0400 Subject: [PATCH] Add Early Warning Feature to WatchDog @@ -48,10 +48,10 @@ index 7c268eb54..9e5fe9794 100644 long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop lastTick = start - TICK_TIME; // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 489f12152..39934233d 100644 +index eecb5353f..986e0ba9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -758,6 +758,7 @@ public final class CraftServer implements Server { +@@ -760,6 +760,7 @@ public final class CraftServer implements Server { @Override public void reload() { @@ -59,7 +59,7 @@ index 489f12152..39934233d 100644 reloadCount++; configuration = YamlConfiguration.loadConfiguration(getConfigFile()); commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile()); -@@ -858,6 +859,7 @@ public final class CraftServer implements Server { +@@ -860,6 +861,7 @@ public final class CraftServer implements Server { enablePlugins(PluginLoadOrder.STARTUP); enablePlugins(PluginLoadOrder.POSTWORLD); getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD)); @@ -183,5 +183,5 @@ index 121c7ff60..07936eeba 100644 { interrupt(); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch index 7f83597938..0e14e9d6b3 100644 --- a/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From 688565b10741ebc591cf9929cb760aff74823ba2 Mon Sep 17 00:00:00 2001 +From f8a350154eb4d6677dd3763a33010c0c63bd0960 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -85,10 +85,10 @@ index 561b6d946..95518e54d 100644 String s = nbttagcompound.getString("generatorName"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 39934233d..b02995144 100644 +index 986e0ba9b..bd84bc5a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -991,7 +991,7 @@ public final class CraftServer implements Server { +@@ -993,7 +993,7 @@ public final class CraftServer implements Server { WorldSettings worldSettings; // See MinecraftServer.a(String, String, long, WorldType, JsonElement) if (worlddata == null) { @@ -98,5 +98,5 @@ index 39934233d..b02995144 100644 if (parsedSettings.isJsonObject()) { worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject()); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch index bfd3a0454f..a5986fb447 100644 --- a/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From 63d45833051ad294ff8782268adede43e40c5b47 Mon Sep 17 00:00:00 2001 +From fdd50660b76f367a8fb9362b79b151ce94b78730 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions @@ -8,10 +8,10 @@ we would reuse an existing dimension id, if some other dimension was unloaded before. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b02995144..781ed63dc 100644 +index bd84bc5a1..625a00c3d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -977,7 +977,7 @@ public final class CraftServer implements Server { +@@ -979,7 +979,7 @@ public final class CraftServer implements Server { boolean used = false; do { for (WorldServer server : console.getWorlds()) { @@ -21,5 +21,5 @@ index b02995144..781ed63dc 100644 dimension++; break; -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch index 43282de191..dcc6acd71b 100644 --- a/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From a1ec98d135336211deb340a8f9c694597f3406f9 Mon Sep 17 00:00:00 2001 +From ed163d80c617edd6e48714cc403a3d8a5c3a2f9d Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -278,10 +278,10 @@ index ae74dc9e1..7eb230f1b 100644 public void a(PacketDataSerializer packetdataserializer) throws IOException { this.a = packetdataserializer.i(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 781ed63dc..c74cc5706 100644 +index 625a00c3d..55fc1390a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -645,7 +645,7 @@ public final class CraftServer implements Server { +@@ -647,7 +647,7 @@ public final class CraftServer implements Server { @Override public long getConnectionThrottle() { // Spigot Start - Automatically set connection throttle for bungee configurations @@ -291,5 +291,5 @@ index 781ed63dc..c74cc5706 100644 } else { return this.configuration.getInt("settings.connection-throttle"); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch index ed180ffe04..7a7ac44237 100644 --- a/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From 3d72f4fe7da0fc0661165efcfb842c35cdd72d99 Mon Sep 17 00:00:00 2001 +From 0bf0bd67f3507c512927515bebeab0feb189e130 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable @@ -29,10 +29,10 @@ index 30f35304a..546a1cfe0 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c74cc5706..f07e7682d 100644 +index 55fc1390a..9853bf342 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2141,6 +2141,11 @@ public final class CraftServer implements Server { +@@ -2157,6 +2157,11 @@ public final class CraftServer implements Server { return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions; } @@ -45,5 +45,5 @@ index c74cc5706..f07e7682d 100644 public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) { return createProfile(uuid, null); -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 51858ed72a..43f6a6fc1a 100644 --- a/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From 56f7533be515ae3f4590e50ba00b70d70ac69fd4 Mon Sep 17 00:00:00 2001 +From 001a896bf5120aff4addca206be4b40bd82961a6 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer @@ -29,10 +29,10 @@ index 2801a3ee6..3ede5ce2a 100644 @Deprecated diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f07e7682d..9a5ca755b 100644 +index 9853bf342..5853763f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1667,7 +1667,7 @@ public final class CraftServer implements Server { +@@ -1683,7 +1683,7 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { @@ -42,5 +42,5 @@ index f07e7682d..9a5ca755b 100644 @Override -- -2.25.0.windows.1 +2.25.0 diff --git a/Spigot-Server-Patches/0388-Anti-Xray.patch b/Spigot-Server-Patches/0388-Anti-Xray.patch index ac65228428..2f346ac570 100644 --- a/Spigot-Server-Patches/0388-Anti-Xray.patch +++ b/Spigot-Server-Patches/0388-Anti-Xray.patch @@ -1,11 +1,11 @@ -From 1774cd5c93235fad7e6f9f9fa318b358f40cb6de Mon Sep 17 00:00:00 2001 +From 7f0e5f37b7a7fea802a0a1cf1a8247fad77440f0 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Mon, 20 Aug 2018 03:03:58 +0200 Subject: [PATCH] Anti-Xray diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4867615215..df24e3297b 100644 +index 486761521..df24e3297 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,7 +1,11 @@ @@ -66,7 +66,7 @@ index 4867615215..df24e3297b 100644 } diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java new file mode 100644 -index 0000000000..f7e376ce6a +index 000000000..f7e376ce6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java @@ -0,0 +1,46 @@ @@ -118,7 +118,7 @@ index 0000000000..f7e376ce6a +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java new file mode 100644 -index 0000000000..23626bef3a +index 000000000..23626bef3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -0,0 +1,782 @@ @@ -906,7 +906,7 @@ index 0000000000..23626bef3a +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java new file mode 100644 -index 0000000000..a68bace353 +index 000000000..a68bace35 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java @@ -0,0 +1,81 @@ @@ -993,7 +993,7 @@ index 0000000000..a68bace353 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java new file mode 100644 -index 0000000000..067dfb2f14 +index 000000000..067dfb2f1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java @@ -0,0 +1,31 @@ @@ -1030,7 +1030,7 @@ index 0000000000..067dfb2f14 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java new file mode 100644 -index 0000000000..cc586827aa +index 000000000..cc586827a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java @@ -0,0 +1,56 @@ @@ -1092,7 +1092,7 @@ index 0000000000..cc586827aa +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java new file mode 100644 -index 0000000000..37093419cf +index 000000000..37093419c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java @@ -0,0 +1,84 @@ @@ -1181,7 +1181,7 @@ index 0000000000..37093419cf + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 76e87c211b..3fdcc2e5d4 100644 +index 4d300699f..06b4dc628 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -320,7 +320,7 @@ public class Chunk implements IChunkAccess { @@ -1194,7 +1194,7 @@ index 76e87c211b..3fdcc2e5d4 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 961228e9df..a950ad801d 100644 +index 961228e9d..a950ad801 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -57,7 +57,7 @@ public class ChunkRegionLoader { @@ -1216,7 +1216,7 @@ index 961228e9df..a950ad801d 100644 protochunk.a(biomestorage); object = protochunk; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 0d5deee365..4526527aca 100644 +index 0d5deee36..4526527ac 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -6,21 +6,31 @@ public class ChunkSection { @@ -1255,7 +1255,7 @@ index 0d5deee365..4526527aca 100644 public IBlockData getType(int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 2c1d1b1a55..44aed67274 100644 +index 2c1d1b1a5..44aed6727 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -1377,7 +1377,7 @@ index 2c1d1b1a55..44aed67274 100644 if (this.h == this.b) { diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e156804f7a..96a785af27 100644 +index e156804f7..96a785af2 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -42,7 +42,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -1440,7 +1440,7 @@ index e156804f7a..96a785af27 100644 public void a() { this.o(); diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 47710067a6..ef7ade797b 100644 +index 47710067a..ef7ade797 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -1,5 +1,6 @@ @@ -1533,7 +1533,7 @@ index 47710067a6..ef7ade797b 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 5108d3ee98..b556a8fefa 100644 +index 5108d3ee9..b556a8fef 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -220,6 +220,11 @@ public class PlayerChunk { @@ -1558,7 +1558,7 @@ index 5108d3ee98..b556a8fefa 100644 this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 8bd212388a..be3dcf375b 100644 +index 14dd813ed..e3c3c1d58 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -603,7 +603,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -1580,7 +1580,7 @@ index 8bd212388a..be3dcf375b 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index e2e5c17c24..ce4340a476 100644 +index e2e5c17c2..ce4340a47 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -264,6 +264,8 @@ public class PlayerInteractManager { @@ -1593,7 +1593,7 @@ index e2e5c17c24..ce4340a476 100644 public void a(BlockPosition blockposition, PacketPlayInBlockDig.EnumPlayerDigType packetplayinblockdig_enumplayerdigtype, String s) { diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 39339fa275..f376e21068 100644 +index 39339fa27..f376e2106 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -45,16 +45,28 @@ public class ProtoChunk implements IChunkAccess { @@ -1636,19 +1636,19 @@ index 39339fa275..f376e21068 100644 return this.j[i]; diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index a905a29e75..335b644351 100644 +index f82db93f8..1d1b267f3 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -21,6 +21,7 @@ public class TicketType { public static final TicketType UNKNOWN = a("unknown", Comparator.comparingLong(ChunkCoordIntPair::pair), 1); public static final TicketType PLUGIN = a("plugin", (a, b) -> 0); // CraftBukkit - public static final TicketType PLUGIN_TICKET = a("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // Craftbukkit + public static final TicketType PLUGIN_TICKET = a("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // CraftBukkit + public static final TicketType ANTIXRAY = a("antixray", Integer::compareTo); // Paper - Anti-Xray public static TicketType a(String s, Comparator comparator) { return new TicketType<>(s, comparator, 0L); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c089080a90..bcf326c859 100644 +index e2cac4a92..9d604a758 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -1685,7 +1685,7 @@ index c089080a90..bcf326c859 100644 if (iblockdata1 == null) { // CraftBukkit start - remove blockstate if failed diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java -index 7772d59005..4570ed9991 100644 +index 7772d5900..4570ed999 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -21,9 +21,11 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData { diff --git a/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch index e44d20ab3b..24d7dd0e9e 100644 --- a/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 8a4c412b9a5811abc5ecb61f12d2eb4bc3da7b1e Mon Sep 17 00:00:00 2001 +From 25c55800a34513edfa6177edd971a456f63ac38d Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -2361,7 +2361,7 @@ index 000000000..715a2dd8d + +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 57463425a..c6ece425d 100644 +index e7c9a969d..2c1937cbe 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -218,11 +218,137 @@ public class ChunkProviderServer extends IChunkProvider { @@ -3055,7 +3055,7 @@ index b556a8fef..b82ea26eb 100644 completablefuture = (CompletableFuture) this.statusFutures.get(i); if (completablefuture != null) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index be3dcf375..9fa6d2b52 100644 +index e3c3c1d58..bce04cad0 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -63,7 +63,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -3832,12 +3832,12 @@ index db9f0196b..a6d8ef5eb 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index 335b64435..481d95480 100644 +index 1d1b267f3..4b87ca2ec 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -22,6 +22,7 @@ public class TicketType { public static final TicketType PLUGIN = a("plugin", (a, b) -> 0); // CraftBukkit - public static final TicketType PLUGIN_TICKET = a("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // Craftbukkit + public static final TicketType PLUGIN_TICKET = a("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // CraftBukkit public static final TicketType ANTIXRAY = a("antixray", Integer::compareTo); // Paper - Anti-Xray + public static final TicketType ASYNC_LOAD = a("async_load", Long::compareTo); // Paper @@ -3933,7 +3933,7 @@ index c999f8c9b..b59ef1a63 100644 HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0f652e58e..5eb52817f 100644 +index 27dcc2528..6506daeec 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -82,6 +82,79 @@ public class WorldServer extends World { @@ -4026,7 +4026,7 @@ index 0f652e58e..5eb52817f 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c3ee5411c..9fe909808 100644 +index cc2aac704..a35770fe5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -555,22 +555,23 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch index cc3f6546ba..c61b2e3ab4 100644 --- a/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch +++ b/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch @@ -1,14 +1,14 @@ -From 25cb1c43251debb7719af90fee4c6c7684978816 Mon Sep 17 00:00:00 2001 +From 3ed6e75f9e52e0f661b52e31450ede7b3c179cae Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Apr 2019 19:47:34 -0500 Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9a5ca755b..ee5c57ca2 100644 +index 5853763f6..b7dfda265 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2164,5 +2164,10 @@ public final class CraftServer implements Server { +@@ -2180,5 +2180,10 @@ public final class CraftServer implements Server { } return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name); } diff --git a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 7eb6e39d50..3be3e20335 100644 --- a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -1,4 +1,4 @@ -From 5b8798df76f834fbb0cf8222bdf52126bce0f1ab Mon Sep 17 00:00:00 2001 +From 781858c6f0c1ad9d537df5969a011ceca070211f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 25 Jan 2020 17:04:35 -0800 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks @@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either, then unwrap it... diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 7edbd0aac..0de82202e 100644 +index e5af40e9f..0de82202e 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -354,6 +354,12 @@ public class ChunkProviderServer extends IChunkProvider { @@ -43,12 +43,12 @@ index 7edbd0aac..0de82202e 100644 - if (playerchunk == null) { - return null; - } else { -- Either either = (Either) playerchunk.b(ChunkStatus.FULL).getNow(null); // Craftbukkit - decompile error +- Either either = (Either) playerchunk.b(ChunkStatus.FULL).getNow(null); // CraftBukkit - decompile error - - if (either == null) { - return null; - } else { -- IChunkAccess ichunkaccess1 = (IChunkAccess) either.left().orElse(null); // Craftbukkit - decompile error +- IChunkAccess ichunkaccess1 = (IChunkAccess) either.left().orElse(null); // CraftBukkit - decompile error - - if (ichunkaccess1 != null) { - this.a(k, ichunkaccess1, ChunkStatus.FULL); diff --git a/work/Bukkit b/work/Bukkit index d0800d0c1d..6a4242cb72 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit d0800d0c1da6659be7e71045f117c89d4e21f9ec +Subproject commit 6a4242cb72fba34b45bb584f75c12da1acd0beb2 diff --git a/work/CraftBukkit b/work/CraftBukkit index e82b5477ae..d70084e53d 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit e82b5477ae218e3f8f74b86c87c9f3f29510e818 +Subproject commit d70084e53d09bb15a6d40ce8ce0ebc90ee74851e diff --git a/work/Spigot b/work/Spigot index b9baf71774..c574e08b71 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit b9baf71774bbb783017c5bb52e646795cf3248cd +Subproject commit c574e08b715634fcaee82dea911226f8194362a8