diff --git a/README.md b/README.md index 84c859996..85a1f35b9 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ How To (Plugin Developers) com.destroystokyo.paper paper-api - 1.15.1-R0.1-SNAPSHOT + 1.15.2-R0.1-SNAPSHOT provided ``` diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 06dfd13f6..a387ba2c3 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 9556d6e73175d5674058d56c48928d2e0cab3006 Mon Sep 17 00:00:00 2001 +From 4ad4bdf9fc777147561c4f62fbd84bba4fef3271 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index fd011758..416da4ae 100644 +index 044afc49..8c443c52 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,28 @@ @@ -22,7 +22,7 @@ index fd011758..416da4ae 100644 - spigot-api + com.destroystokyo.paper + paper-api - 1.15.1-R0.1-SNAPSHOT + 1.15.2-R0.1-SNAPSHOT jar - Spigot-API @@ -111,5 +111,5 @@ index fd011758..416da4ae 100644 true -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index fc4bc297b..83d7fb759 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -1,4 +1,4 @@ -From 900d1808e8b2df014a6f10a66d8293484735f9dc Mon Sep 17 00:00:00 2001 +From c34a0b40b799e91263262c942be9994f6aaed9b7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 1 Apr 2016 00:02:47 -0400 Subject: [PATCH] Add FastUtil to Bukkit @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/pom.xml b/pom.xml -index aef4ec33d..2daee11a2 100644 +index 8c443c52..a540adef 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,12 @@ @@ -23,5 +23,5 @@ index aef4ec33d..2daee11a2 100644 commons-lang commons-lang -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0003-Paper-Utils.patch b/Spigot-API-Patches/0003-Paper-Utils.patch index f253a28f1..e3dd1fa17 100644 --- a/Spigot-API-Patches/0003-Paper-Utils.patch +++ b/Spigot-API-Patches/0003-Paper-Utils.patch @@ -1,4 +1,4 @@ -From 7abc5f9f843420fdc68e86f72c193f1f1ace76d8 Mon Sep 17 00:00:00 2001 +From 987a04e5fe2faa15848c4e8ce6c6c63e12da47cd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 23 Feb 2019 11:26:21 -0500 Subject: [PATCH] Paper Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Paper Utils diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java new file mode 100644 -index 000000000..9db0056ab +index 00000000..9db0056a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java @@ -0,0 +1,16 @@ @@ -27,5 +27,5 @@ index 000000000..9db0056ab + +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index 5f121afe5..ed5ce2d7c 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 8367abf2c43595a130e0397c278da82e7d50f0b2 Mon Sep 17 00:00:00 2001 +From f6e991d49e6476fb94781ddaa0ec805bdd354243 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -4114,5 +4114,5 @@ index b71235f6..3cbe5c2b 100644 + } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch index 32c792f03..147d6072c 100644 --- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 69623dfbf01028f91c52e15f6d096f85dad57354 Mon Sep 17 00:00:00 2001 +From 530c3715e2a2fbf308229c1e23d704e8cb3c9c75 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API @@ -32,5 +32,5 @@ index 4d9ed678..89dcc9d4 100644 * Update the list of commands sent to the client. *
-- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index 19a055617..a635d4ea8 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,11 +1,11 @@ -From bc6a70d6bdab8d4b350e6321f315edc5c3f932b6 Mon Sep 17 00:00:00 2001 +From 510b3804346327935a0f02423c54a46b68649235 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 940c643df..9f87f333e 100644 +index 940c643d..9f87f333 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 { @@ -27,7 +27,7 @@ index 940c643df..9f87f333e 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 c197e3811..e1dfa92a9 100644 +index c197e381..e1dfa92a 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 { @@ -48,5 +48,5 @@ index c197e3811..e1dfa92a9 100644 * Get the advancement specified by this key. * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index 25ceb1373..ba1ede1d7 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From 417c860ef8f5168eafc0268f4a21f74ebdd06f8e Mon Sep 17 00:00:00 2001 +From 7b2e3ac64e82aa6b5d59c0e89989b8a21cf767e2 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API @@ -66,5 +66,5 @@ index 5a878932..3022b4a2 100644 + } } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch index 812fb4dc2..e99d29c26 100644 --- a/Spigot-API-Patches/0008-Version-Command-2.0.patch +++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch @@ -1,4 +1,4 @@ -From c2f8a5c4612e7ece86b19e5a3f731c04949ec86f Mon Sep 17 00:00:00 2001 +From 4c7cf74d7f8635e4e964d51900bcf71e329526e9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 27 May 2019 01:10:06 -0500 Subject: [PATCH] Version Command 2.0 @@ -176,5 +176,5 @@ index cbce5244..0486abd1 100644 try { BufferedReader reader = Resources.asCharSource( -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index 5789a05c0..4cd7ebfb5 100644 --- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 0e9476604dfa54e5502607d51dc95c61b15ceb84 Mon Sep 17 00:00:00 2001 +From 0b59e94d724a2181a301a41753de636276177154 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Mon, 29 Feb 2016 18:02:25 -0600 Subject: [PATCH] Add PlayerLocaleChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerLocaleChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java new file mode 100644 -index 000000000..29dd763a9 +index 00000000..29dd763a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java @@ -0,0 +1,50 @@ @@ -61,5 +61,5 @@ index 000000000..29dd763a9 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 77da1a9da..81be9ee26 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,4 +1,4 @@ -From 6af56a2e1e0c3aa3a8a3fa62d936b6d74a255800 Mon Sep 17 00:00:00 2001 +From 2fb8620a338c9f9a94c6af2335a7e02c85d9a98f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API @@ -30,5 +30,5 @@ index 89dcc9d4..195c70d1 100644 /** -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index 110610702..4fa900ce4 100644 --- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 03e1b338735a7e2ee5581026c54c4b5ffdb4d1f5 Mon Sep 17 00:00:00 2001 +From d4c36e931e1c6a71cd65d79444a85a29e0ab4bae Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:09:40 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java new file mode 100644 -index 000000000..978813b94 +index 00000000..978813b9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java @@ -0,0 +1,86 @@ @@ -97,5 +97,5 @@ index 000000000..978813b94 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch index 63b5879b5..75467ebdd 100644 --- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 5b64272f8b996dfd47d85e64bd0136bb602199de Mon Sep 17 00:00:00 2001 +From a29b417ddcedcd6a1c39aa9401f917ebd6e3c6e0 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Mon, 29 Feb 2016 18:13:58 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java new file mode 100644 -index 000000000..8e407eff1 +index 00000000..8e407eff --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java @@ -0,0 +1,47 @@ @@ -59,5 +59,5 @@ index 000000000..8e407eff1 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch index 7bb191122..c9553109d 100644 --- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch +++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch @@ -1,11 +1,11 @@ -From 3b78215f400807e9ceb571c960f4bdee7da8aea7 Mon Sep 17 00:00:00 2001 +From e1e9d92d79906e193a159ecad87a1f2afd8ff06c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 19:45:21 -0600 Subject: [PATCH] Automatically disable plugins that fail to load diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 82e379d16..12601db68 100644 +index 82e379d1..12601db6 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -345,6 +345,10 @@ public final class JavaPluginLoader implements PluginLoader { @@ -20,5 +20,5 @@ index 82e379d16..12601db68 100644 // Perhaps abort here, rather than continue going, but as it stands, -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index 4e658d388..a2d69b2f6 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 1609f1dd56d9b507e3e9b35dd4cfb2b402af24fc Mon Sep 17 00:00:00 2001 +From d411f2a704717d2fbb816b27fe96f7632abf64a3 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 9f87f333e..63e48ef3f 100644 +index 9f87f333..63e48ef3 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 { @@ -29,7 +29,7 @@ index 9f87f333e..63e48ef3f 100644 public static Server.Spigot spigot() { diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e1dfa92a9..87300a5df 100644 +index e1dfa92a..87300a5d 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 { @@ -49,5 +49,5 @@ index e1dfa92a9..87300a5df 100644 * Get the advancement specified by this key. * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index f9ef32b7e..2585e49e7 100644 --- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From 425e0884f3112dde54266793417f71afdb0de1a8 Mon Sep 17 00:00:00 2001 +From 18a481b942f840e9be0a1f0eadae88c7e336a540 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -68,7 +68,7 @@ index 87300a5d..d35d2def 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0fb36ebd..9a79e409 100644 +index 195c70d1..5580cdbe 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -442,6 +442,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -111,5 +111,5 @@ index 0fb36ebd..9a79e409 100644 * Forces an update of the player's entire inventory. * -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch index 064afd7ef..2b183bb7d 100644 --- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From d2fe81e66aa64df04655b6c92751cca9d544172f Mon Sep 17 00:00:00 2001 +From 6b39c2b09405e827d4d7d2c774b54651b39efa89 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 29 Feb 2016 20:02:40 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -384,7 +384,7 @@ index 00000000..4fe18540 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9a79e409..81677fcd 100644 +index 5580cdbe..2017a51d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,6 +1,7 @@ @@ -513,5 +513,5 @@ index 9a79e409..81677fcd 100644 /** -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch index eac4ce8ae..b1868f3ce 100644 --- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch +++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 21c928ac4a621dd3024e55743da904c9f3423e37 Mon Sep 17 00:00:00 2001 +From a838f3134bc88bddefc502559b123c6ce1e39bab Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:24:35 -0600 Subject: [PATCH] Add exception reporting event @@ -603,5 +603,5 @@ index 53e5045f..9a09b4d2 100644 } } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch index 8d081ebcf..f83dafa63 100644 --- a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch +++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch @@ -1,4 +1,4 @@ -From 6f396335289763e35a0fc5293654713c15ea1df2 Mon Sep 17 00:00:00 2001 +From 709bd509e61a7f25b64fe128b2ae42a5bef797d0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 20:26:39 -0600 Subject: [PATCH] Fix ServerListPingEvent flagging as Async @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async This event can sometimes fire Async, set the proper boolean diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java -index 46b119017..05167fb34 100644 +index 46b11901..05167fb3 100644 --- a/src/main/java/org/bukkit/event/server/ServerEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerEvent.java @@ -1,5 +1,6 @@ @@ -26,5 +26,5 @@ index 46b119017..05167fb34 100644 public ServerEvent(boolean isAsync) { -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index f47432754..f8deb9232 100644 --- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,11 +1,11 @@ -From 991fa18b84baaf4b0ec6242b27f32888e411dab9 Mon Sep 17 00:00:00 2001 +From 8ecc2f468db20ab448dffd9684f101f3c2e3fa83 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java -index 74816c63f..be11d52a0 100644 +index 74816c63..be11d52a 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -62,4 +62,30 @@ public interface CommandSender extends Permissible { @@ -40,5 +40,5 @@ index 74816c63f..be11d52a0 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 4e40b227f..15caf8992 100644 --- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,11 +1,11 @@ -From d4febe68b0b2e65542f21afe0320193e9c28e360 Mon Sep 17 00:00:00 2001 +From 6edea23ef413c2a6d73d490367a10019e2693bfa Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:47:27 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index e6249c2bf..5697728ce 100644 +index a5ea8f44..f5969cad 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -500,4 +500,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -29,5 +29,5 @@ index e6249c2bf..5697728ce 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch index f5e70fddc..dc26067ad 100644 --- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From 6f43acffa83a9b928af1474f6cba3daa45813dc3 Mon Sep 17 00:00:00 2001 +From 984cee00d239d54cbff29eb607aee7ec665bc07e Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API @@ -119,5 +119,5 @@ index b9819565..4c2102a1 100644 * Gets the status of this pack. * -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index 745cb052a..259efe87e 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From 185096afc97f9e07872d20bf890627c4010093cc Mon Sep 17 00:00:00 2001 +From d3d0edba86d8318435145cb01dc7e8a9c7900d1a Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,23 +6,23 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index 2c2823b3..a6567413 100644 +index a540adef..5c25ff12 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ - 7.2 + 7.3.1 test + + + org.ow2.asm + asm -+ 7.1 ++ 7.3.1 + + + org.ow2.asm + asm-commons -+ 7.1 ++ 7.3.1 + @@ -439,5 +439,5 @@ index 12601db6..06b6724f 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch index 27910c1d2..7a3936ed2 100644 --- a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch +++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch @@ -1,4 +1,4 @@ -From 71c0afbf707a3bb5c2b3d01f144acf3bd6d60bc4 Mon Sep 17 00:00:00 2001 +From ac25178018130d824244228559daeb62c031b5c1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 May 2013 20:36:58 -0400 Subject: [PATCH] Add a call helper to Event @@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event Reduces diff in Server patches diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java -index 18d0636b7..8ec56cd6b 100644 +index 18d0636b..8ec56cd6 100644 --- a/src/main/java/org/bukkit/event/Event.java +++ b/src/main/java/org/bukkit/event/Event.java @@ -35,6 +35,22 @@ public abstract class Event { @@ -33,5 +33,5 @@ index 18d0636b7..8ec56cd6b 100644 * Convenience method for providing a user-friendly identifier. By * default, it is the event's class's {@linkplain Class#getSimpleName() -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch index 9a352efed..08259741c 100644 --- a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch +++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch @@ -1,4 +1,4 @@ -From 7aa10c0e4606c992367eaed629d6362f46234744 Mon Sep 17 00:00:00 2001 +From cf697b427b7974f18fcd07174c664d239843ff1f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 22 Jul 2015 18:50:41 -0400 Subject: [PATCH] Add sender name to commands.yml replacement @@ -7,7 +7,7 @@ This allows you to use $sender in commands.yml definitions to make commands that auto target self. diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index a6ad94ef9..9d4f553c0 100644 +index a6ad94ef..9d4f553c 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -1,6 +1,9 @@ @@ -42,5 +42,5 @@ index a6ad94ef9..9d4f553c0 100644 while (index != -1) { int start = index; -- -2.21.0 +2.25.0.windows.1 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 9447838ef..8ea49dd85 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 b573cff5fd3fc21d5fd4528473ad4b574900ce4b Mon Sep 17 00:00:00 2001 +From 5b3f635c4a9f2014dfd33488958413331194b9f8 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 @@ -103,5 +103,5 @@ index 9a09b4d2..c7388d51 100644 + } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch index 5010f6219..c141fd3ce 100644 --- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From f2d75b2305da564f7bf67db3354fbc8d06601225 Mon Sep 17 00:00:00 2001 +From 0f2180289eb27d8af3ad7ec6132eca352efc7ccc Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:05:21 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java -index c2793f3ef..373f4b5b5 100644 +index c2793f3e..373f4b5b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java @@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { @@ -47,5 +47,5 @@ index c2793f3ef..373f4b5b5 100644 public boolean isCancelled() { return this.isCancelled; -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch index c007ab12a..4fdf34b67 100644 --- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch +++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From 161216be890690e9d2eaeee9eae695cd0be921ed Mon Sep 17 00:00:00 2001 +From 1ffda222e9676022f70fdf8c7735987051e5ff7c Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:44:49 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java -index 88ce9dc6b..96916ec95 100644 +index 88ce9dc6..96916ec9 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java @@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory { @@ -33,5 +33,5 @@ index 88ce9dc6b..96916ec95 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch index 7bd933a66..25b79860c 100644 --- a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From d52052dd79d229e71d29da0873547ddae1933053 Mon Sep 17 00:00:00 2001 +From dec02429dc56f84c69c327df0f87b1919f6579a2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:26:34 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events @@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java new file mode 100644 -index 000000000..07660202e +index 00000000..07660202 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java @@ -0,0 +1,32 @@ @@ -44,7 +44,7 @@ index 000000000..07660202e +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java new file mode 100644 -index 000000000..e5dbbd660 +index 00000000..e5dbbd66 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java @@ -0,0 +1,29 @@ @@ -78,5 +78,5 @@ index 000000000..e5dbbd660 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch index 031c819bf..c84d7dcf2 100644 --- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch +++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 13ce91688059f9bc8beabdffaa96a6dafac1d328 Mon Sep 17 00:00:00 2001 +From f785fe7ad6eead77bc5103ec2702f4993373e8a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:15:34 -0400 Subject: [PATCH] EntityPathfindEvent @@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java new file mode 100644 -index 000000000..63e46b2fb +index 00000000..63e46b2f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java @@ -0,0 +1,82 @@ @@ -94,5 +94,5 @@ index 000000000..63e46b2fb + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch index f0b1dcc06..ec224ea9a 100644 --- a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch +++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch @@ -1,4 +1,4 @@ -From 05ccd4a953088abcf6c53aa0c838659284e9c092 Mon Sep 17 00:00:00 2001 +From afee8fb7282413c3d47adc3b5c697f1eb2cf1036 Mon Sep 17 00:00:00 2001 From: crast Date: Sat, 1 Jun 2013 13:52:30 -0600 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase @@ -89,5 +89,5 @@ index baf85022..d363d517 100644 for (Map values : metadataMap.values()) { if (values.containsKey(owningPlugin)) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch index 106c23122..a47f90eae 100644 --- a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From a63c6275864661b88d37ebb5870a53c978d2498d Mon Sep 17 00:00:00 2001 +From 6ddb428ccd0bcf637ffbd9542cc78facdd1b3e39 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) So that on reload, metadata will be cleared diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index b3d85d973..0e8cd85c7 100644 +index d363d517..abbe545a 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -4,6 +4,7 @@ import java.util.ArrayList; @@ -45,5 +45,5 @@ index b3d85d973..0e8cd85c7 100644 * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch index 83045560d..8b9807a2e 100644 --- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From d24c31b6a1b4263c4d50cf971287d737211ab17c Mon Sep 17 00:00:00 2001 +From 90a091641aad273ceec6d85f70bcc72fa451f316 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:08:36 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java new file mode 100644 -index 000000000..09cfdf48e +index 00000000..09cfdf48 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java @@ -0,0 +1,46 @@ @@ -57,5 +57,5 @@ index 000000000..09cfdf48e + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 26f05787f..8dcdbdc6e 100644 --- a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From 36607b558d3ac1a3122354442bf6d54764094279 Mon Sep 17 00:00:00 2001 +From ca75c6d3c7ec62bcb6c2022bd8a2678813c50104 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:20:18 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java new file mode 100644 -index 000000000..f0bb4e31c +index 00000000..f0bb4e31 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java @@ -0,0 +1,222 @@ @@ -234,5 +234,5 @@ index 000000000..f0bb4e31c + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch index 15a085893..d0d4b86c1 100644 --- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch @@ -1,4 +1,4 @@ -From fc20f0c50630c3172e924b34dfa1e912b8728a74 Mon Sep 17 00:00:00 2001 +From 9083c64a839306592c6048a3eaf2d47dbe8dd590 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 4 Mar 2016 03:13:18 -0500 Subject: [PATCH] Arrow pickup rule API @@ -48,5 +48,5 @@ index 88cebc00..b2bf62a5 100644 + // Paper end } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch index 287400f9c..5799800f1 100644 --- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,11 +1,11 @@ -From 7e61db52ad3ceaae7d2b495a51f6e7bbb22f4ccf Mon Sep 17 00:00:00 2001 +From 1e799e05cca516707285471789f33d58cba384b7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java -index 8feb6698f..d51d2ec1d 100644 +index 8feb6698..d51d2ec1 100644 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java @@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable @@ -41,5 +41,5 @@ index 8feb6698f..d51d2ec1d 100644 /** * Gets the amount of regained health -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch index 8508147d9..c4c9e265f 100644 --- a/Spigot-API-Patches/0036-LootTable-API.patch +++ b/Spigot-API-Patches/0036-LootTable-API.patch @@ -1,4 +1,4 @@ -From 57c87e1ca56c7ea43bb0a4eba69000e7ab71a05d Mon Sep 17 00:00:00 2001 +From adbfe47db1430abf4f538b0dd7bc4aaebcdbff9a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 15:19:49 -0400 Subject: [PATCH] LootTable API @@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java new file mode 100644 -index 000000000..92d7b853a +index 00000000..92d7b853 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java @@ -0,0 +1,17 @@ @@ -35,7 +35,7 @@ index 000000000..92d7b853a +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java new file mode 100644 -index 000000000..b387894fe +index 00000000..b387894f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java @@ -0,0 +1,17 @@ @@ -58,7 +58,7 @@ index 000000000..b387894fe +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java new file mode 100644 -index 000000000..97815eeb2 +index 00000000..97815eeb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java @@ -0,0 +1,116 @@ @@ -180,7 +180,7 @@ index 000000000..97815eeb2 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java new file mode 100644 -index 000000000..fd184f13f +index 00000000..fd184f13 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java @@ -0,0 +1,45 @@ @@ -230,7 +230,7 @@ index 000000000..fd184f13f + } +} diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java -index c67d71101..a569c7b63 100644 +index c67d7110..a569c7b6 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,5 +1,7 @@ @@ -251,7 +251,7 @@ index c67d71101..a569c7b63 100644 /** * Gets the inventory of the chest block represented by this block state. diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java -index 74cd194c9..07af1a3f0 100644 +index 74cd194c..07af1a3f 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,5 +1,6 @@ @@ -271,7 +271,7 @@ index 74cd194c9..07af1a3f0 100644 /** * Gets the BlockProjectileSource object for the dispenser. diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java -index 424392fb5..c76202321 100644 +index 424392fb..c7620232 100644 --- a/src/main/java/org/bukkit/block/Dropper.java +++ b/src/main/java/org/bukkit/block/Dropper.java @@ -1,11 +1,12 @@ @@ -289,7 +289,7 @@ index 424392fb5..c76202321 100644 /** * Tries to drop a randomly selected item from the dropper's inventory, diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java -index 58e493099..7ade312f1 100644 +index 58e49309..7ade312f 100644 --- a/src/main/java/org/bukkit/block/Hopper.java +++ b/src/main/java/org/bukkit/block/Hopper.java @@ -1,8 +1,9 @@ @@ -304,7 +304,7 @@ index 58e493099..7ade312f1 100644 -public interface Hopper extends Container, Lootable { } +public interface Hopper extends Container, LootableBlockInventory { } // Paper diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java -index 938f9aead..42f5b4ea3 100644 +index 938f9aea..42f5b4ea 100644 --- a/src/main/java/org/bukkit/block/ShulkerBox.java +++ b/src/main/java/org/bukkit/block/ShulkerBox.java @@ -1,5 +1,6 @@ @@ -324,7 +324,7 @@ index 938f9aead..42f5b4ea3 100644 /** * Get the {@link DyeColor} corresponding to this ShulkerBox diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java -index 937b99f87..db69687a7 100644 +index 937b99f8..db69687a 100644 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java @@ -1,5 +1,6 @@ @@ -344,7 +344,7 @@ index 937b99f87..db69687a7 100644 /** * Checks whether or not this Minecart will pick up diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java -index 9ea403e6f..238d118f7 100644 +index 9ea403e6..238d118f 100644 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java @@ -1,5 +1,6 @@ @@ -362,7 +362,7 @@ index 9ea403e6f..238d118f7 100644 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper } diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java -index 24a3d989d..901db8524 100644 +index 24a3d989..901db852 100644 --- a/src/main/java/org/bukkit/loot/Lootable.java +++ b/src/main/java/org/bukkit/loot/Lootable.java @@ -36,6 +36,34 @@ public interface Lootable { @@ -401,5 +401,5 @@ index 24a3d989d..901db8524 100644 * Set the seed used when this Loot Table generates loot. * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch index 325d95b47..4ba052ac6 100644 --- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From f85769e8ba9c1aa2b67b14ed2c91ad26f639801f Mon Sep 17 00:00:00 2001 +From 8c1752d4801781454495bf4d0eb5554cc270538f Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java new file mode 100644 -index 000000000..3b725a489 +index 00000000..3b725a48 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java @@ -0,0 +1,65 @@ @@ -76,7 +76,7 @@ index 000000000..3b725a489 + } +} diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java -index 0e0ed93b5..d3949edfc 100644 +index 0e0ed93b..d3949edf 100644 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; @@ -122,5 +122,5 @@ index 0e0ed93b5..d3949edfc 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch index c4b255b6c..7ac10f647 100644 --- a/Spigot-API-Patches/0038-Misc-Utils.patch +++ b/Spigot-API-Patches/0038-Misc-Utils.patch @@ -1,4 +1,4 @@ -From 95c4831ed2b33d90983a86cbc86499d295e11ff7 Mon Sep 17 00:00:00 2001 +From 952aa5667bd48ddb71a0b357b7ae97622d964320 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:53:43 -0500 Subject: [PATCH] Misc Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java new file mode 100644 -index 000000000..5bb677ce5 +index 00000000..5bb677ce --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java @@ -0,0 +1,34 @@ @@ -45,5 +45,5 @@ index 000000000..5bb677ce5 + } +} -- -2.21.0 +2.25.0.windows.1 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 d2d54329d..f3b9246b1 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 6d86d66bd93daede804713ec231c758574fcb62b Mon Sep 17 00:00:00 2001 +From e947d31d9b14ec3f5e6ec961737a801429728238 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,7 +6,7 @@ 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 a3682b291..a0a8b5408 100644 +index a3682b29..a0a8b540 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 { @@ -26,7 +26,7 @@ index a3682b291..a0a8b5408 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 18faba0e2..d20e044dd 100644 +index 18faba0e..d20e044d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1340,4 +1340,6 @@ public interface Server extends PluginMessageRecipient { @@ -37,7 +37,7 @@ index 18faba0e2..d20e044dd 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 bd2c7a696..864c263bb 100644 +index bd2c7a69..864c263b 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 bd2c7a696..864c263bb 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index adfc7aae2..460fda05a 100644 +index adfc7aae..460fda05 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 adfc7aae2..460fda05a 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 c62da4131..af8ab73fe 100644 +index c62da413..af8ab73f 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 { @@ -99,5 +99,5 @@ index c62da4131..af8ab73fe 100644 confirmed = true; } else { -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch index 8442967fb..8f6d6c09e 100644 --- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From e3a455149e609554da57c83f1985c438e5aeec54 Mon Sep 17 00:00:00 2001 +From 64007b93caf3708274585172c66edb0e11d04b24 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:47:08 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java -index c99c9281e..7c340f539 100644 +index c99c9281..7c340f53 100644 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java @@ -1,21 +1,43 @@ @@ -53,5 +53,5 @@ index c99c9281e..7c340f539 100644 * Get the amount of experience the player will receive * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch index 526263e4d..95732c846 100644 --- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From f5b16f625b82df46d0a83f2bb795f77e2bcc91d6 Mon Sep 17 00:00:00 2001 +From a7ee9a6f5fc22809be5c20ec306953af7b49c522 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java new file mode 100644 -index 000000000..453663893 +index 00000000..45366389 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java @@ -0,0 +1,67 @@ @@ -78,5 +78,5 @@ index 000000000..453663893 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch index eed31b92c..12cb7f4c2 100644 --- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From fe8cbc53a90843f7467aacb0e1de2206794758ce Mon Sep 17 00:00:00 2001 +From 5494d9b77576cb7705c385f9ce247ff1772fda1a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API @@ -72,5 +72,5 @@ index 307e5568..85a5637f 100644 throw new UnsupportedOperationException("Not supported yet."); } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch index 0630a5d94..b3bef697e 100644 --- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 49e1a0eb87be8cf0e59a9f8238fa1f8bdcebf5e0 Mon Sep 17 00:00:00 2001 +From 7810dbaa9a938b5ea942e829753f33c17e252c35 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index d04e52fbe..387d04e5b 100644 +index d04e52fb..387d04e5 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -271,4 +271,22 @@ public interface ArmorStand extends LivingEntity { @@ -32,5 +32,5 @@ index d04e52fbe..387d04e5b 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch index 531fb27c2..fa3300c61 100644 --- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From a8f5ece74e38bb84395fa50e72af2d7ecb6fb1c9 Mon Sep 17 00:00:00 2001 +From e9e0b9f25fba2df081017bb48db56bfa40e364f6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 01:19:14 -0500 Subject: [PATCH] IllegalPacketEvent @@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not. diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java new file mode 100644 -index 000000000..37a17f0bb +index 00000000..37a17f0b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java @@ -0,0 +1,70 @@ @@ -84,5 +84,5 @@ index 000000000..37a17f0bb + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch index 4b3d0f608..f0edd3f0c 100644 --- a/Spigot-API-Patches/0045-Fireworks-API-s.patch +++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch @@ -1,4 +1,4 @@ -From 8150d2e2f980098303ea44b05391d21b75f78a96 Mon Sep 17 00:00:00 2001 +From 0b298d491792d27eb44e0f47efa1bf643b5297fb Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:55 -0500 Subject: [PATCH] Fireworks API's @@ -37,5 +37,5 @@ index f844d5aa..e8c04c13 100644 + // Paper end } -- -2.23.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch index 75ce99154..b823095ce 100644 --- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From d195a143ae7c58d0a4baa03bb5c499c5ca5005ee Mon Sep 17 00:00:00 2001 +From 3bcf7bff9c9f71c3122f392b2c723f7a046c43bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 20:29:33 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java new file mode 100644 -index 000000000..b64ab6eec +index 00000000..b64ab6ee --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java @@ -0,0 +1,29 @@ @@ -41,5 +41,5 @@ index 000000000..b64ab6eec + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch index 97c857453..4a44e401b 100644 --- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 41416263ef8de31d9129e830cfffaf406bc56060 Mon Sep 17 00:00:00 2001 +From 94279e0d80150a70cdd70a23eb90b736f4980703 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:23:03 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 4af195b4..58414e01 100644 +index 4cbf6101..edd73f41 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -39,6 +39,33 @@ import org.jetbrains.annotations.Nullable; @@ -45,5 +45,5 @@ index 4af195b4..58414e01 100644 * Gets the {@link Block} at the given coordinates * -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 251522176..043e6e560 100644 --- a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 10036e2271d95fe3aad4c1f99ce26ce01983a28e Mon Sep 17 00:00:00 2001 +From 55be87884e78cf987c5f047e44e15d509fcc1fc5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:28:32 -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/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java -index c286edfd8..dec70bbfa 100644 +index c286edfd..dec70bbf 100644 --- a/src/main/java/org/bukkit/entity/ExperienceOrb.java +++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java @@ -1,5 +1,8 @@ @@ -121,5 +121,5 @@ index c286edfd8..dec70bbfa 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch index 591b7dcad..2ce8ce24d 100644 --- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch @@ -1,11 +1,11 @@ -From 60572f2bac5d9d2b536872d4a31b06b5e954115d Mon Sep 17 00:00:00 2001 +From 0514c1bc80be7336de8681a0bd9e594894c51a1e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 Jan 2017 17:03:10 -0600 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java -index 7e8f5649c..afb7b136b 100644 +index 7e8f5649..afb7b136 100644 --- a/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java @@ -117,4 +117,18 @@ public interface WorldBorder { @@ -28,5 +28,5 @@ index 7e8f5649c..afb7b136b 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 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 ee7db546d..7919fe745 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 97c0bae11704c0340b9a20d26d06cd1bc286c7be Mon Sep 17 00:00:00 2001 +From 151c09ccc86062ae1d57ba7de2f37e27389888d3 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,7 +6,7 @@ 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 a0a8b5408..b5b77b2d8 100644 +index a0a8b540..b5b77b2d 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 { @@ -27,7 +27,7 @@ index a0a8b5408..b5b77b2d8 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d20e044dd..103897fbe 100644 +index d20e044d..103897fb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1342,4 +1342,14 @@ public interface Server extends PluginMessageRecipient { @@ -46,7 +46,7 @@ index d20e044dd..103897fbe 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java -index 7f153000e..1e126487d 100644 +index 7f153000..1e126487 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 @@ -58,5 +58,5 @@ index 7f153000e..1e126487d 100644 } return completions; -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch index 394ee607b..d97d95dde 100644 --- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch @@ -1,4 +1,4 @@ -From bf3a1674d443421c9ad56d00cb9d410e0882c544 Mon Sep 17 00:00:00 2001 +From 5d94f183e60047f21dfef16d2c9fe8a2b8155a46 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Jun 2017 16:59:40 -0500 Subject: [PATCH] Fix upstream javadoc warnings and errors @@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index df4caf29..ca60c514 100644 +index edd73f41..220420ed 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1862,6 +1862,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1859,6 +1859,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -17,7 +17,7 @@ index df4caf29..ca60c514 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data); -@@ -1878,6 +1879,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1875,6 +1876,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -25,7 +25,7 @@ index df4caf29..ca60c514 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data); -@@ -1928,6 +1930,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1925,6 +1927,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -33,7 +33,7 @@ index df4caf29..ca60c514 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data); -@@ -1948,6 +1951,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1945,6 +1948,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -41,7 +41,7 @@ index df4caf29..ca60c514 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data); -@@ -2004,6 +2008,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2001,6 +2005,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -49,7 +49,7 @@ index df4caf29..ca60c514 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); -@@ -2026,6 +2031,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2023,6 +2028,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -57,7 +57,7 @@ index df4caf29..ca60c514 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); -@@ -2049,6 +2055,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2046,6 +2052,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param force whether to send the particle to players within an extended * range and encourage their client to render it regardless of * settings @@ -65,7 +65,7 @@ index df4caf29..ca60c514 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force); -@@ -2074,6 +2081,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2071,6 +2078,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param force whether to send the particle to players within an extended * range and encourage their client to render it regardless of * settings @@ -192,5 +192,5 @@ index 1b2267f4..1a58734d 100644 return to; } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch index b20880d87..36e30d116 100644 --- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch +++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From 9a6e1cc4daf83cbd118f9d47e5ab20ce4015018c Mon Sep 17 00:00:00 2001 +From d71df227a9f6de7d4a3fd1f0345b8f561c3c3bb1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:08 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index 00c58c1d9..cb9e9f369 100644 +index 00c58c1d..cb9e9f36 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -37,4 +37,20 @@ public interface Item extends Entity { @@ -30,5 +30,5 @@ index 00c58c1d9..cb9e9f369 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch index 027010454..c05f637f3 100644 --- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 86d616000511cc1aeed2f8a4870f13de4abad628 Mon Sep 17 00:00:00 2001 +From ac6c730b5828a6f3afdfd5b74cfff7dc5ffb87af Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:01 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java -index 951ea2cc7..18d82c111 100644 +index 951ea2cc..18d82c11 100644 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull; @@ -53,5 +53,5 @@ index 951ea2cc7..18d82c111 100644 @NotNull -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch index edadf3093..878369576 100644 --- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch @@ -1,4 +1,4 @@ -From b76fc97a0232e55bf7fbe24cbb97a14ae59b4abf Mon Sep 17 00:00:00 2001 +From b8556b9570db71c4791eb5ec64ecd258d48e9737 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:37 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java new file mode 100644 -index 000000000..fb5cb3dc4 +index 00000000..fb5cb3dc --- /dev/null +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java @@ -0,0 +1,89 @@ @@ -100,5 +100,5 @@ index 000000000..fb5cb3dc4 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch index 14cd1e27a..38cd92a02 100644 --- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch +++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From 4dc8f1c4e6badf0aa20464f3143a585c669d7c23 Mon Sep 17 00:00:00 2001 +From 7d8324440f38691b133a6173eec32ffff6764533 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:06 -0400 Subject: [PATCH] Add UnknownCommandEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java new file mode 100644 -index 000000000..251342c3c +index 00000000..251342c3 --- /dev/null +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java @@ -0,0 +1,82 @@ @@ -93,5 +93,5 @@ index 000000000..251342c3c +} + -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index 73fdf209f..a65d51792 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 745b108aba89064f140eddb28bf6a793bbb45e75 Mon Sep 17 00:00:00 2001 +From 10fb919b099319913ad3b39f2ae5b3533fb0273a 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 000000000..476151d2a +index 00000000..476151d2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java @@ -0,0 +1,145 @@ @@ -158,7 +158,7 @@ index 000000000..476151d2a +} 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 000000000..7b3b6ef53 +index 00000000..7b3b6ef5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java @@ -0,0 +1,72 @@ @@ -235,7 +235,7 @@ index 000000000..7b3b6ef53 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b5b77b2d8..161a714e5 100644 +index b5b77b2d..161a714e 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 { @@ -280,7 +280,7 @@ index b5b77b2d8..161a714e5 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 103897fbe..463724e40 100644 +index 103897fb..463724e4 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1351,5 +1351,33 @@ public interface Server extends PluginMessageRecipient { @@ -318,5 +318,5 @@ index 103897fbe..463724e40 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch index 8ea5ac259..a723bc1ee 100644 --- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch +++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch @@ -1,11 +1,11 @@ -From 7cde5685e8d20a16d2cd7dc7f86c964a2a3b70ea Mon Sep 17 00:00:00 2001 +From 9d1fc09e269f884e5740bfc253532f11c0e26d79 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:04:51 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 6277f3928..5b5fb3034 100644 +index 6277f392..5b5fb303 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -36,5 +36,5 @@ index 6277f3928..5b5fb3034 100644 * Discover a recipe for this player such that it has not already been * discovered. This method will add the key's associated recipe to the -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch index cb1e3c238..96df4af40 100644 --- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 6937460f262795c9820420cf93e6c0ef4fbcffd5 Mon Sep 17 00:00:00 2001 +From 0ae5d7576d18a61f327e7ebb939a3cb9aa79f7d4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 16:30:44 -0400 Subject: [PATCH] Profile Lookup Events @@ -8,7 +8,7 @@ profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java new file mode 100644 -index 000000000..8df37c07c +index 00000000..8df37c07 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java @@ -0,0 +1,46 @@ @@ -60,7 +60,7 @@ index 000000000..8df37c07c +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java new file mode 100644 -index 000000000..4dcf6242c +index 00000000..4dcf6242 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java @@ -0,0 +1,108 @@ @@ -173,5 +173,5 @@ index 000000000..4dcf6242c + +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index 36068f5c4..1c931b815 100644 --- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,4 +1,4 @@ -From fd4f5b79ced349d3b9bf58d77a569234b46f15f3 Mon Sep 17 00:00:00 2001 +From 3508113428e6d92f80a705827efc4290fb961602 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() @@ -22,5 +22,5 @@ index 8cfcc3a5..bd8507f6 100644 // Paper end } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch index cbc4b0455..95307269c 100644 --- a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 2eda3cf357cb4091bea1a72f982602e9104ce211 Mon Sep 17 00:00:00 2001 +From 72e4471858378ddc591e391d2aae62c1937fb07d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:12:48 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -8,7 +8,7 @@ and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java new file mode 100644 -index 000000000..163ffe8ff +index 00000000..163ffe8f --- /dev/null +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java @@ -0,0 +1,21 @@ @@ -34,7 +34,7 @@ index 000000000..163ffe8ff + void setArmor(@Nullable ItemStack stack); +} diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java -index 608e99c42..53498debe 100644 +index 608e99c4..53498deb 100644 --- a/src/main/java/org/bukkit/inventory/HorseInventory.java +++ b/src/main/java/org/bukkit/inventory/HorseInventory.java @@ -5,20 +5,4 @@ import org.jetbrains.annotations.Nullable; @@ -60,7 +60,7 @@ index 608e99c42..53498debe 100644 -} +public interface HorseInventory extends AbstractHorseInventory, ArmoredHorseInventory {} diff --git a/src/main/java/org/bukkit/inventory/LlamaInventory.java b/src/main/java/org/bukkit/inventory/LlamaInventory.java -index 2fa2c9d07..5ac1afb8a 100644 +index 2fa2c9d0..5ac1afb8 100644 --- a/src/main/java/org/bukkit/inventory/LlamaInventory.java +++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; @@ -74,7 +74,7 @@ index 2fa2c9d07..5ac1afb8a 100644 * Gets the item in the llama's decor slot. diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java new file mode 100644 -index 000000000..7944f26a3 +index 00000000..7944f26a --- /dev/null +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java @@ -0,0 +1,3 @@ @@ -82,5 +82,5 @@ index 000000000..7944f26a3 + +public interface SaddledHorseInventory extends AbstractHorseInventory {} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch index b80bf8e7d..c9bd291c6 100644 --- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch +++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From abf4b44e9de9046faa4172331986876faaef5d7a Mon Sep 17 00:00:00 2001 +From db21e17ea6d14094bfc90f8883252c0725e386c3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 4ff149fd9..bb3f7cdc1 100644 +index 4ff149fd..bb3f7cdc 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -141,4 +141,17 @@ public interface ItemFactory { @@ -29,10 +29,10 @@ index 4ff149fd9..bb3f7cdc1 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index bab86d804..44f3bec7d 100644 +index 9d9df827..8d9ebcb3 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java -@@ -518,7 +518,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { +@@ -534,7 +534,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { } } @@ -41,7 +41,7 @@ index bab86d804..44f3bec7d 100644 } /** -@@ -577,4 +577,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { +@@ -593,4 +593,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { return true; } @@ -62,5 +62,5 @@ index bab86d804..44f3bec7d 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch index 254407bbb..f2d91dbcf 100644 --- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch +++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch @@ -1,4 +1,4 @@ -From a053762804bf81a788e6de7c9d134d396774902c Mon Sep 17 00:00:00 2001 +From 5be3ee85ce36300d867bfa63eea2334d876527d8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] Add getI18NDisplayName API @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index bb3f7cdc1..3cada3487 100644 +index bb3f7cdc..3cada348 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -153,5 +153,16 @@ public interface ItemFactory { @@ -29,10 +29,10 @@ index bb3f7cdc1..3cada3487 100644 // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 44f3bec7d..9526cfe02 100644 +index 8d9ebcb3..65aa1c4e 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java -@@ -591,5 +591,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { +@@ -607,5 +607,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { public ItemStack ensureServerConversions() { return Bukkit.getServer().getItemFactory().ensureServerConversions(this); } @@ -51,5 +51,5 @@ index 44f3bec7d..9526cfe02 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch index 27902f4d8..24a44925a 100644 --- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From 9bdc8d9de62d527ee067394e8b7d5bdd2afd3306 Mon Sep 17 00:00:00 2001 +From 99c1ecbc8bb08b1102844c2e06aff75e8e189876 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:34 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent @@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java new file mode 100644 -index 000000000..b10176289 +index 00000000..b1017628 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java @@ -0,0 +1,117 @@ @@ -131,5 +131,5 @@ index 000000000..b10176289 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch index edfc39c48..84af896d8 100644 --- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch @@ -1,11 +1,11 @@ -From 1ba89d09eb2ddf73c278f597a2c93833fd558887 Mon Sep 17 00:00:00 2001 +From e955f61d6121d9145086bb3aefcd07f8d19a6505 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 02:08:55 -0500 Subject: [PATCH] Make /plugins list alphabetical diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index 11fbd0e0c..d4e74d292 100644 +index 11fbd0e0..d4e74d29 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -3,6 +3,9 @@ package org.bukkit.command.defaults; @@ -51,5 +51,5 @@ index 11fbd0e0c..d4e74d292 100644 } } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch index f84e7650f..cb2eb2ce3 100644 --- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From 3217c90d3d100110a12a3c599087d1412fcd2807 Mon Sep 17 00:00:00 2001 +From 4b1878762d153ef4b7560fa69cc81fca1af5f7ff Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:43 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5697728ce..ffbf3d7a8 100644 +index f5969cad..7e8fc5b3 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -25,5 +25,5 @@ index 5697728ce..ffbf3d7a8 100644 * Adds the given {@link PotionEffect} to the living entity. *

-- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch index b00044248..90e9466a6 100644 --- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch +++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch @@ -1,4 +1,4 @@ -From 61284d609548d572f43cd0342875b93feaefd295 Mon Sep 17 00:00:00 2001 +From d5fd96d447dd6f8d8fa433d18082329fea603982 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:13 +0200 Subject: [PATCH] Handle plugin prefixes in implementation logging @@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying logger names when appropriate. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index 223190054..bb2e55e97 100644 +index 22319005..bb2e55e9 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -40,5 +40,5 @@ index 223190054..bb2e55e97 100644 /** -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index 721606790..369e4abc0 100644 --- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 0a294869c703f3fc7f22f2752e20cedd85985c12 Mon Sep 17 00:00:00 2001 +From 349a9bf5d5d38cd62f2ed1df7e6524cb9900c6e2 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index a6567413..1179fd55 100644 +index 5c25ff12..a71015f4 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ @@ -50,5 +50,5 @@ index febfec6e..79890c68 100644 * Returns the name of the plugin. *

-- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch index ec337fc0d..e2d50a448 100644 --- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch +++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch @@ -1,4 +1,4 @@ -From 91259973846180ea7f731ae367e1f0f7f57a1782 Mon Sep 17 00:00:00 2001 +From d5c1e782cc2702e6378bd565345ed520567c6ce2 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 19:41:20 +0200 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin @@ -116,5 +116,5 @@ index 7133be0a..9924780d 100644 } } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch index 3b91dd8f0..4257ac636 100644 --- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch +++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From 3b3d6200514d4c75675a971831a3f303353cb1cd Mon Sep 17 00:00:00 2001 +From 391c8c2ec698ac64a495038842cbb2228c92e4bc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:32 -0400 Subject: [PATCH] Add PlayerJumpEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java new file mode 100644 -index 000000000..289a0d784 +index 00000000..289a0d78 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java @@ -0,0 +1,106 @@ @@ -117,5 +117,5 @@ index 000000000..289a0d784 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch index 81d5504dc..20f873371 100644 --- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 0895c179d69d82b098e9314d5c9e30b4c547091c Mon Sep 17 00:00:00 2001 +From acb615089a33d457c84bce216ba87649efe7e50d Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:44:42 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -57,7 +57,7 @@ index 00000000..7b2af1bd + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 881ccce5..0a630843 100644 +index da36c8df..dbe53123 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; @@ -70,5 +70,5 @@ index 881ccce5..0a630843 100644 /** * Gets the "friendly" name to display of this player. This may include -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch index 31beef733..5c74eda25 100644 --- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 3c961429504386861077423406b05410527fb380 Mon Sep 17 00:00:00 2001 +From 119d214a5cf12953f1d00e283e2c5768be6d9d03 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:45:59 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java new file mode 100644 -index 000000000..2827a1002 +index 00000000..2827a100 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java @@ -0,0 +1,137 @@ @@ -148,5 +148,5 @@ index 000000000..2827a1002 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch index be4cf4545..c14620bb6 100644 --- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 29c742337866538cb309776a8db6962465ee6661 Mon Sep 17 00:00:00 2001 +From aab556b666c1f5b415f1bd6fd6f3598964819f4e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:10:01 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index ab6750c7a..af4ffada0 100644 +index ab6750c7..af4ffada 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -268,6 +268,16 @@ public interface Block extends Metadatable { @@ -30,5 +30,5 @@ index ab6750c7a..af4ffada0 100644 * Returns the biome that this block resides in * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch index 3d3b603a2..77b044008 100644 --- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch +++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From fb6546240316a84266aada07ea0a0048e0b2a4ea Mon Sep 17 00:00:00 2001 +From 0cf763fb20fce10342ebec0cbcfa200d8b8a7a5b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:17:09 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -13,7 +13,7 @@ completion, such as offline players. diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java new file mode 100644 -index 000000000..619ed3716 +index 00000000..619ed371 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java @@ -0,0 +1,177 @@ @@ -195,7 +195,7 @@ index 000000000..619ed3716 + } +} diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java -index d1a9956a1..f96c4ba53 100644 +index d1a9956a..f96c4ba5 100644 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java @@ -1,5 +1,6 @@ @@ -265,5 +265,5 @@ index d1a9956a1..f96c4ba53 100644 @Override -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch index fee100f27..468431ec5 100644 --- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch +++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch @@ -1,4 +1,4 @@ -From 6bfa8efdb8a6b1c98417d31611ab555466775816 Mon Sep 17 00:00:00 2001 +From e2ace04b7cc11c54b3a492d9a95a492b6aad8881 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 9 Dec 2017 12:40:25 -0500 Subject: [PATCH] Display warning on deprecated recipe API @@ -10,7 +10,7 @@ on the players login. Plugin authors need to define a key to keep it consistent between server restarts. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d74b3114f..d742c4058 100644 +index d74b3114..d742c405 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -22,7 +22,7 @@ index d74b3114f..d742c4058 100644 } diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 68447fb8c..84062dd71 100644 +index 68447fb8..84062dd7 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -34,5 +34,5 @@ index 68447fb8c..84062dd71 100644 } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch index 2eeb2949b..e91eb8bdf 100644 --- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch +++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From beaa74caee947fe0235be01e39e0a655c89b8502 Mon Sep 17 00:00:00 2001 +From 76a536dbdb61eb6fde0d55df507f92deb21e6a31 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:00:41 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -7,7 +7,7 @@ Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java new file mode 100644 -index 000000000..f7beb22d5 +index 00000000..f7beb22d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java @@ -0,0 +1,80 @@ @@ -92,5 +92,5 @@ index 000000000..f7beb22d5 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch index a113a5247..cb9f21034 100644 --- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch +++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 49f9c641363fbbfd13423c3dbbf4fccdebdbe179 Mon Sep 17 00:00:00 2001 +From 72c291be9d0bb7daaf28bba76ff4968f10eb05df Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:56:24 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java new file mode 100644 -index 000000000..0ce3e3977 +index 00000000..0ce3e397 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java @@ -0,0 +1,87 @@ @@ -101,5 +101,5 @@ index 000000000..0ce3e3977 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch index 91181f8e3..3cabe5615 100644 --- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From d668b4a2573d6df68b52462d67d209ab210d6506 Mon Sep 17 00:00:00 2001 +From af375fcae65a50a414f7c3b33c75d90d43edf6a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:38:07 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0a630843..2bd1af78 100644 +index dbe53123..420aa906 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -934,12 +934,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -49,5 +49,5 @@ index 0a630843..2bd1af78 100644 /** * Gives the player the amount of experience levels specified. Levels can -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch index 59d6bbd58..687201765 100644 --- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch +++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From f964e9674f741b077eb95edddad85d9faf01e638 Mon Sep 17 00:00:00 2001 +From a532d8b8494cbfe850034f92ca644fc5f566c4fc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 16:59:43 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java new file mode 100644 -index 000000000..d5edde9cd +index 00000000..d5edde9c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java @@ -0,0 +1,104 @@ @@ -125,5 +125,5 @@ index 000000000..d5edde9cd + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch index ac47e1336..37ede87eb 100644 --- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From fb78151fa68d3a9ab9cb2cf3659a02595560a03b Mon Sep 17 00:00:00 2001 +From 8bb61dab0ecdcf6e35175d10d9d2f8a003505894 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:31:37 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -10,7 +10,7 @@ Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java new file mode 100644 -index 000000000..112a0dbf5 +index 00000000..112a0dbf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java @@ -0,0 +1,64 @@ @@ -79,5 +79,5 @@ index 000000000..112a0dbf5 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch index 7a04cf93b..255cf9405 100644 --- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From cc8a78acc426282ecc2d2e90e0e031f1aa8ea82f Mon Sep 17 00:00:00 2001 +From cbdb821df0d1d148d04aeda9d0f83199e90c6f72 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:29:28 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java -index 943d751fb..a6914f01e 100644 +index 943d751f..a6914f01 100644 --- a/src/main/java/org/bukkit/block/Skull.java +++ b/src/main/java/org/bukkit/block/Skull.java @@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData; @@ -40,7 +40,7 @@ index 943d751fb..a6914f01e 100644 * Gets the rotation of the skull in the world (or facing direction if this * is a wall mounted skull). diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java -index 35a392033..8b2465ea2 100644 +index 35a39203..8b2465ea 100644 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java @@ -1,9 +1,11 @@ @@ -77,5 +77,5 @@ index 35a392033..8b2465ea2 100644 * Gets the owner of the skull. * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch index fe47f7aeb..512cdb161 100644 --- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch +++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From ffffc2c2bd2a8c6302355b9eaa249cfe5021159b Mon Sep 17 00:00:00 2001 +From 49361ac9699332af1561efa4ef6e66a17aede152 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:08 -0500 Subject: [PATCH] Fill Profile Property Events @@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java new file mode 100644 -index 000000000..71f36e9ca +index 00000000..71f36e9c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java @@ -0,0 +1,75 @@ @@ -93,7 +93,7 @@ index 000000000..71f36e9ca +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java new file mode 100644 -index 000000000..021bc8631 +index 00000000..021bc863 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java @@ -0,0 +1,77 @@ @@ -175,5 +175,5 @@ index 000000000..021bc8631 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch index 945bb78a2..0a82f0bec 100644 --- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From 87ae4675cc8f9248300f7c41d06121b0dca856ee Mon Sep 17 00:00:00 2001 +From be3e65856f9a9b498ac9a1e8b9427d57e533af6d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:14 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java new file mode 100644 -index 000000000..bb8d7c959 +index 00000000..bb8d7c95 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java @@ -0,0 +1,63 @@ @@ -74,5 +74,5 @@ index 000000000..bb8d7c959 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch index b7b6b3b16..2c6889d0c 100644 --- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 430c19d7aa0eb0e2dbde634676b665d253669d61 Mon Sep 17 00:00:00 2001 +From 71ae7aea9324a132adf65042528ec5b02fe13c55 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:06:24 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -12,7 +12,7 @@ starting point for future additions in this area. diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java new file mode 100644 -index 000000000..7e4acfff1 +index 00000000..7e4acfff --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java @@ -0,0 +1,78 @@ @@ -95,5 +95,5 @@ index 000000000..7e4acfff1 + void setMarker(boolean marker); +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch index bf84a463f..80a85adff 100644 --- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch +++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From f504537606dd234d43075d20e9efac0e76bdb2d9 Mon Sep 17 00:00:00 2001 +From 7a9bf3167d5a6e2cc1a2fbd66f739f373ac54e9c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Jan 2018 01:00:27 -0500 Subject: [PATCH] Optimize Hoppers @@ -7,7 +7,7 @@ Adds data about what Item related methods were used in InventoryMoveItem event so that the server can improve the performance of this event. diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java -index a8c48f5a4..04d4a83bf 100644 +index a8c48f5a..04d4a83b 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java @@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable { @@ -38,5 +38,5 @@ index a8c48f5a4..04d4a83bf 100644 } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch index 18e6815d2..0417c893e 100644 --- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From a94f5fca9e22f84e1ed553bb53228938c3a7e079 Mon Sep 17 00:00:00 2001 +From 3f28b2263c941869901fd442a8cdf09cc619e7b6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 00:55:52 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java -index 0c066bdfc..be436f8df 100644 +index 0c066bdf..be436f8d 100644 --- a/src/main/java/org/bukkit/entity/Tameable.java +++ b/src/main/java/org/bukkit/entity/Tameable.java @@ -1,5 +1,6 @@ @@ -41,5 +41,5 @@ index 0c066bdfc..be436f8df 100644 */ @Nullable -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 344862a71..95f70bdb8 100644 --- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From e37945a5eefd4246c9fc42b42daf2e9ce81d7f13 Mon Sep 17 00:00:00 2001 +From 1f100fb84d5576405ccbd83e5b9a9c08210ab689 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:43:30 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index c8384da69..6c09ea6c6 100644 +index c8384da6..6c09ea6c 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -2,6 +2,9 @@ package org.bukkit.event.player; @@ -53,5 +53,5 @@ index c8384da69..6c09ea6c6 100644 this.message = ""; this.name = name; -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch index d0e550c9e..419aa1b0c 100644 --- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 05c90b3a666999ecf6ca0fdb824c8e4ef3f09528 Mon Sep 17 00:00:00 2001 +From 3a712b40988d06d9a8f42119c9eb6fc0968ae18d Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:55:38 +0200 Subject: [PATCH] Add extended PaperServerListPingEvent @@ -8,7 +8,7 @@ and allows full control of the response sent to the client. diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java new file mode 100644 -index 000000000..0cc5dd573 +index 00000000..0cc5dd57 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java @@ -0,0 +1,323 @@ @@ -337,7 +337,7 @@ index 000000000..0cc5dd573 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java new file mode 100644 -index 000000000..517d15238 +index 00000000..517d1523 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -0,0 +1,13 @@ @@ -355,7 +355,7 @@ index 000000000..517d15238 + +} diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java -index 612958a33..bb4f7702c 100644 +index 612958a3..bb4f7702 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -18,4 +18,9 @@ public interface CachedServerIcon { @@ -369,5 +369,5 @@ index 612958a33..bb4f7702c 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index dd4795e84..9e8f7e30c 100644 --- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 5e862d3cce62af29bd527af00a7b5f936f76b334 Mon Sep 17 00:00:00 2001 +From 5262b321dc03d1f58178d7b684ecad630cd041a4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:28:55 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -39,5 +39,5 @@ index 420aa906..083110cc 100644 // Spigot start -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index c25d49488..d254c3c5a 100644 --- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From aeee26dcf880c0670381073a9ff2baf808ed7739 Mon Sep 17 00:00:00 2001 +From 3e7b82aceada63cd39219c5a3fdda878a4be6399 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:39:28 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ 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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 161a714e5..0c519c412 100644 +index 161a714e..0c519c41 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -423,6 +423,20 @@ public final class Bukkit { @@ -34,7 +34,7 @@ index 161a714e5..0c519c412 100644 * Gets the plugin manager for interfacing with plugins. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 463724e40..8a76df524 100644 +index 463724e4..8a76df52 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient { @@ -57,5 +57,5 @@ index 463724e40..8a76df524 100644 * Gets the plugin manager for interfacing with plugins. * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch index 2d842f6a0..2b8fb636b 100644 --- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 546e453739bd983de0706baf4ec72ac2665ba7d9 Mon Sep 17 00:00:00 2001 +From 6b0a919a4594ce2cfe55bedf3a7faecd0a266887 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:20 +0200 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent @@ -8,7 +8,7 @@ client that does not support all of the features provided in the event. diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java -index 517d15238..ffda9f6a8 100644 +index 517d1523..ffda9f6a 100644 --- a/src/main/java/com/destroystokyo/paper/network/StatusClient.java +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -10,4 +10,16 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent; @@ -29,5 +29,5 @@ index 517d15238..ffda9f6a8 100644 + } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch index e33913def..b1d41731d 100644 --- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch @@ -1,11 +1,11 @@ -From f695f6cd5a9ee8ca6406f67aed271f8d4288f496 Mon Sep 17 00:00:00 2001 +From 7b106928641e7ae0f15db3f9bbad7e9cff20dea2 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:28:43 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 5b5fb3034..cdbac95bb 100644 +index 5b5fb303..cdbac95b 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -458,4 +458,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -23,5 +23,5 @@ index 5b5fb3034..cdbac95bb 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch index 913be4a32..e3c003ac7 100644 --- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch @@ -1,4 +1,4 @@ -From 9cced81315e6ffdc7f528dae1e86441c53025428 Mon Sep 17 00:00:00 2001 +From 10af44a728883c15bac804518f6f98cf91194944 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Apr 2018 10:28:50 -0400 Subject: [PATCH] Add Ban Methods to Player Objects @@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f9a3a3e5..75bbbefd 100644 +index 083110cc..2c6ff39e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3,6 +3,10 @@ package org.bukkit.entity; @@ -252,5 +252,5 @@ index f9a3a3e5..75bbbefd 100644 /** * Sends an Action Bar message to the client. -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch index 913507e4a..11243d668 100644 --- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch +++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 26947b3096d22303635f386434624e373a26bef6 Mon Sep 17 00:00:00 2001 +From 933718c31587aca9f00374ee29bb61c0b844953f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:14:30 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java new file mode 100644 -index 000000000..806112a8b +index 00000000..806112a8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java @@ -0,0 +1,87 @@ @@ -101,5 +101,5 @@ index 000000000..806112a8b + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch index 505ef983c..cd3a9b87a 100644 --- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch +++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 0a6883ae1317e0b1348aa136248e692ef3f8f928 Mon Sep 17 00:00:00 2001 +From 22b8e1bb9689bb3b947d2129d699757c7bac34dd Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:15 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java -index bb325d9c8..821c690f8 100644 +index bb325d9c..821c690f 100644 --- a/src/main/java/org/bukkit/entity/Enderman.java +++ b/src/main/java/org/bukkit/entity/Enderman.java @@ -10,6 +10,17 @@ import org.jetbrains.annotations.Nullable; @@ -28,5 +28,5 @@ index bb325d9c8..821c690f8 100644 * Gets the id and data of the block that the Enderman is carrying. * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch index 8d4cbe959..6a8253662 100644 --- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch +++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch @@ -1,4 +1,4 @@ -From 8086435d3bbd0275e9ac6bf4e5d5492e8646e3f7 Mon Sep 17 00:00:00 2001 +From a63e50797c651f9140ab1e0e9fa7a928649d5eab Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:55:28 -0400 Subject: [PATCH] Additional world.getNearbyEntities API's @@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's Provides more methods to get nearby entities, and filter by types and predicates diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 3cd4bff1..36ec897f 100644 +index 220420ed..bd050368 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,9 @@ @@ -19,7 +19,7 @@ index 3cd4bff1..36ec897f 100644 import java.util.Collection; import java.util.HashMap; import java.util.List; -@@ -586,6 +589,256 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -583,6 +586,256 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Collection getEntitiesByClasses(@NotNull Class... classes); @@ -291,5 +291,5 @@ index 6c09ea6c..76c4a1a6 100644 */ public void setPlayerProfile(@NotNull PlayerProfile profile) { -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch index a19491a78..6d507a8c9 100644 --- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch +++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch @@ -1,11 +1,11 @@ -From 1c6f930626a0a32fb86db642a2f45cf7dd89e8f1 Mon Sep 17 00:00:00 2001 +From 2e924d63585468de921954ade22acf335dd0d643 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 19:27:31 -0400 Subject: [PATCH] Location.isChunkLoaded() API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 44e3bca61..6021e6729 100644 +index 0939a807..6c8b8edd 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -17,5 +17,5 @@ index 44e3bca61..6021e6729 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch index 72bb0e1c7..77a2938dc 100644 --- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From dd65b6e6184accfc01cecb26bc44733955544382 Mon Sep 17 00:00:00 2001 +From 17e492080ad5240dbe98e9983b1ae2b96979ad0d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Aug 2017 23:58:48 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java new file mode 100644 -index 000000000..06f1602f5 +index 00000000..06f1602f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java @@ -0,0 +1,478 @@ @@ -493,7 +493,7 @@ index 000000000..06f1602f5 + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 49467ac70..d2ceb07c7 100644 +index 49467ac7..d2ceb07c 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java @@ -96,6 +96,17 @@ public enum Particle { @@ -515,10 +515,10 @@ index 49467ac70..d2ceb07c7 100644 * Options which can be applied to redstone dust particles - a particle * color and size. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index b653c695a..548d6d683 100644 +index bd050368..0b357583 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -2286,7 +2286,57 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2283,7 +2283,57 @@ public interface World extends PluginMessageRecipient, Metadatable { * the type of this depends on {@link Particle#getDataType()} * @param Type */ @@ -578,5 +578,5 @@ index b653c695a..548d6d683 100644 /** * Spawns the particle (the number of times specified by count) -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch index 08c469bb5..467ad282d 100644 --- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch +++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From 6106d1cea7857eaef76610a6bebbab623495d8f1 Mon Sep 17 00:00:00 2001 +From c8c18603ed87388a020dd699aa5c7ab3df054816 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:17:44 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java new file mode 100644 -index 000000000..f530a3d93 +index 00000000..f530a3d9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java @@ -0,0 +1,101 @@ @@ -115,5 +115,5 @@ index 000000000..f530a3d93 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch index 26705cfb7..7796f7ab8 100644 --- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch +++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch @@ -1,4 +1,4 @@ -From 14c718e37affff0ccd3d443a988c9d38c332e1ec Mon Sep 17 00:00:00 2001 +From bc1c2155484fd5942bac31d5c13cd77777245af1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 21:33:35 -0400 Subject: [PATCH] Close Plugin Class Loaders on Disable @@ -140,5 +140,5 @@ index 06b6724f..bc7bf6a3 100644 } } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch index 048530241..5e2ec94b7 100644 --- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch +++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 46a8a78dfe2160660575ac655af04acb8409bf3b Mon Sep 17 00:00:00 2001 +From 7278c19fd5b1ecef74da0734e3905fd5cf3b9e82 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:26:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java new file mode 100644 -index 000000000..fbbace36d +index 00000000..fbbace36 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java @@ -0,0 +1,70 @@ @@ -83,7 +83,7 @@ index 000000000..fbbace36d +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java new file mode 100644 -index 000000000..6ef6367b6 +index 00000000..6ef6367b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -0,0 +1,33 @@ @@ -121,5 +121,5 @@ index 000000000..6ef6367b6 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch index 022dc37a1..dac7d0878 100644 --- a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch +++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 7409e2ec00606be6419f962d16fde6f4b49dfc38 Mon Sep 17 00:00:00 2001 +From 08c8276bbf014d7ef1806907d04db5e70501d396 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:39:09 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java -index 6ef6367b6..688a596aa 100644 +index 6ef6367b..688a596a 100644 --- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -1,29 +1,77 @@ @@ -92,5 +92,5 @@ index 6ef6367b6..688a596aa 100644 @Override -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch index 29e7a7e94..bac603cf1 100644 --- a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch +++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch @@ -1,4 +1,4 @@ -From 1f43185dc8047a82ea2c66403d677b4ca4f8cfc5 Mon Sep 17 00:00:00 2001 +From 1917001bc1c9e3128db829877f21dca2ecddc96f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 May 2018 21:01:13 -0400 Subject: [PATCH] Location.toBlockLocation/toCenterLocation() @@ -6,7 +6,7 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation() Convert location objects to their block coordinates, or the center of the block diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6021e6729..4f695faf4 100644 +index 6c8b8edd..f61bf28a 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -42,5 +42,5 @@ index 6021e6729..4f695faf4 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch index 1d5a25583..052b9fa48 100644 --- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch @@ -1,11 +1,11 @@ -From f88577a3bdbc2c5cee16eaae2605994c72cb4f04 Mon Sep 17 00:00:00 2001 +From 762830b92f0af77bac816faba90a025f178570b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Jun 2018 04:10:13 -0400 Subject: [PATCH] PotionEffect clone methods diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java -index bbefcd580..0193e0754 100644 +index 60716c62..74767751 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java @@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable { @@ -43,5 +43,5 @@ index bbefcd580..0193e0754 100644 private static PotionEffectType getEffectType(@NotNull Map map) { int type = getInt(map, TYPE); -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch index cf0a45271..6fa560608 100644 --- a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch +++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From 5a52559fbf60bbd1d6e0a043654565a9c71b5fd3 Mon Sep 17 00:00:00 2001 +From cdd08698855f82afa01e14e6c9c0b070c369cac9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:08 -0400 Subject: [PATCH] WitchReadyPotionEvent @@ -7,7 +7,7 @@ Control what potion the witch readies to use diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java new file mode 100644 -index 000000000..5351b523d +index 00000000..5351b523 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java @@ -0,0 +1,80 @@ @@ -92,5 +92,5 @@ index 000000000..5351b523d + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch index e381a95b7..098792c10 100644 --- a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 21b8eb1d0a8a24b3b4611a98d2ec0f320ca3cbc7 Mon Sep 17 00:00:00 2001 +From 0a804e62de45bd9c8d9c3b8a716863a961555d6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:59:50 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 9526cfe02..f129121e5 100644 +index 65aa1c4e..bb5a4712 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java -@@ -603,5 +603,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { +@@ -619,5 +619,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { public String getI18NDisplayName() { return Bukkit.getServer().getItemFactory().getI18NDisplayName(this); } @@ -24,5 +24,5 @@ index 9526cfe02..f129121e5 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch index 3a4f9878a..0eb3c99ce 100644 --- a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From f8bbb5a72a13662f0fea842d909b5a374ed6eef4 Mon Sep 17 00:00:00 2001 +From e97a9fd1b5cd99d2f4787be40f72084f5c3517fe Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 13:08:21 +0100 Subject: [PATCH] Add EntityTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java new file mode 100644 -index 000000000..bfc69a43c +index 00000000..bfc69a43 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java @@ -0,0 +1,31 @@ @@ -42,5 +42,5 @@ index 000000000..bfc69a43c + +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch index e08c11830..0080ea38a 100644 --- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch @@ -1,11 +1,11 @@ -From c5e393bd5a58aeaf2cb0010f5eda86725b843094 Mon Sep 17 00:00:00 2001 +From ec42ead9c4a6ccdeacfa79e586ab6193fa601137 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:17:39 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ffbf3d7a8..e08dfe17f 100644 +index 7e8fc5b3..3e6da797 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -29,5 +29,5 @@ index ffbf3d7a8..e08dfe17f 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 1d1ab2af1..2fd1c261c 100644 --- a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From ea3b8414bda5855c740871c2eeea1c7a1549ab25 Mon Sep 17 00:00:00 2001 +From 50b638683bcb7ea9e707774b978e2fe39273eb50 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:52:04 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java -index 18c5e31ab..37dbc12eb 100644 +index 18c5e31a..37dbc12e 100644 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; @@ -49,5 +49,5 @@ index 18c5e31ab..37dbc12eb 100644 this.projectile = projectile; this.force = force; -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch index a55e8260a..080109236 100644 --- a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch +++ b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch @@ -1,11 +1,11 @@ -From 0217a680b3741df86cb30cf627edda5b961d5a56 Mon Sep 17 00:00:00 2001 +From d7f9ba53cda922d155687508de9cbe5649d52b62 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 18 Jun 2018 00:41:46 -0500 Subject: [PATCH] Add "getNearbyXXX" methods to Location diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 4f695faf4..5730d5f46 100644 +index f61bf28a..4cf22afc 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -12,6 +12,15 @@ import org.bukkit.util.Vector; @@ -274,5 +274,5 @@ index 4f695faf4..5730d5f46 100644 @Override public boolean equals(Object obj) { -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch index d02df0280..e6679e435 100644 --- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch +++ b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From b605aaf2b947c35c486dc13ed5a1b6a3ebd834aa Mon Sep 17 00:00:00 2001 +From 03c5cb95272596295784f23658d9c1f5c2094996 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:09:27 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java new file mode 100644 -index 000000000..5d04a22fd +index 00000000..5d04a22f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java @@ -0,0 +1,93 @@ @@ -106,5 +106,5 @@ index 000000000..5d04a22fd + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch index 7598f24fe..d805d7009 100644 --- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch +++ b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 618f5b6f9d4b58eccd1561a5f0da774e0ec15964 Mon Sep 17 00:00:00 2001 +From e225ed9b2fb911a78ef36cb625f75ae376920551 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:40:39 +0200 Subject: [PATCH] Add EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java new file mode 100644 -index 000000000..9efecabab +index 00000000..9efecaba --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java @@ -0,0 +1,82 @@ @@ -93,5 +93,5 @@ index 000000000..9efecabab + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch index e71130066..02e78a2e9 100644 --- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 3e08720f1ab03046c754262078e033268f5cef8c Mon Sep 17 00:00:00 2001 +From f8cc53df49e56becb4f871f8205b35b5a2abdd2e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:24:42 -0500 Subject: [PATCH] Expand Explosions API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 5730d5f46..b226d7e4c 100644 +index 4cf22afc..ac3c8eef 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -7,6 +7,7 @@ import java.util.HashMap; @@ -106,10 +106,10 @@ index 5730d5f46..b226d7e4c 100644 * Returns a list of entities within a bounding box centered around a Location. * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index fee0f5211..af5aba4e5 100644 +index 0b357583..b257eda2 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1305,6 +1305,88 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1302,6 +1302,88 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public boolean createExplosion(@NotNull Location loc, float power, boolean setFire); @@ -199,5 +199,5 @@ index fee0f5211..af5aba4e5 100644 * Creates explosion at given coordinates with given power and optionally * setting blocks on fire or breaking blocks. -- -2.23.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch index 5fb261604..cfebf4424 100644 --- a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch +++ b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch @@ -1,11 +1,11 @@ -From fbc63c569cdde9267601ce94726a127cc8fb4d40 Mon Sep 17 00:00:00 2001 +From e5ede7fbb14ecb653eb8874602a8c1d228de6534 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 22 Jun 2018 22:59:18 -0400 Subject: [PATCH] ItemStack API additions for quantity/flags/lore diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index f129121e5..690abbba2 100644 +index bb5a4712..dfe52817 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -2,7 +2,9 @@ package org.bukkit.inventory; @@ -18,7 +18,7 @@ index f129121e5..690abbba2 100644 import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Material; -@@ -611,5 +613,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { +@@ -627,5 +629,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { // Requires access to NMS return ensureServerConversions().getMaxItemUseDuration(); } @@ -160,5 +160,5 @@ index f129121e5..690abbba2 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch index 158e3ac63..c35753f1a 100644 --- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 6e9e40c6d0ee0a8a456de60396da1e6e365e3a8b Mon Sep 17 00:00:00 2001 +From 72f2d9e3b8b64242408591a1b4f30517ca37fc18 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:19:19 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index e08dfe17f..6e3284b20 100644 +index 3e6da797..d170149d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable; @@ -51,5 +51,5 @@ index e08dfe17f..6e3284b20 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0115-RangedEntity-API.patch index 4b10cb0f0..69f96c6d2 100644 --- a/Spigot-API-Patches/0115-RangedEntity-API.patch +++ b/Spigot-API-Patches/0115-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 218499ba97819e3b81c49a13e583dd3185f993c0 Mon Sep 17 00:00:00 2001 +From 2ed512e774f52c88a7f6364aea0912db3ca74585 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 21:34:40 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java new file mode 100644 -index 000000000..f2e3233a3 +index 00000000..f2e3233a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java @@ -0,0 +1,31 @@ @@ -44,7 +44,7 @@ index 000000000..f2e3233a3 + } +} diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java -index 7c92c431b..14e6c5ee0 100644 +index 7c92c431..14e6c5ee 100644 --- a/src/main/java/org/bukkit/entity/Illusioner.java +++ b/src/main/java/org/bukkit/entity/Illusioner.java @@ -1,6 +1,10 @@ @@ -60,7 +60,7 @@ index 7c92c431b..14e6c5ee0 100644 + +} diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java -index c43854298..d23226ccb 100644 +index c4385429..d23226cc 100644 --- a/src/main/java/org/bukkit/entity/Llama.java +++ b/src/main/java/org/bukkit/entity/Llama.java @@ -1,12 +1,13 @@ @@ -79,7 +79,7 @@ index c43854298..d23226ccb 100644 /** * Represents the base color that the llama has. diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java -index 16b129388..1c367f78e 100644 +index 16b12938..1c367f78 100644 --- a/src/main/java/org/bukkit/entity/Skeleton.java +++ b/src/main/java/org/bukkit/entity/Skeleton.java @@ -2,11 +2,12 @@ package org.bukkit.entity; @@ -97,7 +97,7 @@ index 16b129388..1c367f78e 100644 /** * Gets the current type of this skeleton. diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java -index 818efe2a4..10f8f6d45 100644 +index 818efe2a..10f8f6d4 100644 --- a/src/main/java/org/bukkit/entity/Snowman.java +++ b/src/main/java/org/bukkit/entity/Snowman.java @@ -1,9 +1,11 @@ @@ -114,7 +114,7 @@ index 818efe2a4..10f8f6d45 100644 /** * Gets whether this snowman is in "derp mode", meaning it is not wearing a diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index b4343903b..aa88aede6 100644 +index b4343903..aa88aede 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -1,7 +1,9 @@ @@ -129,7 +129,7 @@ index b4343903b..aa88aede6 100644 +public interface Witch extends Raider, RangedEntity { // Paper } diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java -index 3bc332ee7..426d36933 100644 +index 3bc332ee..426d3693 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java @@ -1,7 +1,9 @@ @@ -143,19 +143,6 @@ index 3bc332ee7..426d36933 100644 -public interface Wither extends Monster, Boss { +public interface Wither extends Monster, Boss, RangedEntity { // Paper } -diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 690abbba2..6d18de762 100644 ---- a/src/main/java/org/bukkit/inventory/ItemStack.java -+++ b/src/main/java/org/bukkit/inventory/ItemStack.java -@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; - import org.jetbrains.annotations.Nullable; - - /** -- * Represents a stack of items -+ * Represents a stack of item - */ - public class ItemStack implements Cloneable, ConfigurationSerializable { - private Material type = Material.AIR; -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch index 992e530ba..339ce00b4 100644 --- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch @@ -1,14 +1,14 @@ -From 0bb3c623b122920cdc6ebddc18810ed271f63d76 Mon Sep 17 00:00:00 2001 +From d7084ea0a2a44fed946a7b95cb34a48803b39312 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:07:16 +0200 Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 8c767a0b..fec5cdc3 100644 +index b257eda2..260ee11a 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -865,6 +865,17 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -862,6 +862,17 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Collection getNearbyEntities(@NotNull Location location, double x, double y, double z); @@ -27,5 +27,5 @@ index 8c767a0b..fec5cdc3 100644 * Returns a list of entities within a bounding box centered around a * Location. -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch index f03b73d31..46f250cea 100644 --- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From d60393114fb97bde04cb6af64cabac268418f296 Mon Sep 17 00:00:00 2001 +From 750045b5deeb830c3c24c0d4b61ac581bb972065 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:52:52 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index cdbac95bb..f25c73155 100644 +index cdbac95b..f25c7315 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -27,7 +27,7 @@ index cdbac95bb..f25c73155 100644 * Returns the ItemStack currently in your hand, can be empty. * diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java -index 5861247c1..21ad8888c 100644 +index 5861247c..21ad8888 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java @@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull; @@ -92,5 +92,5 @@ index 5861247c1..21ad8888c 100644 /** -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch index 763ed7718..2a52d50a1 100644 --- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From 11f610016476f57c9873273afa8cf7c3b3dd090c Mon Sep 17 00:00:00 2001 +From 62b86fe6a124b31a9f3b3fdb75f33f77d65d2123 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API @@ -32,5 +32,5 @@ index bd8507f6..79b94800 100644 // Paper end } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch index e725e28ec..8acbf2d46 100644 --- a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch +++ b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch @@ -1,4 +1,4 @@ -From d259c6119a7d3f5dc6297fa6f71d64cd2c574e5d Mon Sep 17 00:00:00 2001 +From 813ce8218fdf13b0b06e2524ce7fb885b1d2de28 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Jul 2018 22:07:02 +0200 Subject: [PATCH] Add an asterisk to legacy API plugins @@ -63,5 +63,5 @@ index bc7bf6a3..31a70b29 100644 JavaPlugin jPlugin = (JavaPlugin) plugin; -- -2.24.1.windows.2 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0120-EnderDragon-Events.patch index b07ea4ec8..4772b140a 100644 --- a/Spigot-API-Patches/0120-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0120-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From 9291736c5f854306c0e28f54a9ccacb7b6c44f4c Mon Sep 17 00:00:00 2001 +From 068ee4ed588427a76c7ecdc4818e631ee2923da9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events @@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java new file mode 100644 -index 000000000..118c7b677 +index 00000000..118c7b67 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java @@ -0,0 +1,79 @@ @@ -91,7 +91,7 @@ index 000000000..118c7b677 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java new file mode 100644 -index 000000000..1915177f4 +index 00000000..1915177f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java @@ -0,0 +1,61 @@ @@ -158,7 +158,7 @@ index 000000000..1915177f4 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java new file mode 100644 -index 000000000..8414bd805 +index 00000000..8414bd80 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java @@ -0,0 +1,61 @@ @@ -224,5 +224,5 @@ index 000000000..8414bd805 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch index 7bc3d9e79..3c126ec36 100644 --- a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From 14fef5c201ad5836364dd92e4ced6ece41fd8307 Mon Sep 17 00:00:00 2001 +From 98089eac14abfb2f9bf938b4c284e22bc6fb31b8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java new file mode 100644 -index 000000000..9074b2ede +index 00000000..9074b2ed --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java @@ -0,0 +1,83 @@ @@ -94,5 +94,5 @@ index 000000000..9074b2ede + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch index f5b175cf1..eac4c1f8a 100644 --- a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From 0d1d53de3e2f334b31b55e6d9e42e517aa58d46e Mon Sep 17 00:00:00 2001 +From d0517b8b04774ee52135c914207d2ca44de462b6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java new file mode 100644 -index 000000000..e9a76a25f +index 00000000..e9a76a25 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java @@ -0,0 +1,85 @@ @@ -96,5 +96,5 @@ index 000000000..e9a76a25f + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0123-EntityTransformedEvent.patch index 8afe888b0..898e673d9 100644 --- a/Spigot-API-Patches/0123-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0123-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From d96ebed54e0dba4494e787925a687fccc4711042 Mon Sep 17 00:00:00 2001 +From 06ab69198621ccdff6afe2265068a02fe61838f6 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java new file mode 100644 -index 000000000..12194f1fc +index 00000000..12194f1f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java @@ -0,0 +1,92 @@ @@ -103,5 +103,5 @@ index 000000000..12194f1fc + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch index 3f00be53f..88acf4d68 100644 --- a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 7801479767131ebf69f057ca215bf2af6570f6b0 Mon Sep 17 00:00:00 2001 +From d96028ef5dcba7e24f0b1d62efcbc758dc48268c Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:03 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 387d04e5b..492df420b 100644 +index 387d04e5..492df420 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -288,5 +288,21 @@ public interface ArmorStand extends LivingEntity { @@ -31,5 +31,5 @@ index 387d04e5b..492df420b 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch index 4df8d15af..e91ed6eae 100644 --- a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From 4da8b9ad5af0fce5f7c475e2e5432d2b4553839a Mon Sep 17 00:00:00 2001 +From e8ff87df3e458def0d73bd05a74d322be612ba89 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions @@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java new file mode 100644 -index 000000000..d79dbcd68 +index 00000000..d79dbcd6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -0,0 +1,47 @@ @@ -58,7 +58,7 @@ index 000000000..d79dbcd68 +} + diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java -index b2c6b6a86..ba9983463 100644 +index b2c6b6a8..ba998346 100644 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java @@ -3,4 +3,12 @@ package org.bukkit.entity; @@ -76,5 +76,5 @@ index b2c6b6a86..ba9983463 100644 + // Paper end +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch index b43ac027b..5f61d2869 100644 --- a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch +++ b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch @@ -1,4 +1,4 @@ -From 979c3b5b3d9f1225b81882524a6c19f6f57dcf76 Mon Sep 17 00:00:00 2001 +From 184f233f8797a142cb47aba41a20d815de6a7264 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z); diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index b226d7e4c..884862ab7 100644 +index ac3c8eef..f87ecd0a 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -65,5 +65,5 @@ index b226d7e4c..884862ab7 100644 * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z) */ -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch index b94b80a9c..fe6a16808 100644 --- a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From b178b138b10df28838e9e5d73dcb424ae4fbc38f Mon Sep 17 00:00:00 2001 +From 9e96b61f51f46e55188303f9321ac3d6272e5ecd Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 492df420b..e7f71e65e 100644 +index 492df420..e7f71e65 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -1,5 +1,6 @@ @@ -118,5 +118,5 @@ index 492df420b..e7f71e65e 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0128-AnvilDamageEvent.patch index fa7f6e186..fcc5b3f3b 100644 --- a/Spigot-API-Patches/0128-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0128-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From 088e922b17a679192e4544462812259a94e19640 Mon Sep 17 00:00:00 2001 +From a75e25aa2f87e441bce055f45716c5367b0e33f3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent @@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java new file mode 100644 -index 000000000..a83c286c1 +index 00000000..a83c286c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java @@ -0,0 +1,148 @@ @@ -159,5 +159,5 @@ index 000000000..a83c286c1 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch index 08958d255..5402649c6 100644 --- a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch @@ -1,4 +1,4 @@ -From e724746a98cf149f377d9a442782dc448abb8405 Mon Sep 17 00:00:00 2001 +From 1977dda6546322ca3782b8ae3a4951690d74c696 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 00:32:05 -0400 Subject: [PATCH] Remove deadlock risk in firing async events @@ -16,7 +16,7 @@ which results in a hard crash. This change removes the synchronize and adds some protection around enable/disable diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index adca48f1..2d3cee14 100644 +index 79b94800..04365232 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; @@ -138,5 +138,5 @@ index 17dbe913..bae26ce7 100644 @Test public void testRemovePermissionByNameLower() { -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch index 75b75f536..6394bedfe 100644 --- a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch +++ b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch @@ -1,4 +1,4 @@ -From f4903a698923d47c5e8fc9b761fefd19d7646c1a Mon Sep 17 00:00:00 2001 +From 220d3a708bf84b7d69b8f6aaf1750de40fc40af1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:20 -0500 Subject: [PATCH] Add hand to bucket events @@ -129,5 +129,5 @@ index 77c3a6e5..56f1cc2d 100644 @Override public HandlerList getHandlers() { -- -2.23.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch index b077a441f..5de7ce746 100644 --- a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 90f823790371eef1c765d366a69f725c7dc628e0 Mon Sep 17 00:00:00 2001 +From 709bb119e62b1a44c62bd9ea69f9035365cb2fc7 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java new file mode 100644 -index 000000000..73dabb82c +index 00000000..73dabb82 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java @@ -0,0 +1,114 @@ @@ -125,5 +125,5 @@ index 000000000..73dabb82c + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch index 04e9f88f0..3a7ddcc9f 100644 --- a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -1,4 +1,4 @@ -From 13d88336c734b2f4d7ec780cd4170c29bd517273 Mon Sep 17 00:00:00 2001 +From b20a912f73626ff663ee63c603cef6b7bd38a601 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 4 Aug 2018 19:37:35 -0400 Subject: [PATCH] Provide Chunk Coordinates as a Long API @@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method to look up by the long key too. diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 95e485eea..0bbef14a9 100644 +index 95e485ee..0bbef14a 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -27,6 +27,32 @@ public interface Chunk { @@ -44,10 +44,10 @@ index 95e485eea..0bbef14a9 100644 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 98f416455..b80b8b3b6 100644 +index 260ee11a..abd469b5 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -158,6 +158,22 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -155,6 +155,22 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Chunk getChunkAt(@NotNull Block block); @@ -71,5 +71,5 @@ index 98f416455..b80b8b3b6 100644 * Checks if the specified {@link Chunk} is loaded * -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch index 5534e0527..308c9f9cb 100644 --- a/Spigot-API-Patches/0133-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch @@ -1,4 +1,4 @@ -From e9382947de5cb8b5bc680815fe9bc811b59ef058 Mon Sep 17 00:00:00 2001 +From b58f65b305f5d0822f5802442a400a92f1ef7504 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Async Chunks API @@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index b80b8b3b..7a0b66fe 100644 +index abd469b5..310041ae 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -172,6 +172,358 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -169,6 +169,358 @@ public interface World extends PluginMessageRecipient, Metadatable { public default Chunk getChunkAt(long chunkKey) { return getChunkAt((int) chunkKey, (int) (chunkKey >> 32)); } @@ -371,7 +371,7 @@ index b80b8b3b..7a0b66fe 100644 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e5756c42..da7b35f0 100644 +index 04365232..83e02aea 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -155,6 +155,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -406,5 +406,5 @@ index e5756c42..da7b35f0 100644 * Returns a list of entities within a bounding box centered around this * entity -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch index b7706194c..94b1b385a 100644 --- a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch @@ -1,11 +1,11 @@ -From d2d7daccfc4a156c7a476d350e50e2f5b933f8d6 Mon Sep 17 00:00:00 2001 +From 6b5294396cb7b80079abf2691ff673493fbb5bfe Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:08:34 -0400 Subject: [PATCH] Make EnderDragon extend Mob diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java -index 16199b3e9..ddef550bb 100644 +index 16199b3e..ddef550b 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; @@ -18,5 +18,5 @@ index 16199b3e9..ddef550bb 100644 /** * Represents a phase or action that an Ender Dragon can perform. -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 5762c67eb..4f91516b1 100644 --- a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From 7c0eaa2f5e46b50360b8fa61518f57f5af913e00 Mon Sep 17 00:00:00 2001 +From ee8f4f1a0a6a9d3f20a4b1f4560ede1dbcb89116 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:04:58 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 7b0424d5..7909caef 100644 +index 0bbef14a..11b691cf 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -102,13 +102,26 @@ public interface Chunk { @@ -37,5 +37,5 @@ index 7b0424d5..7909caef 100644 /** * Checks if the chunk is loaded. -- -2.23.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch index 9a5197468..fb7c6e66b 100644 --- a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch +++ b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch @@ -1,11 +1,11 @@ -From 6a2e800f2e25eeb4229cc452f3b83bd5683d0cdd Mon Sep 17 00:00:00 2001 +From 9d25b9ff0418113653a0ec9a3fde1280b7742f0f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:19:37 -0400 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index ddaed8127..203cda0f9 100644 +index ddaed812..203cda0f 100644 --- a/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -119,7 +119,7 @@ public class TimingHistory { @@ -18,5 +18,5 @@ index ddaed8127..203cda0f9 100644 Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ()); continue; -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 095296151..61cc1f4e5 100644 --- a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -1,4 +1,4 @@ -From 039fde9628b4eb210babf96765eb25678fda8959 Mon Sep 17 00:00:00 2001 +From f440565394b29fc10255bf6770adaead86eac9b7 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Aug 2018 21:42:10 -0700 Subject: [PATCH] Allow Blocks to be accessed via a long key @@ -18,7 +18,7 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 884862ab..6dc39989 100644 +index f87ecd0a..07e532cd 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable; @@ -48,7 +48,7 @@ index 884862ab..6dc39989 100644 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index d4fcbf60..ce128016 100644 +index 310041ae..5bf2ba6f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -89,6 +89,38 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -88,8 +88,8 @@ index d4fcbf60..ce128016 100644 + // Paper end + /** - * Gets the y coordinate of the lowest block at this position such that the - * block and all blocks above it are transparent for lighting purposes. + * Gets the highest non-empty (impassable) coordinate at the given + * coordinates. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java index af4ffada..87185a81 100644 --- a/src/main/java/org/bukkit/block/Block.java @@ -168,5 +168,5 @@ index af4ffada..87185a81 100644 * Gets the Location of the block * -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch index e91b19491..51c8b6f26 100644 --- a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From ed6de598138774849832bd9edef9d2a1fc71eab5 Mon Sep 17 00:00:00 2001 +From ecb8e3fef8742116a4ee2ae296cb96d7bd7bd7db Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events @@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java new file mode 100644 -index 000000000..2638bbd3e +index 00000000..2638bbd3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java @@ -0,0 +1,38 @@ @@ -50,7 +50,7 @@ index 000000000..2638bbd3e +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java new file mode 100644 -index 000000000..14b67da10 +index 00000000..14b67da1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java @@ -0,0 +1,53 @@ @@ -109,7 +109,7 @@ index 000000000..14b67da10 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java new file mode 100644 -index 000000000..c8dd49d11 +index 00000000..c8dd49d1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java @@ -0,0 +1,17 @@ @@ -132,7 +132,7 @@ index 000000000..c8dd49d11 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java new file mode 100644 -index 000000000..e9ba32799 +index 00000000..e9ba3279 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java @@ -0,0 +1,31 @@ @@ -169,7 +169,7 @@ index 000000000..e9ba32799 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java new file mode 100644 -index 000000000..4683a7237 +index 00000000..4683a723 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java @@ -0,0 +1,17 @@ @@ -191,7 +191,7 @@ index 000000000..4683a7237 + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e2..c4791f95d 100644 +index 1119e26e..c4791f95 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java @@ -14,4 +14,20 @@ public interface Slime extends Mob { @@ -216,5 +216,5 @@ index 1119e26e2..c4791f95d 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0139-isChunkGenerated-API.patch index b0a2f6c48..549da0797 100644 --- a/Spigot-API-Patches/0139-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0139-isChunkGenerated-API.patch @@ -1,11 +1,11 @@ -From bebdec693bd0350c7d1be2671eb057542d66db03 Mon Sep 17 00:00:00 2001 +From 6d81881cbf9b5eca26d514dd5397735659b33f18 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 19:39:46 -0700 Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6dc39989..4e69f277 100644 +index 07e532cd..6e1a1124 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -3,6 +3,7 @@ package org.bukkit; @@ -34,10 +34,10 @@ index 6dc39989..4e69f277 100644 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index ce128016..30b3d9a8 100644 +index 5bf2ba6f..c6e2efc3 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -205,6 +205,17 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -202,6 +202,17 @@ public interface World extends PluginMessageRecipient, Metadatable { return getChunkAt((int) chunkKey, (int) (chunkKey >> 32)); } @@ -56,5 +56,5 @@ index ce128016..30b3d9a8 100644 * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided, * as well as future support -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch index 7167a9ece..a943b06f4 100644 --- a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch +++ b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From 5c03633065ac302e4f78d956c5f60db96d36fa2e Mon Sep 17 00:00:00 2001 +From 6a721495ed80e20ab76fe910f0f76863f0edaec8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API @@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java new file mode 100644 -index 000000000..ff10251b6 +index 00000000..ff10251b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 000000000..ff10251b6 + } +} diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java -index 1b8ece6df..faaeb44a9 100644 +index 1b8ece6d..faaeb44a 100644 --- a/src/main/java/org/bukkit/entity/Creeper.java +++ b/src/main/java/org/bukkit/entity/Creeper.java @@ -71,4 +71,27 @@ public interface Creeper extends Monster { @@ -97,5 +97,5 @@ index 1b8ece6df..faaeb44a9 100644 + // Paper end } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch index d418013c4..737eeaf3e 100644 --- a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From ed1259f134b0a6143623059aede383ba25b62c4e Mon Sep 17 00:00:00 2001 +From 5cf14e4f082f4a8bd55053a045f5e94640c76436 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java new file mode 100644 -index 000000000..9022f697a +index 00000000..9022f697 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java @@ -0,0 +1,31 @@ @@ -42,7 +42,7 @@ index 000000000..9022f697a + } +} diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index 1a1044edc..ed4d417c2 100644 +index 1a1044ed..ed4d417c 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java @@ -1,5 +1,8 @@ @@ -70,5 +70,5 @@ index 1a1044edc..ed4d417c2 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch index 3899674b9..e34c831c7 100644 --- a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,11 +1,11 @@ -From b0f398fcc65b5e54c6b3711c8e2b3f180791846d Mon Sep 17 00:00:00 2001 +From f19f62a22ecc44d92b5f0e3e2e85b40e686e3a44 Mon Sep 17 00:00:00 2001 From: Sotr Date: Thu, 23 Aug 2018 16:14:25 +0800 Subject: [PATCH] Add source block to BlockPhysicsEvent diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java -index e3a5f5824..c382f9fc2 100644 +index e3a5f582..c382f9fc 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { @@ -23,5 +23,5 @@ index e3a5f5824..c382f9fc2 100644 this(block, changed, block); } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch index eb5369c71..7c95f9f21 100644 --- a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From d70b874cdd62803c5044a849ea6de1ee156a623d Mon Sep 17 00:00:00 2001 +From 95a43e8a08966b71f9c27280888bc7a60f551d39 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 5a38d8f13..01fe217df 100644 +index 5a38d8f1..01fe217d 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java @@ -125,6 +125,34 @@ public interface Inventory extends Iterable { @@ -44,5 +44,5 @@ index 5a38d8f13..01fe217df 100644 * Returns all ItemStacks from the inventory * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch index 686f5f75a..a8cedab59 100644 --- a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 1bbdf437d44208ea4bd632bfa6503b67d1ddc160 Mon Sep 17 00:00:00 2001 +From 9fc1f2c6f1a03513613095a656e8b713d24ffe47 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:13:53 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java new file mode 100644 -index 000000000..18a96dbb0 +index 00000000..18a96dbb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 000000000..18a96dbb0 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 6e3284b20..9dc0d4ce3 100644 +index d170149d..3110c385 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -147,5 +147,5 @@ index 6e3284b20..9dc0d4ce3 100644 * Gets the last two blocks along the living entity's line of sight. *

-- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0145-Improve-death-events.patch index 9e1c5f66f..405b94082 100644 --- a/Spigot-API-Patches/0145-Improve-death-events.patch +++ b/Spigot-API-Patches/0145-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 79c433161d95f5eae0abf6fbdfa003097fdd4750 Mon Sep 17 00:00:00 2001 +From c5a15df263aed995ea36ac14c7b9bfa0a8db5d08 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java -index a5984ab06..e19a3df9a 100644 +index a5984ab0..e19a3df9 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java @@ -5,14 +5,24 @@ import org.bukkit.entity.LivingEntity; @@ -180,5 +180,5 @@ index a5984ab06..e19a3df9a 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch index 2eeb7eae0..9236cb87e 100644 --- a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 6538047548e090bb6c665f548411a53a52b466e0 Mon Sep 17 00:00:00 2001 +From 8c61dbfb7e69abe9e11960cca8798a51e0fe13d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API @@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java new file mode 100644 -index 000000000..8b90a9053 +index 00000000..8b90a905 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java @@ -0,0 +1,170 @@ @@ -188,7 +188,7 @@ index 000000000..8b90a9053 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 838440ff8..afdc103fe 100644 +index 838440ff..afdc103f 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -1,6 +1,7 @@ @@ -216,5 +216,5 @@ index 838440ff8..afdc103fe 100644 * Instructs this Mob to set the specified LivingEntity as its target. *

-- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch index e84843c21..7dd7aeeb0 100644 --- a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch @@ -1,4 +1,4 @@ -From d71fc46cccb94a231e306971414184d56ab42747 Mon Sep 17 00:00:00 2001 +From e38ab8ea9596208adf8125bc2630a36480621435 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:01:54 -0500 Subject: [PATCH] Expose attack cooldown methods for Player @@ -36,5 +36,5 @@ index 2c6ff39e..7f771b35 100644 // Spigot start -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index ca5cc8cbf..3b9ba8033 100644 --- a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -1,4 +1,4 @@ -From 45b3ed4d07d28d39b41e0154719bacb84d073413 Mon Sep 17 00:00:00 2001 +From c32da3b257eba8d2fd666e0b9fbb6826265441e3 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:35 +0300 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values @@ -226,7 +226,7 @@ index 22eca2a1..620a962d 100644 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 1df31be7..b1fa15a1 100644 +index f2e9f275..7e0b1d36 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -388,4 +388,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @@ -318,5 +318,5 @@ index 1df31be7..b1fa15a1 100644 + // Paper end } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch index c26576e11..5ad437367 100644 --- a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch +++ b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch @@ -1,4 +1,4 @@ -From 03939964d3b449b2f50848f67b7afcef215ed67e Mon Sep 17 00:00:00 2001 +From 84a87fd799e1ceaeedc4924323664331c6bd14b0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 20:51:50 -0400 Subject: [PATCH] Performance & Concurrency Improvements to Permissions @@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map lookups in half. diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java -index 497775f7f..c94e4cdb5 100644 +index 497775f7..c94e4cdb 100644 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java @@ -75,8 +75,11 @@ public class PermissibleBase implements Permissible { @@ -112,5 +112,5 @@ index 497775f7f..c94e4cdb5 100644 } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch index 2a54dc263..eeac1c3b4 100644 --- a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch +++ b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch @@ -1,4 +1,4 @@ -From 7623f58212aed74956a8d56b287b1e43c7ed3bb7 Mon Sep 17 00:00:00 2001 +From 48d7033d5636f973e7c0866bf74610ac7aa22fd4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 21:39:26 -0400 Subject: [PATCH] Add ItemStackRecipeChoice Draft API @@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack. diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java new file mode 100644 -index 000000000..43e6576b1 +index 00000000..43e6576b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java @@ -0,0 +1,51 @@ @@ -65,5 +65,5 @@ index 000000000..43e6576b1 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch index c73d4ff50..cc71a5482 100644 --- a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 98e9c2527d5e5f0e2c66fcd4bbf746eb1c3bc22f Mon Sep 17 00:00:00 2001 +From 4a2dfd6dc85fd5e72a95c4bff2c08e81ffbf3ba7 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:01 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index c5a8c96fa..9063cf370 100644 +index c5a8c96f..9063cf37 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java @@ -61,6 +61,26 @@ public interface Furnace extends Container { @@ -37,5 +37,5 @@ index c5a8c96fa..9063cf370 100644 @Override public FurnaceInventory getInventory(); -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch index 7730af6f5..158ff2ebe 100644 --- a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch +++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 35108f571ea410480d74da2013f658c1a286717e Mon Sep 17 00:00:00 2001 +From e5c7c371568b1dca84252ec87bc6c14933dc34d0 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:50:10 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -10,7 +10,7 @@ spawners. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java new file mode 100644 -index 000000000..48cff0635 +index 00000000..48cff063 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java @@ -0,0 +1,29 @@ @@ -44,5 +44,5 @@ index 000000000..48cff0635 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch index 21b8fdd77..e9ecd7ffe 100644 --- a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch +++ b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch @@ -1,4 +1,4 @@ -From 8f9018e6a58b04dc2a4ffc194859a002a64cf222 Mon Sep 17 00:00:00 2001 +From 7bebab90baccc66d9abbb59bdd963bc9e13d02e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 22 Sep 2018 18:41:01 -0400 Subject: [PATCH] Remove Precondition on name for AttributeModifier @@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier Vanilla allows empty names diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java -index a97631474..f0dff145a 100644 +index a9763147..f0dff145 100644 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java @@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable { @@ -23,5 +23,5 @@ index a97631474..f0dff145a 100644 this.operation = operation; this.slot = slot; -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch index a3cde3eca..6c86fe16b 100644 --- a/Spigot-API-Patches/0154-Material-API-additions.patch +++ b/Spigot-API-Patches/0154-Material-API-additions.patch @@ -1,4 +1,4 @@ -From 48215f315183e9ee6f9f6c31a8072e9094cbfb60 Mon Sep 17 00:00:00 2001 +From 7e722bdbd8f3b45278cb3a069b09aa82a50cceda Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Oct 2018 21:14:29 -0400 Subject: [PATCH] Material API additions @@ -40,5 +40,5 @@ index 9dc0ed03..535179c2 100644 * Do not use for any reason. * -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch index 053cd22cb..fcefd9396 100644 --- a/Spigot-API-Patches/0155-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From b0bcbd742cd31fe87bde4791e386dc1f85bc14a2 Mon Sep 17 00:00:00 2001 +From d0f5f71e226dd33834551fa47a3a4a605264647b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 17 Jul 2018 01:27:15 -0400 Subject: [PATCH] Add Material Tags @@ -635,5 +635,5 @@ index 61993528..5f9d3482 100644 Server.class.getMethod("getPluginManager"), new MethodHandler() { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch index 9b09d117a..89855fbf6 100644 --- a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From 8a5ed8af917559e92ff5030c6060dcc713070b06 Mon Sep 17 00:00:00 2001 +From 6e1384d706d338edc012cc11eb6b81a464c8e2f6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:09 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java -index 6b61c4ab7..c34a3ea7b 100644 +index 6b61c4ab..c34a3ea7 100644 --- a/src/main/java/org/bukkit/entity/Vex.java +++ b/src/main/java/org/bukkit/entity/Vex.java @@ -1,5 +1,7 @@ @@ -39,5 +39,5 @@ index 6b61c4ab7..c34a3ea7b 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch index 0d9c14392..f4f9ca336 100644 --- a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 02581e05349fbe72c968c075e13c2ce24f0ea8a0 Mon Sep 17 00:00:00 2001 +From 23517bc468b2b7651e9672d2c6e91bcb6bed2106 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:32:53 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java new file mode 100644 -index 000000000..f52644fab +index 00000000..f52644fa --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 000000000..f52644fab + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 9dc0d4ce3..a78f390d7 100644 +index 3110c385..240f276c 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -104,5 +104,5 @@ index 9dc0d4ce3..a78f390d7 100644 /** -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch index ea35a48e6..2481a0dc6 100644 --- a/Spigot-API-Patches/0158-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch @@ -1,14 +1,14 @@ -From 2da2459f920db384979afaf261bf21c33bf24bb7 Mon Sep 17 00:00:00 2001 +From f8fa7eb584dab2c32c88b92bbedc705f6540581c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:15 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 30b3d9a8..b02cda3e 100644 +index c6e2efc3..23c76976 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1597,6 +1597,16 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1594,6 +1594,16 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public void setFullTime(long time); @@ -44,5 +44,5 @@ index afdc103f..784db447 100644 /** -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch index bfc6453be..e126a2a7e 100644 --- a/Spigot-API-Patches/0159-Here-s-Johnny.patch +++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 9feb8537560450fdcad63b1b2779325380c7a425 Mon Sep 17 00:00:00 2001 +From 55e5b39866ee0b4122d18ccc260ea6c6fd14cb68 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:16 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java -index b8ea68a8f..c5d9e76a6 100644 +index b8ea68a8..c5d9e76a 100644 --- a/src/main/java/org/bukkit/entity/Vindicator.java +++ b/src/main/java/org/bukkit/entity/Vindicator.java @@ -3,4 +3,30 @@ package org.bukkit.entity; @@ -41,5 +41,5 @@ index b8ea68a8f..c5d9e76a6 100644 + // Paper end +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch index 0905f052d..e17fb6621 100644 --- a/Spigot-API-Patches/0160-Turtle-API.patch +++ b/Spigot-API-Patches/0160-Turtle-API.patch @@ -1,4 +1,4 @@ -From afddee2d418aabde079f27f71fc4e551f915b42c Mon Sep 17 00:00:00 2001 +From fb0f440061d118e2b2a67e4bef904a44e4606157 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 Subject: [PATCH] Turtle API @@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java new file mode 100644 -index 000000000..021356d15 +index 00000000..021356d1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java @@ -0,0 +1,49 @@ @@ -61,7 +61,7 @@ index 000000000..021356d15 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java new file mode 100644 -index 000000000..a315c5185 +index 00000000..a315c518 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java @@ -0,0 +1,87 @@ @@ -154,7 +154,7 @@ index 000000000..a315c5185 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java new file mode 100644 -index 000000000..abeb24fcc +index 00000000..abeb24fc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java @@ -0,0 +1,62 @@ @@ -221,7 +221,7 @@ index 000000000..abeb24fcc + } +} diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java -index 0a4cd2993..5375ea140 100644 +index 0a4cd299..5375ea14 100644 --- a/src/main/java/org/bukkit/entity/Turtle.java +++ b/src/main/java/org/bukkit/entity/Turtle.java @@ -1,6 +1,55 @@ @@ -282,5 +282,5 @@ index 0a4cd2993..5375ea140 100644 + // Paper end +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 16935788d..eeb36f19c 100644 --- a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 3fa0f5cbf8659b7e8db5bcf93b95f01a6102a11f Mon Sep 17 00:00:00 2001 +From 1dbe5e0546a661b121c82a839d2f5b99fda98035 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:13 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index cb9e9f369..a15f70ff4 100644 +index cb9e9f36..a15f70ff 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -4,6 +4,10 @@ import org.bukkit.inventory.ItemStack; @@ -57,5 +57,5 @@ index cb9e9f369..a15f70ff4 100644 // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch index 971c24fc2..3c21fbed4 100644 --- a/Spigot-API-Patches/0162-Add-spectator-target-events.patch +++ b/Spigot-API-Patches/0162-Add-spectator-target-events.patch @@ -1,4 +1,4 @@ -From 52e7ac31dedf5afa861d6a5cb99977fe77a8d279 Mon Sep 17 00:00:00 2001 +From 41a09f927d69e558a5dc223da54cc2a7ee8e39a1 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:30:56 -0500 Subject: [PATCH] Add spectator target events @@ -8,7 +8,7 @@ Subject: [PATCH] Add spectator target events diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java new file mode 100644 -index 000000000..b8ec7ef2d +index 00000000..b8ec7ef2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java @@ -0,0 +1,67 @@ @@ -81,7 +81,7 @@ index 000000000..b8ec7ef2d + diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java new file mode 100644 -index 000000000..693d119ab +index 00000000..693d119a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java @@ -0,0 +1,54 @@ @@ -140,5 +140,5 @@ index 000000000..693d119ab + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch index 29905112a..62d9f4ed6 100644 --- a/Spigot-API-Patches/0163-Add-more-Witch-API.patch +++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From cf294a7cb160aee89d26509009c13b9415132a73 Mon Sep 17 00:00:00 2001 +From d4957c651a67e0bea676153a8d426681e9d43990 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 03:47:26 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index aa88aede6..cd8d0a20e 100644 +index aa88aede..cd8d0a20 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -2,8 +2,43 @@ package org.bukkit.entity; @@ -53,5 +53,5 @@ index aa88aede6..cd8d0a20e 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 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 2194f75ce..04151e0cd 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,11 +1,11 @@ -From 522e330d4fb387be0279abcb087bf0e23be2aed2 Mon Sep 17 00:00:00 2001 +From cee1e4c0473f12e2dc86ddefed433fb92443be5c 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 0c519c412..2148a3c26 100644 +index 0c519c41..2148a3c2 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 { @@ -25,7 +25,7 @@ index 0c519c412..2148a3c26 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 8a76df524..1cbb9bc66 100644 +index 8a76df52..1cbb9bc6 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1364,6 +1364,13 @@ public interface Server extends PluginMessageRecipient { @@ -43,7 +43,7 @@ index 8a76df524..1cbb9bc66 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 03bdc1622..0b0d1bd7c 100644 +index 03bdc162..0b0d1bd7 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 { @@ -56,5 +56,5 @@ index 03bdc1622..0b0d1bd7c 100644 for (String line : permissionMessage.replace("", permission).split("\n")) { target.sendMessage(line); -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch index dc65630fc..1cbb02039 100644 --- a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch +++ b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch @@ -1,4 +1,4 @@ -From 8d325190904286d345de34c047d051565ee3fb6b Mon Sep 17 00:00:00 2001 +From da96969afee7a4b6c69ae1020f4cb5992c95604e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 15:53:43 +0000 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit @@ -21,7 +21,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java -index 963b9ead4..a976c32de 100644 +index 963b9ead..a976c32d 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java @@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable { @@ -64,7 +64,7 @@ index 963b9ead4..a976c32de 100644 @Override public HandlerList getHandlers() { diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java -index a473b2c6e..a5b4aed52 100644 +index a473b2c6..a5b4aed5 100644 --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java @@ -16,11 +16,20 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable @@ -108,5 +108,5 @@ index a473b2c6e..a5b4aed52 100644 @Override public HandlerList getHandlers() -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch index 00d4218db..8c11e7500 100644 --- a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch +++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 5eebc3f74580df0dc9f9e85de16366fcd301303c Mon Sep 17 00:00:00 2001 +From 390a6e71ac79020d4819cbcab004af43f7689d02 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:51 -0500 Subject: [PATCH] Add more Zombie API diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java -index 6dcac9798..fa7a43c35 100644 +index 6dcac979..fa7a43c3 100644 --- a/src/main/java/org/bukkit/entity/Zombie.java +++ b/src/main/java/org/bukkit/entity/Zombie.java @@ -86,4 +86,55 @@ public interface Zombie extends Monster { @@ -65,5 +65,5 @@ index 6dcac9798..fa7a43c35 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch index 80d960eb3..8889f9a67 100644 --- a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch +++ b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch @@ -1,11 +1,11 @@ -From 48dfc4dd10a6ed04373569ef4514f2c7cfb346f5 Mon Sep 17 00:00:00 2001 +From d05cfe5510c7b9bf9a59b7b1b01b28e598818d32 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:32:55 +0300 Subject: [PATCH] Change the reserved channel check to be sensible diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java -index 1d061412c..6fda7f3aa 100644 +index 1d061412..6fda7f3a 100644 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java @@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger { @@ -18,7 +18,7 @@ index 1d061412c..6fda7f3aa 100644 @Override diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java -index dce3d619a..7e2335ed8 100644 +index dce3d619..7e2335ed 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -25,8 +25,8 @@ public class StandardMessengerTest { @@ -33,5 +33,5 @@ index dce3d619a..7e2335ed8 100644 } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch index a14f88ecf..026efdddb 100644 --- a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 009d528d0165243b2a9e3fe673d2e4e63c423eb6 Mon Sep 17 00:00:00 2001 +From 95d30490448f23dea22036dc8cf2dcfe738143c2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:06 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -35,7 +35,7 @@ is undefined. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java new file mode 100644 -index 000000000..12c1c6fe9 +index 00000000..12c1c6fe --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java @@ -0,0 +1,95 @@ @@ -135,5 +135,5 @@ index 000000000..12c1c6fe9 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 203b37c41..b7a1fce66 100644 --- a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From d365f8709924fca24da48483363f820370e6f518 Mon Sep 17 00:00:00 2001 +From e1c6a27f1e758a693838a8a716cb5c89035636fa Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:31:12 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 222a9a7bf..3ab914fb2 100644 +index 222a9a7b..3ab914fb 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -146,7 +146,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -61,5 +61,5 @@ index 222a9a7bf..3ab914fb2 100644 + } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch index 68125f3f8..389dd7daa 100644 --- a/Spigot-API-Patches/0170-BlockDestroyEvent.patch +++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 5ab789847092498cb922959f046373d0c2976d13 Mon Sep 17 00:00:00 2001 +From b092cecdb21d7d793b27bdea3cd4a09cb2881b3d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:19:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -12,7 +12,7 @@ This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java new file mode 100644 -index 000000000..3aee12f1c +index 00000000..3aee12f1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java @@ -0,0 +1,92 @@ @@ -109,5 +109,5 @@ index 000000000..3aee12f1c + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch index af7da792b..98f9f3342 100644 --- a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch +++ b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch @@ -1,4 +1,4 @@ -From 79a77f853194bb36fa722b0eb5fcafa506e72c2a Mon Sep 17 00:00:00 2001 +From 920263b23cfbcb3a9a4d0a573361be12ac818318 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Jan 2014 19:13:57 -0500 Subject: [PATCH] Add ItemStack Recipe API helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods Allows using ExactChoice Recipes with easier methodss diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d742c4058..222a12baa 100644 +index d742c405..222a12ba 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -24,7 +24,7 @@ index d742c4058..222a12baa 100644 * Get a copy of the ingredients map. * diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 84062dd71..ddcf84e66 100644 +index 84062dd7..ddcf84e6 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -69,5 +69,5 @@ index 84062dd71..ddcf84e66 100644 * Removes an ingredient from the list. * -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch index a642d06e0..dd11e4892 100644 --- a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch +++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch @@ -1,4 +1,4 @@ -From cb894dce36610bc0d2324b5d059ab0c6ceceddf1 Mon Sep 17 00:00:00 2001 +From aff15115615b56bf411d71d5bb34501c4bb48bcc Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:04:43 +0200 Subject: [PATCH] Add WhitelistToggleEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add WhitelistToggleEvent diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java new file mode 100644 -index 000000000..fdd5eedb2 +index 00000000..fdd5eedb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java @@ -0,0 +1,40 @@ @@ -51,5 +51,5 @@ index 000000000..fdd5eedb2 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch index ddbfde4a6..f64bd9479 100644 --- a/Spigot-API-Patches/0173-Annotation-Test-changes.patch +++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch @@ -1,11 +1,11 @@ -From 670b58d2d4e773378735e0e2b8cf388a4e941e80 Mon Sep 17 00:00:00 2001 +From 78ebc2fda46badc3e3b4a1e7145758fe80d43609 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 17 Mar 2019 23:04:30 +0000 Subject: [PATCH] Annotation Test changes diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index cc6b6e209..328a5a163 100644 +index 0c737724..38be576b 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -40,7 +40,17 @@ public class AnnotationTest { @@ -28,5 +28,5 @@ index cc6b6e209..328a5a163 100644 @Test -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch index a00e64253..8cce30401 100644 --- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 438ca84fe0a7cabce8f510292ce8f288596aed51 Mon Sep 17 00:00:00 2001 +From 9ec32ef81405280984d6b00aecc95b492a2cc93e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:21:23 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -26,5 +26,5 @@ index 83e02aea..60dbfab0 100644 // Paper end } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch index a520e6093..711081440 100644 --- a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch +++ b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch @@ -1,4 +1,4 @@ -From 332d4b565f7bce47709cd2c6740068b20c338ef0 Mon Sep 17 00:00:00 2001 +From bf1cc0ed093a3faacca2e7f701fb6f0fa5396635 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:27 +0200 Subject: [PATCH] Add GS4 Query event @@ -6,7 +6,7 @@ Subject: [PATCH] Add GS4 Query event diff --git a/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java new file mode 100644 -index 000000000..77a19995f +index 00000000..77a19995 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java @@ -0,0 +1,412 @@ @@ -423,5 +423,5 @@ index 000000000..77a19995f + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch index 8e19c47e7..56c172a58 100644 --- a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch +++ b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From bdee9be039bcf8a139395c9cf049f71ab881a9a0 Mon Sep 17 00:00:00 2001 +From 7a592cec03927827fbf2ab5025335b3750aeecb6 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:33:13 -0700 Subject: [PATCH] Add PlayerPostRespawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java new file mode 100644 -index 000000000..31f34b548 +index 00000000..31f34b54 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java @@ -0,0 +1,52 @@ @@ -63,5 +63,5 @@ index 000000000..31f34b548 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch index c126ebed5..d99241905 100644 --- a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch +++ b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch @@ -1,4 +1,4 @@ -From 4cafba0863a49a01e17c6e6e284cf4a3f2ab031a Mon Sep 17 00:00:00 2001 +From ac8062829a86c489fdd2cc70debe62b179b1034c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:44:26 -0400 Subject: [PATCH] Ignore package-private methods for nullability annotations @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations This isn't API diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 328a5a163..af2abd47f 100644 +index 38be576b..a48be38b 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -162,7 +162,7 @@ public class AnnotationTest { @@ -19,5 +19,5 @@ index 328a5a163..af2abd47f 100644 } -- -2.21.0 +2.25.0.windows.1 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 fe052ea53..1b656af5a 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 d6296efc1c050316fb10c82a548799879957e508 Mon Sep 17 00:00:00 2001 +From 82d88fc0c93750b65215391f6570a68680cccca8 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,7 +9,7 @@ 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 2148a3c26..6db691591 100644 +index 2148a3c2..6db69159 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 { @@ -31,7 +31,7 @@ index 2148a3c26..6db691591 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 4e69f277b..2a40da99f 100644 +index 6e1a1124..77d9cd0a 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,7 +62,7 @@ index 4e69f277b..2a40da99f 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 1cbb9bc66..27d3b5ad7 100644 +index 1cbb9bc6..27d3b5ad 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 { @@ -84,7 +84,7 @@ index 1cbb9bc66..27d3b5ad7 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 3cada3487..03ba22659 100644 +index 3cada348..03ba2265 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 3cada3487..03ba22659 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 6d18de762..495161f62 100644 +index dfe52817..19e0852c 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 @@ -116,7 +116,7 @@ index 6d18de762..495161f62 100644 import org.bukkit.Utility; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.enchantments.Enchantment; -@@ -528,7 +529,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { +@@ -544,7 +545,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { * * @return a copy of the current ItemStack's ItemData */ @@ -126,5 +126,5 @@ index 6d18de762..495161f62 100644 return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone(); } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0179-Server-Tick-Events.patch b/Spigot-API-Patches/0179-Server-Tick-Events.patch index cad6ccbf6..e1d83d378 100644 --- a/Spigot-API-Patches/0179-Server-Tick-Events.patch +++ b/Spigot-API-Patches/0179-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 4b52e53d9edd013e687d915bd4e605ba4192760a Mon Sep 17 00:00:00 2001 +From 9ead8f3285ae8c2f39563a8189bada2f38876e48 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 21:58:55 -0400 Subject: [PATCH] Server Tick Events @@ -7,7 +7,7 @@ Fires event at start and end of a server tick diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java new file mode 100644 -index 000000000..9fd28e036 +index 00000000..9fd28e03 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java @@ -0,0 +1,59 @@ @@ -72,7 +72,7 @@ index 000000000..9fd28e036 +} diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java new file mode 100644 -index 000000000..eac85f1f4 +index 00000000..eac85f1f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java @@ -0,0 +1,32 @@ @@ -109,5 +109,5 @@ index 000000000..eac85f1f4 + } +} -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch index 2c2892ac0..c2fa51703 100644 --- a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 9237e815abdc669507ac2c602da9f1daec551a4c Mon Sep 17 00:00:00 2001 +From 90ee83866858a8d71451b57c18653ce6d56ec2a4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 11 Mar 2013 20:04:34 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index f0dda632d..f5c3c5e24 100644 +index 07a52441..1e97d04b 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -17,6 +17,40 @@ public class PlayerDeathEvent extends EntityDeathEvent { @@ -53,5 +53,5 @@ index f0dda632d..f5c3c5e24 100644 this(player, drops, droppedExp, 0, deathMessage); } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0181-Add-Heightmap-API.patch b/Spigot-API-Patches/0181-Add-Heightmap-API.patch index 0904ac66f..5d42179a6 100644 --- a/Spigot-API-Patches/0181-Add-Heightmap-API.patch +++ b/Spigot-API-Patches/0181-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From 8f07bbb425c028ff4d52daf6f08197239c8436e1 Mon Sep 17 00:00:00 2001 +From 0de142a12fee06c6dd294d94bbb6351bb727c4f4 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Dec 2018 19:00:36 -0800 Subject: [PATCH] Add Heightmap API @@ -46,7 +46,7 @@ index 00000000..4cd9b5ed + SOLID_OR_LIQUID_NO_LEAVES; +} diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 2a40da99..3e1ca4c9 100644 +index 77d9cd0a..59047503 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -84,10 +84,10 @@ index 2a40da99..3e1ca4c9 100644 * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index b02cda3e..1e7b633c 100644 +index 23c76976..b46b2719 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -162,6 +162,79 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -159,6 +159,79 @@ public interface World extends PluginMessageRecipient, Metadatable { @NotNull public Block getHighestBlockAt(@NotNull Location location); @@ -168,5 +168,5 @@ index b02cda3e..1e7b633c 100644 * Gets the {@link Chunk} at the given coordinates * -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch index 4f2b1af5e..ea72c1531 100644 --- a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch @@ -1,4 +1,4 @@ -From a648fedca90dbada98f8227d22e0c79faa83e2ca Mon Sep 17 00:00:00 2001 +From d5a5de22dce06c0d7a62b347c1af562ae7d454aa Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:19 -0500 Subject: [PATCH] Mob Spawner API Enhancements @@ -28,5 +28,5 @@ index cb447a4a..35a599eb 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch index 7dcafd030..3ae3d6db9 100644 --- a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch +++ b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch @@ -1,4 +1,4 @@ -From 4e67614c99511b658d31cff8f3ec26f076e48c95 Mon Sep 17 00:00:00 2001 +From 236a9fac537404b947a85a76ded73bbd9031a915 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:41:28 -0700 Subject: [PATCH] Add BlockSoundGroup interface @@ -7,7 +7,7 @@ This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java new file mode 100644 -index 000000000..8cf87d228 +index 00000000..8cf87d22 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java @@ -0,0 +1,52 @@ @@ -64,7 +64,7 @@ index 000000000..8cf87d228 + Sound getFallSound(); +} diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 87185a812..038de5a64 100644 +index 87185a81..038de5a6 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -1,6 +1,7 @@ @@ -93,5 +93,5 @@ index 87185a812..038de5a64 100644 + // Paper end } -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch index 544630229..f1e891a72 100644 --- a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch +++ b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch @@ -1,4 +1,4 @@ -From c02f688da65316acf628b036b704966fa9bf8dfe Mon Sep 17 00:00:00 2001 +From 54ca16e5e62b0dc6b5b8ba1c3eec75cba8faabd5 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Thu, 11 Jul 2019 10:35:56 -0700 Subject: [PATCH] Amend PlayerInteractAtEntityEvent javadoc for ArmorStands @@ -19,5 +19,5 @@ index 1075dbb8..3f24d302 100644 public class PlayerInteractAtEntityEvent extends PlayerInteractEntityEvent { private static final HandlerList handlers = new HandlerList(); -- -2.19.2 +2.25.0.windows.1 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 c466b0928..3b2eb1153 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 f0f2d08f8c81182aab2dc14dc62f513de55f3689 Mon Sep 17 00:00:00 2001 +From 93548ddd969d1473484e7793511d8019c7d430ec 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 @@ -22,5 +22,5 @@ index 5b847bb3..6c9d313f 100644 /** -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch index e556e8637..1a6aba2f9 100644 --- a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch +++ b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch @@ -1,4 +1,4 @@ -From fe4413704ee328c31901a2083a7d812d02bef2e0 Mon Sep 17 00:00:00 2001 +From cbc7f9e4c9ec7b585261a98c14939270f394f8f3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 18 Oct 2019 17:39:05 +0100 Subject: [PATCH] Increase custom payload channel message size @@ -20,5 +20,5 @@ index ea9b525f..682c7718 100644 /** * Checks if the specified channel is a reserved name. -- -2.23.0 +2.25.0.windows.1 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 727d4ba15..03d3adf88 100644 --- a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch +++ b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch @@ -1,4 +1,4 @@ -From 078c70f326b5c98a45611ee06bdb1b4d767a4f5f Mon Sep 17 00:00:00 2001 +From c50ead5ff128e961fe1f3b8e823a0f3a2036f08b 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 @@ -37,5 +37,5 @@ index 27d3b5ad..31470479 100644 // Paper end } -- -2.23.0 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch index 60a266671..03797fb44 100644 --- a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch @@ -1,4 +1,4 @@ -From 26f8dfff57e31852d46c49274e1a45d9d66c6523 Mon Sep 17 00:00:00 2001 +From aebd26ded7622ed404a7ee216378447a6e16a106 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:31 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience @@ -60,5 +60,5 @@ index 1e97d04b..3a743430 100644 @NotNull -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch index 29a78767d..6f1641b0f 100644 --- a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch +++ b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch @@ -1,4 +1,4 @@ -From 26ab8a84de63cd94f51c9edbe7f9f4070b4e4dbe Mon Sep 17 00:00:00 2001 +From dde41eab315a4b6cce19b82218b31a5fb5a069ee Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:16 -0600 Subject: [PATCH] Add effect to block break naturally @@ -28,5 +28,5 @@ index 038de5a6..a14a7583 100644 * Returns a list of items which would drop by destroying this block * -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 4b2060b26..5a2a16bf6 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 92d645237db7b0287e09f0610f95643d701fad80 Mon Sep 17 00:00:00 2001 +From f4eb8e7892445a413b8c70f54fd16397a8aa402e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index b1a12eca1..22e4ce22a 100644 +index 522b89751..ee7d3d521 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -16,7 +16,7 @@ index b1a12eca1..22e4ce22a 100644 - spigot + paper jar - 1.15.1-R0.1-SNAPSHOT + 1.15.2-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ + Paper @@ -27,7 +27,7 @@ index b1a12eca1..22e4ce22a 100644 + UTF-8 unknown - 1.15.1 + 1.15.2 @@ -22,16 +21,16 @@ @@ -159,5 +159,5 @@ index 93046379d..674096cab 100644 if (stream != null) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 2dffdd5eb..fb2aff993 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From fad26d57c0fefc74ad043ec41828108d93bfe7bb Mon Sep 17 00:00:00 2001 +From acebed7739beb3bd86a6a94278fca6a8ad6401bc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -521,10 +521,10 @@ index 000000000..a73865739 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index e3a830064..20ed423fa 100644 +index ba24b738d..1cde6fc9c 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -162,6 +162,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -163,6 +163,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer org.spigotmc.SpigotConfig.init((File) options.valueOf("spigot-settings")); org.spigotmc.SpigotConfig.registerCommands(); // Spigot end @@ -541,7 +541,7 @@ index e3a830064..20ed423fa 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 5c495688e..da19b682a 100644 +index 4c802459d..c07284d35 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 5c495688e..da19b682a 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 c1e050426..cf9612d17 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 c1e050426..cf9612d17 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5edbdebf3..602a395b3 100644 +index a1ee67b30..692f8e4b7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -85,6 +85,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -602,7 +602,7 @@ index 5edbdebf3..602a395b3 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 465af5fb6..a72238a9d 100644 +index 4243460e4..57ad50403 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 { @@ -666,10 +666,10 @@ index 465af5fb6..a72238a9d 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 6c2373569..a668bc4e8 100644 +index 766e0f6b1..3a0c01852 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -128,6 +128,14 @@ public class Main { +@@ -129,6 +129,14 @@ public class Main { .defaultsTo(new File("spigot.yml")) .describedAs("Yml file"); // Spigot End @@ -685,7 +685,7 @@ index 6c2373569..a668bc4e8 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 6ae3b3185..8c7dd0133 100644 +index 34964d285..5686a4f1a 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,36 +39,36 @@ public class SpigotWorldConfig @@ -732,5 +732,5 @@ index 6ae3b3185..8c7dd0133 100644 config.addDefault( "world-settings.default." + path, def ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 288e009f6..aede2fdc7 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,4 +1,4 @@ -From 989cb57bde61072538221078488e241958fdbdbc Mon Sep 17 00:00:00 2001 +From b094d235e668b63afb13e4d01a9b14c45fa4363f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes @@ -170,7 +170,7 @@ index 7d44348c7..73ecdd22e 100644 this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true)); diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index 1f3ea23ae..b098d86e3 100644 +index 447f6a55b..1890c760f 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -55,7 +55,7 @@ public abstract class IAsyncTaskHandler implements Mailbox stream = this.getEntities(entity, axisalignedbb1).stream().filter((entity1) -> { // Paper - decompile fix return !set.contains(entity1); }).filter((entity1) -> { - return entity == null || !entity.x(entity1); + return entity == null || !entity.isSameVehicle(entity1); @@ -55,7 +55,6 @@ public interface IEntityAccess { return Stream.of(entity1.au(), entity == null ? null : entity.j(entity1)); }).filter(Objects::nonNull); @@ -634,5 +634,5 @@ index 55fe7625a..19e68a783 100644 t0.a(nbttagcompound.getCompound("data")); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index de5935e6f..0be36afc1 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,4 +1,4 @@ -From a0b808cc25884976a9235109a107fa6f2e6916a2 Mon Sep 17 00:00:00 2001 +From 23bf7ede3aac2e0054dcdc6301da047f0918a09b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils @@ -166,7 +166,7 @@ index 260644bf0..f2a19acd8 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 2e8a087bd..c5121d369 100644 +index e8b7cc06c..9cd21b1ff 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -77,6 +77,37 @@ public class ChunkProviderServer extends IChunkProvider { @@ -304,7 +304,7 @@ index e1398652a..7ee5eb987 100644 // CraftBukkit start - fire event setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0f6fd2d70..138bc38e6 100644 +index 3b1bcf349..1f350e335 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -129,6 +129,7 @@ public abstract class EntityLiving extends Entity { @@ -328,7 +328,7 @@ index 00c3b666d..e5322fbae 100644 super(entitytypes, world); this.f = 5; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index cf9612d17..755d34e61 100644 +index f937b7294..cbf0c2f25 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixUtils; @@ -351,7 +351,7 @@ index cf9612d17..755d34e61 100644 } diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index b098d86e3..721021791 100644 +index 1890c760f..7e5ece9d5 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -68,6 +68,15 @@ public abstract class IAsyncTaskHandler implements Mailbox Date: Fri, 24 Mar 2017 23:56:01 -0500 Subject: [PATCH] Paper Metrics @@ -15,7 +15,7 @@ decisions on behalf of the project. diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java new file mode 100644 -index 0000000000..e257d6b36e +index 000000000..e257d6b36 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -0,0 +1,627 @@ @@ -647,7 +647,7 @@ index 0000000000..e257d6b36e + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index db79fe41b9..5518ec1e54 100644 +index 273cdb598..b6d470e59 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -41,6 +41,7 @@ public class PaperConfig { @@ -671,7 +671,7 @@ index db79fe41b9..5518ec1e54 100644 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index a7a47b1f32..fc6cb9306a 100644 +index ff1ddfcfe..fdca34346 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -83,6 +83,7 @@ public class SpigotConfig @@ -691,5 +691,5 @@ index a7a47b1f32..fc6cb9306a 100644 static void readConfig(Class clazz, Object instance) -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch index 79656b5ae..fbdb3abca 100644 --- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch +++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch @@ -1,4 +1,4 @@ -From 6cb23c0849c8579aecb73ffe391df83526bd6281 Mon Sep 17 00:00:00 2001 +From 7d359c397e600267fe7d4f10e7c35e6bc7523fd5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 01:40:13 -0400 Subject: [PATCH] Add MinecraftKey Information to Objects @@ -19,7 +19,7 @@ index db899937b..eecf27370 100644 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ()); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index da19b682a..a203f5d14 100644 +index c07284d35..a8ea70b36 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; @@ -65,7 +65,7 @@ index da19b682a..a203f5d14 100644 protected abstract void a(NBTTagCompound nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 755d34e61..d49ad0308 100644 +index cbf0c2f25..79f854966 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -237,6 +237,7 @@ public class EntityTypes { @@ -141,5 +141,5 @@ index 40752f761..9071bb7ec 100644 public World getWorld() { return this.world; -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch index 01a0c753c..0382f9816 100644 --- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch +++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch @@ -1,4 +1,4 @@ -From 90f7a4116fa55f0b41e47a9702a7eaad2cc67d4d Mon Sep 17 00:00:00 2001 +From 7f6a88f275bf307644ba5a8a0507c1eee3507d37 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:10:36 -0400 Subject: [PATCH] Store reference to current Chunk for Entity and Block @@ -90,7 +90,7 @@ index cfffbd031..125d3acdc 100644 @Override diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a203f5d14..2a5e8d34e 100644 +index a8ea70b36..3a969d92e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -188,5 +188,5 @@ index 63ecbcd47..c82c21326 100644 /** * Order is *EXTREMELY* important -- keep it right! =D -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch index 28dc892de..687531918 100644 --- a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch +++ b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch @@ -1,4 +1,4 @@ -From a5904cd023908ab09a645472a4d04300ae07550a Mon Sep 17 00:00:00 2001 +From 50eee3a1fb88960217779354b20dd20daae7c7b6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:13:59 -0400 Subject: [PATCH] Store counts for each Entity/Block Entity Type @@ -54,5 +54,5 @@ index 125d3acdc..dcaf3a509 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 98226f383..6b92a5ac5 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 1a80bae7a79972b8da9e0371a218b0b1a93517fa Mon Sep 17 00:00:00 2001 +From 52f1636755ebeb48bcb0cd8d32f529e63ca13313 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -375,13 +375,13 @@ index dcaf3a509..5f9031257 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index c5121d369..459baf26d 100644 +index 9cd21b1ff..99afce39a 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -129,11 +129,13 @@ public class ChunkProviderServer extends IChunkProvider { - } +@@ -133,11 +133,13 @@ public class ChunkProviderServer extends IChunkProvider { } + gameprofilerfiller.c("getChunkCacheMiss"); - world.timings.syncChunkLoadTimer.startTiming(); // Spigot CompletableFuture> completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag); @@ -394,7 +394,7 @@ index c5121d369..459baf26d 100644 ichunkaccess = (IChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> { return ichunkaccess1; }, (playerchunk_failure) -> { -@@ -325,7 +327,9 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -330,7 +332,9 @@ public class ChunkProviderServer extends IChunkProvider { public void save(boolean flag) { this.tickDistanceManager(); @@ -404,7 +404,7 @@ index c5121d369..459baf26d 100644 } @Override -@@ -362,7 +366,9 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -367,7 +371,9 @@ public class ChunkProviderServer extends IChunkProvider { this.tickDistanceManager(); this.world.timings.doChunkMap.stopTiming(); // Spigot this.world.getMethodProfiler().exitEnter("chunks"); @@ -414,7 +414,7 @@ index c5121d369..459baf26d 100644 this.world.timings.doChunkUnload.startTiming(); // Spigot this.world.getMethodProfiler().exitEnter("unload"); this.playerChunkMap.unloadChunks(booleansupplier); -@@ -387,10 +393,12 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -392,10 +398,12 @@ public class ChunkProviderServer extends IChunkProvider { boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit // PAIL: TODO monster ticks this.world.getMethodProfiler().enter("naturalSpawnCount"); @@ -427,7 +427,7 @@ index c5121d369..459baf26d 100644 this.world.getMethodProfiler().exit(); this.playerChunkMap.f().forEach((playerchunk) -> { Optional optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); -@@ -399,13 +407,27 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -404,13 +412,27 @@ public class ChunkProviderServer extends IChunkProvider { Chunk chunk = (Chunk) optional.get(); this.world.getMethodProfiler().enter("broadcast"); @@ -457,7 +457,7 @@ index c5121d369..459baf26d 100644 this.world.getMethodProfiler().enter("spawner"); this.world.timings.mobSpawn.startTiming(); // Spigot EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype; -@@ -449,24 +471,24 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -454,24 +476,24 @@ public class ChunkProviderServer extends IChunkProvider { this.world.getMethodProfiler().exit(); } @@ -525,7 +525,7 @@ index e16d30f2c..4af5a230b 100644 } diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java -index c3218fbc3..94195a7f9 100644 +index 8d7a6d240..707bd2600 100644 --- a/src/main/java/net/minecraft/server/CustomFunction.java +++ b/src/main/java/net/minecraft/server/CustomFunction.java @@ -13,12 +13,22 @@ public class CustomFunction { @@ -552,32 +552,32 @@ index c3218fbc3..94195a7f9 100644 return this.b; } diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java -index 334de8b04..872a6cbbb 100644 +index ba40d5fbb..ee42e1dfa 100644 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java -@@ -101,7 +101,7 @@ public class CustomFunctionData implements IResourcePackListener { - - return 0; +@@ -103,7 +103,7 @@ public class CustomFunctionData implements IResourcePackListener { } else { + int j; + - try { + try (co.aikar.timings.Timing timing = customfunction.getTiming().startTiming()) { // Paper this.h = true; - int j = 0; + int k = 0; CustomFunction.c[] acustomfunction_c = customfunction.b(); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 20ed423fa..141673d00 100644 +index 1cde6fc9c..e636433b1 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -19,6 +19,8 @@ import java.util.Collections; - import java.util.List; +@@ -20,6 +20,8 @@ import java.util.List; import java.util.Locale; + import java.util.Optional; import java.util.Random; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import java.util.function.BooleanSupplier; import java.util.regex.Pattern; import javax.annotation.Nullable; -@@ -31,7 +33,7 @@ import org.apache.logging.log4j.Level; +@@ -32,7 +34,7 @@ import org.apache.logging.log4j.Level; import org.bukkit.command.CommandSender; import org.bukkit.craftbukkit.LoggerOutputStream; @@ -586,7 +586,7 @@ index 20ed423fa..141673d00 100644 import org.bukkit.event.server.ServerCommandEvent; import org.bukkit.craftbukkit.util.Waitable; import org.bukkit.event.server.RemoteServerCommandEvent; -@@ -425,7 +427,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -431,7 +433,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } public void handleCommandQueue() { @@ -595,7 +595,7 @@ index 20ed423fa..141673d00 100644 while (!this.serverCommandQueue.isEmpty()) { ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0); -@@ -440,7 +442,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -446,7 +448,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer // CraftBukkit end } @@ -604,7 +604,7 @@ index 20ed423fa..141673d00 100644 } @Override -@@ -666,6 +668,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -672,6 +674,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @Override public String executeRemoteCommand(String s) { @@ -612,7 +612,7 @@ index 20ed423fa..141673d00 100644 this.remoteControlCommandListener.clearMessages(); this.executeSync(() -> { // CraftBukkit start - fire RemoteServerCommandEvent -@@ -674,10 +677,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -680,10 +683,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer if (event.isCancelled()) { return; } @@ -653,7 +653,7 @@ index 20ed423fa..141673d00 100644 } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a7e471066..5ae12e266 100644 +index 3a969d92e..2d8c37d73 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender; @@ -692,7 +692,7 @@ index a7e471066..5ae12e266 100644 protected BlockPosition ag() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 138bc38e6..906ca1bfa 100644 +index 1f350e335..35e3f1c78 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -37,7 +37,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -704,7 +704,7 @@ index 138bc38e6..906ca1bfa 100644 public abstract class EntityLiving extends Entity { -@@ -2260,7 +2260,6 @@ public abstract class EntityLiving extends Entity { +@@ -2262,7 +2262,6 @@ public abstract class EntityLiving extends Entity { @Override public void tick() { @@ -712,7 +712,7 @@ index 138bc38e6..906ca1bfa 100644 super.tick(); this.o(); this.r(); -@@ -2348,9 +2347,7 @@ public abstract class EntityLiving extends Entity { +@@ -2350,9 +2349,7 @@ public abstract class EntityLiving extends Entity { } } @@ -722,7 +722,7 @@ index 138bc38e6..906ca1bfa 100644 double d0 = this.locX() - this.lastX; double d1 = this.locZ() - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -2430,8 +2427,6 @@ public abstract class EntityLiving extends Entity { +@@ -2432,8 +2429,6 @@ public abstract class EntityLiving extends Entity { if (this.isSleeping()) { this.pitch = 0.0F; } @@ -731,7 +731,7 @@ index 138bc38e6..906ca1bfa 100644 } protected float f(float f, float f1) { -@@ -2510,7 +2505,6 @@ public abstract class EntityLiving extends Entity { +@@ -2512,7 +2507,6 @@ public abstract class EntityLiving extends Entity { this.setMot(d4, d5, d6); this.world.getMethodProfiler().enter("ai"); @@ -739,7 +739,7 @@ index 138bc38e6..906ca1bfa 100644 if (this.isFrozen()) { this.jumping = false; this.aZ = 0.0F; -@@ -2520,7 +2514,6 @@ public abstract class EntityLiving extends Entity { +@@ -2522,7 +2516,6 @@ public abstract class EntityLiving extends Entity { this.doTick(); this.world.getMethodProfiler().exit(); } @@ -747,7 +747,7 @@ index 138bc38e6..906ca1bfa 100644 this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().enter("jump"); -@@ -2544,9 +2537,7 @@ public abstract class EntityLiving extends Entity { +@@ -2546,9 +2539,7 @@ public abstract class EntityLiving extends Entity { this.n(); AxisAlignedBB axisalignedbb = this.getBoundingBox(); @@ -757,7 +757,7 @@ index 138bc38e6..906ca1bfa 100644 this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().enter("push"); if (this.bn > 0) { -@@ -2554,9 +2545,7 @@ public abstract class EntityLiving extends Entity { +@@ -2556,9 +2547,7 @@ public abstract class EntityLiving extends Entity { this.a(axisalignedbb, this.getBoundingBox()); } @@ -768,7 +768,7 @@ index 138bc38e6..906ca1bfa 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a389fb5df..49c0764f1 100644 +index b4a0bd795..4dc691775 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -63,7 +63,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -791,7 +791,7 @@ index a389fb5df..49c0764f1 100644 private final IReloadableResourceManager ae; private final ResourcePackRepository resourcePackRepository; @Nullable -@@ -693,6 +693,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit @@ -859,7 +859,7 @@ index a389fb5df..49c0764f1 100644 } this.methodProfiler.enter("snooper"); -@@ -1021,30 +1037,34 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant> f(ChunkCoordIntPair chunkcoordintpair) { return CompletableFuture.supplyAsync(() -> { - try { -- NBTTagCompound nbttagcompound = this.readChunkData(chunkcoordintpair); + try (Timing ignored = this.world.timings.syncChunkLoadTimer.startTimingIfSync()) { // Paper + this.world.getMethodProfiler().c("chunkLoad"); +- NBTTagCompound nbttagcompound = this.readChunkData(chunkcoordintpair); + NBTTagCompound nbttagcompound; // Paper -+ try (Timing ignored2 = this.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper -+ nbttagcompound = this.readChunkData(chunkcoordintpair); -+ } ++ try (Timing ignored2 = this.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper start - timings ++ nbttagcompound = this.readChunkData(chunkcoordintpair); ++ } // Paper end if (nbttagcompound != null) { boolean flag = nbttagcompound.hasKeyOfType("Level", 10) && nbttagcompound.getCompound("Level").hasKeyOfType("Status", 8); -@@ -515,7 +520,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -519,7 +524,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { + return "chunkGenerate " + chunkstatus.d(); }); - return completablefuture.thenComposeAsync((either) -> { - return (CompletableFuture) either.map((list) -> { + return either.map((list) -> { // Paper - Shut up. try { CompletableFuture> completablefuture1 = chunkstatus.a(this.world, this.chunkGenerator, this.definedStructureManager, this.lightEngine, (ichunkaccess) -> { return this.c(playerchunk); -@@ -568,6 +573,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -572,6 +577,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { ChunkStatus chunkstatus = PlayerChunk.getChunkStatus(playerchunk.getTicketLevel()); return !chunkstatus.b(ChunkStatus.FULL) ? PlayerChunk.UNLOADED_CHUNK_ACCESS : either.mapLeft((ichunkaccess) -> { @@ -988,7 +989,7 @@ index a4b246dc4..cd1579750 100644 ChunkCoordIntPair chunkcoordintpair = playerchunk.i(); Chunk chunk; -@@ -619,6 +625,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -623,6 +629,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } return chunk; @@ -996,7 +997,7 @@ index a4b246dc4..cd1579750 100644 }); }, (runnable) -> { Mailbox mailbox = this.mailboxMain; -@@ -1055,6 +1062,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1060,6 +1067,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { PlayerChunkMap.EntityTracker playerchunkmap_entitytracker; ObjectIterator objectiterator; @@ -1004,7 +1005,7 @@ index a4b246dc4..cd1579750 100644 for (objectiterator = this.trackedEntities.values().iterator(); objectiterator.hasNext(); playerchunkmap_entitytracker.trackerEntry.a()) { playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next(); -@@ -1072,16 +1080,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1077,16 +1085,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { playerchunkmap_entitytracker.e = sectionposition1; } } @@ -1201,7 +1202,7 @@ index 820180ab3..fa6400dcc 100644 private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); public CraftPersistentDataContainer persistentDataContainer; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9f0fce400..f1860809c 100644 +index 8fc88f162..0087bd9b1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,5 +1,7 @@ @@ -1256,7 +1257,7 @@ index 9f0fce400..f1860809c 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 c9646ebf7..924dd5e7f 100644 +index 32f8f2aed..bc1ff7d56 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,6 +1,8 @@ @@ -1361,7 +1362,7 @@ index c9646ebf7..924dd5e7f 100644 gameprofilerfiller.exit(); } -@@ -789,6 +799,7 @@ public class WorldServer extends World { +@@ -799,6 +809,7 @@ public class WorldServer extends World { if (!flag1) { org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit @@ -1369,7 +1370,7 @@ index c9646ebf7..924dd5e7f 100644 if (iprogressupdate != null) { iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0])); } -@@ -798,7 +809,10 @@ public class WorldServer extends World { +@@ -808,7 +819,10 @@ public class WorldServer extends World { iprogressupdate.c(new ChatMessage("menu.savingChunks", new Object[0])); } @@ -1767,7 +1768,7 @@ index e52ef47b7..3d90b3426 100644 this.value = value; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index adad3a0fa..7d22aaffb 100644 +index 1860fbb1b..50a69e4cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -288,6 +288,13 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -1846,5 +1847,5 @@ index ca7789b5e..442383969 100644 } } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch index 41ef20d84..8bd547111 100644 --- a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,4 +1,4 @@ -From f4a32cb8e79a1b96763a49698efb4c47fbb8ee4f Mon Sep 17 00:00:00 2001 +From 0b9dc837fc1abb6f576c48421e4fc7db4bc8f5d9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:02:51 -0600 Subject: [PATCH] Configurable cactus and reed natural growth heights @@ -49,5 +49,5 @@ index 2106b0b49..55b07444e 100644 if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch index 15838eaa4..ab54b8d75 100644 --- a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch @@ -1,4 +1,4 @@ -From bade12a066ada64083a1daf5fc32fb5a14b6bf68 Mon Sep 17 00:00:00 2001 +From b2087fc3339513038a7930819666f0fdc0e658e1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:09:16 -0600 Subject: [PATCH] Configurable baby zombie movement speed @@ -25,7 +25,7 @@ index 098bd3fba..912611cf1 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index de818d618..6333d2234 100644 +index 7783b5791..0240cef74 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -21,7 +21,7 @@ public class EntityZombie extends EntityMonster { @@ -50,5 +50,5 @@ index de818d618..6333d2234 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index f91921848..638db391c 100644 --- a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -1,4 +1,4 @@ -From 2afe3ea7a4250da4d96188478296fa730ce63a9b Mon Sep 17 00:00:00 2001 +From 240b7f7dd0fb5db55639bfb8d89afc8c0b5be479 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:14:11 -0600 Subject: [PATCH] Configurable fishing time ranges @@ -37,5 +37,5 @@ index c899a99eb..b10de807e 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch index a758e3b2e..ed7bea03f 100644 --- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch @@ -1,4 +1,4 @@ -From 7c8195f46ff705cfc7a46c21106ee408888467b3 Mon Sep 17 00:00:00 2001 +From 707abbdbec330465f469dbcdb681ba4f40bed7c7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump @@ -31,7 +31,7 @@ index 2e869004c..8a6856e0f 100644 this.b.setJumping(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index e0434ff12..25b613249 100644 +index 7ee5eb987..e3603685b 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -32,6 +32,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -81,5 +81,5 @@ index 0f0dc7277..43908b040 100644 public void e() { if (this.a.getRandom().nextFloat() < 0.8F) { -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch index 49f264ad6..d6eafd648 100644 --- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From 489eaf7838b02a8c749d5b3322f22f58ae5f54ef Mon Sep 17 00:00:00 2001 +From 304877d731851ff356c497d69c2ab8f5943a3c7c Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 1 Mar 2016 13:51:54 -0600 Subject: [PATCH] Add configurable despawn distances for living entities @@ -30,7 +30,7 @@ index 6d6a68cb1..284568641 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 25b613249..6e84d6532 100644 +index e3603685b..e1c254dd5 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -622,11 +622,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -48,5 +48,5 @@ index 25b613249..6e84d6532 100644 } else if (d0 < 1024.0D) { this.ticksFarFromPlayer = 0; -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch index db92d4ac6..e688e6643 100644 --- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch @@ -1,4 +1,4 @@ -From abaf524aa29e451b1d24a0584dcb402a0438be0b Mon Sep 17 00:00:00 2001 +From e94943ac122bf5ad88188d2154869dd248cf4e3b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 03:53:43 -0600 Subject: [PATCH] Allow for toggling of spawn chunks @@ -20,7 +20,7 @@ index 284568641..8ee2b9bb1 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 542262fc8..53757ee20 100644 +index 0087bd9b1..28e67245a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -152,6 +152,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -32,5 +32,5 @@ index 542262fc8..53757ee20 100644 this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch index 04fa07f69..c3b49f6fa 100644 --- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,4 +1,4 @@ -From 8fef6035f0ea836e8208b66289ed875dc03c7119 Mon Sep 17 00:00:00 2001 +From 0d02917faaabe3e4f15f1a313926804bc6d2d5a8 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height @@ -24,7 +24,7 @@ index 8ee2b9bb1..d59b82b7b 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5ae12e266..384b892a4 100644 +index 2d8c37d73..706bab8a1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1814,6 +1814,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -36,7 +36,7 @@ index 5ae12e266..384b892a4 100644 public EntityItem a(ItemStack itemstack, float f) { if (itemstack.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 20cb7dbaf..0342c873a 100644 +index 4b4e71bf7..cb21ce0b1 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -85,6 +85,16 @@ public class EntityFallingBlock extends Entity { @@ -86,5 +86,5 @@ index 1094190fd..35dbed40d 100644 Validate.isTrue(newValue >= 0, "Value must be greater than or equal to 0"); Validate.isTrue(statistic.getType() == Type.ENTITY, "This statistic does not take an EntityType parameter"); -- -2.25.0 +2.25.0.windows.1 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 f34d8a8bc..db5cd1563 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 c6a8ec94558adb3989105fa9bed3b84877e18810 Mon Sep 17 00:00:00 2001 +From f2c62a81754d979f3fa97d173a70a27352ccb8c7 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 3f35a28b..cf00f35a 100644 +index 3f35a28ba..cf00f35a5 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -19,10 +19,10 @@ index 3f35a28b..cf00f35a 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 49c0764f..9117fcfd 100644 +index 4dc691775..2b3844ae5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1330,7 +1330,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 27 May 2019 03:40:05 -0500 Subject: [PATCH] Implement Paper VersionChecker @@ -126,7 +126,7 @@ index 000000000..5deed3e25 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 48a191ae0..21bfdf9e7 100644 +index 50a69e4cb..9fed3cd5d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -293,6 +293,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -142,5 +142,5 @@ index 48a191ae0..21bfdf9e7 100644 /** -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch index cabbd895b..e1d47be91 100644 --- a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch +++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch @@ -1,11 +1,11 @@ -From eff79b832f995fb9394e5d7a749db0fbde4999fb Mon Sep 17 00:00:00 2001 +From 5afaae6ebc8d1bf522cee00d8cef33821bcad970 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Thu, 1 Mar 2018 19:37:52 -0600 Subject: [PATCH] Add version history to version command diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index ded51d042b..513cddb9bd 100644 +index 5deed3e25..49a38c660 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -25,7 +25,10 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -42,7 +42,7 @@ index ded51d042b..513cddb9bd 100644 } diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java new file mode 100644 -index 0000000000..aac3f66cb2 +index 000000000..aac3f66cb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java @@ -0,0 +1,145 @@ @@ -192,10 +192,10 @@ index 0000000000..aac3f66cb2 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ce3ca4830e..895049287c 100644 +index e636433b1..a78896dc8 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -173,6 +173,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer return false; } com.destroystokyo.paper.PaperConfig.registerCommands(); @@ -204,5 +204,5 @@ index ce3ca4830e..895049287c 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index 8c15df1a2..2617d01ec 100644 --- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 2bb7bc0363be41f9ab07fe70282b52dfc32f3a65 Mon Sep 17 00:00:00 2001 +From 54a20d91ce0ef3e854dfc89bea1b34ee94554197 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 33470b594..bf5e949c3 100644 +index 1adeeb9c4..747f5eeb6 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -71,6 +71,9 @@ public abstract class EntityHuman extends EntityLiving { @@ -69,5 +69,5 @@ index 35dbed40d..f7a4fdb83 100644 @Override public void updateCommands() { -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch index 1c3a8a3af..43cb7cf64 100644 --- a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,4 +1,4 @@ -From aafa39f2c1441391d0ccf971113495d782ed68ea Mon Sep 17 00:00:00 2001 +From 25bc4ba2c424139f3a547e135bf830164fd857b6 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 15:08:03 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities @@ -20,5 +20,5 @@ index 5f9031257..f62429277 100644 System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ() + " (" + getType(blockposition) + ") where there was no entity tile!"); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch index e43c29c59..8f73495dc 100644 --- a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From ae64864f32d5c93aafbde72778c4bec2f343559f Mon Sep 17 00:00:00 2001 +From 35a616343d39f558da5ef9e28b9321df2dc689fe Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 22:55:25 -0600 Subject: [PATCH] Optimize TileEntity Ticking @@ -182,5 +182,5 @@ index 68737be5e..17c39edca 100644 public boolean a(EntityHuman entityhuman) { -- -2.24.0 +2.25.0.windows.1 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 57ed41f31..4171d6fde 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 049e41c77685600f9b77890820704ae2cf3300cf Mon Sep 17 00:00:00 2001 +From 5892731b5b164988c9063a63a9df78d6a7af129c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b9b4e04ad..983b6906e 100644 +index 2b3844ae5..7b8c523e6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -160,7 +160,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch index d554f605e..7cec4d413 100644 --- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch @@ -1,4 +1,4 @@ -From e95304620ecb6fec01564333a4c012787b513870 Mon Sep 17 00:00:00 2001 +From 5b50bfeefeb9e701e1f5e75c9ca849b82b0b6c52 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed @@ -24,5 +24,5 @@ index f7a4fdb83..918045408 100644 @Override -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index 34d5830f8..1f8a3474c 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From fec6c0a48a5a02df39161b7b8be75639cb0735f2 Mon Sep 17 00:00:00 2001 +From f394d66b388a13b0538381f70c637c2154cf5bdb Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2c36fc71c..29e6b88d2 100644 +index 706bab8a1..ecf9f9f76 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -167,6 +167,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -51,10 +51,10 @@ index 2c36fc71c..29e6b88d2 100644 NBTTagList nbttaglist = new NBTTagList(); double[] adouble1 = adouble; diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 0342c873a..c3c3e58ce 100644 +index cb21ce0b1..40fd012ae 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -252,6 +252,14 @@ public class EntityFallingBlock extends Entity { +@@ -253,6 +253,14 @@ public class EntityFallingBlock extends Entity { this.block = Blocks.SAND.getBlockData(); } @@ -101,10 +101,10 @@ index 5406f4c40..d778eac45 100644 if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 924dd5e7f..0584cd314 100644 +index bc1ff7d56..948438829 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1164,6 +1164,11 @@ public class WorldServer extends World { +@@ -1174,6 +1174,11 @@ public class WorldServer extends World { this.navigators.add(((EntityInsentient) entity).getNavigation()); } entity.valid = true; // CraftBukkit @@ -134,5 +134,5 @@ index c82c21326..a29693674 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch index 48351a765..bd2ffd380 100644 --- a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch @@ -1,4 +1,4 @@ -From 8fb5fc5d8d43a02dbfa67bae041deff8c09989c2 Mon Sep 17 00:00:00 2001 +From 2065a0021b8e509b2b91bb778ff36e7164470362 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:52:34 -0600 Subject: [PATCH] Prevent tile entity and entity crashes @@ -23,7 +23,7 @@ index fa6400dcc..e2f3cec74 100644 } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 53757ee20..5793ebd00 100644 +index 28e67245a..806768aeb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -687,11 +687,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -64,5 +64,5 @@ index 53757ee20..5793ebd00 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch index fe6991ae3..48cd2f9a7 100644 --- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch @@ -1,4 +1,4 @@ -From b72bf1ab0143c458b17f8fe333df6f52c7d1c8af Mon Sep 17 00:00:00 2001 +From 66cc209a149c04e13e7100ffa03174f3256ef3f0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage @@ -29,7 +29,7 @@ index d59b82b7b..f7a0a33e4 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 29e6b88d2..2aea9ba50 100644 +index ecf9f9f76..1ce080287 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -407,9 +407,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -96,5 +96,5 @@ index e7fc442c8..1b64ad824 100644 // this.doPortalTick(); // CraftBukkit - handled in postTick if (this.world.isClientSide) { -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch index d7dfb7fbb..722bc1c50 100644 --- a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,11 +1,11 @@ -From c152aca8fcec30e72124c9311bbeae06f6aa1c34 Mon Sep 17 00:00:00 2001 +From 6d8ac7f73c806da3041acc6f0af36b81acf64b2e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:03:55 -0600 Subject: [PATCH] Check online mode before converting and renaming player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 97bac7d257..a0254d8e51 100644 +index 97bac7d25..a0254d8e5 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -18,5 +18,5 @@ index 97bac7d257..a0254d8e51 100644 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch index 88cf951c1..238f696ce 100644 --- a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch @@ -1,11 +1,11 @@ -From 8576f528af0499d34185a87f3f3435d7eceea674 Mon Sep 17 00:00:00 2001 +From 180acebaa18e225da5408a5fcaee99729b8bd110 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:32:25 -0600 Subject: [PATCH] Always tick falling blocks diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 106e9d7e2d..7341dc2c1c 100644 +index 442383969..f86404f83 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature; @@ -25,5 +25,5 @@ index 106e9d7e2d..7341dc2c1c 100644 || entity instanceof EntityFireworks || entity instanceof EntityThrownTrident ) -- -2.21.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index 1b3072e40..fb9bb1642 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From 4463ac4edd3976bed5a7596736d4f9ea558630fa Mon Sep 17 00:00:00 2001 +From 8effbabd66a3a27d839b6ef5ea2a3d3d971354d4 Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits @@ -20,7 +20,7 @@ index f7a0a33e4..50dec5cb5 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5fe744ae8..aa509b636 100644 +index ce4821092..bc0a1585d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -41,5 +41,5 @@ index 5fe744ae8..aa509b636 100644 this.cm = true; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch index 0fca85a31..9e768753a 100644 --- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,11 +1,11 @@ -From 682369f59b4dab57e3950544df0c5eebd23620aa Mon Sep 17 00:00:00 2001 +From ba7b394464d30072299b40f04cfb9bbfe859f848 Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 4033f680c..4398f7441 100644 +index 4b1bba1c9..d2c31ac1f 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -151,7 +151,14 @@ public class Explosion { @@ -37,5 +37,5 @@ index c75ed9ddc..c1f462d9d 100644 return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative(); }; -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index 458c8ef52..ae5a69ae7 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From eec5541d4e4b72b627794f842de2b26d94865944 Mon Sep 17 00:00:00 2001 +From b75d6749802e94b6b8699d9513fe0a111d373ab6 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -123,10 +123,10 @@ index d2c31ac1f..64cf5a29c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 983b6906e..81d3a5262 100644 +index 7b8c523e6..3d580a666 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1170,6 +1170,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback @@ -19,10 +19,10 @@ index f038d3f7d..25e071718 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 906ca1bfa..e38be6eba 100644 +index 35e3f1c78..9bd673700 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1071,6 +1071,7 @@ public abstract class EntityLiving extends Entity { +@@ -1073,6 +1073,7 @@ public abstract class EntityLiving extends Entity { } } @@ -30,7 +30,7 @@ index 906ca1bfa..e38be6eba 100644 if (flag1) { if (flag) { this.world.broadcastEntityEffect(this, (byte) 29); -@@ -1089,6 +1090,7 @@ public abstract class EntityLiving extends Entity { +@@ -1091,6 +1092,7 @@ public abstract class EntityLiving extends Entity { b0 = 2; } @@ -38,7 +38,7 @@ index 906ca1bfa..e38be6eba 100644 this.world.broadcastEntityEffect(this, b0); } -@@ -1112,6 +1114,8 @@ public abstract class EntityLiving extends Entity { +@@ -1114,6 +1116,8 @@ public abstract class EntityLiving extends Entity { } } @@ -48,7 +48,7 @@ index 906ca1bfa..e38be6eba 100644 if (!this.f(damagesource)) { SoundEffect soundeffect = this.getSoundDeath(); diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 069ffb141..8e134ba89 100644 +index 64cf5a29c..8762a566d 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -193,14 +193,14 @@ public class Explosion { @@ -69,5 +69,5 @@ index 069ffb141..8e134ba89 100644 } } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch index e1f16da1e..7328435b2 100644 --- a/Spigot-Server-Patches/0034-Disable-thunder.patch +++ b/Spigot-Server-Patches/0034-Disable-thunder.patch @@ -1,4 +1,4 @@ -From b2aec65ac322df62cebdd5deb0cfaa32a2d94714 Mon Sep 17 00:00:00 2001 +From af390b8d5170b906a3d0ffe790f153f561f9e511 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -19,7 +19,7 @@ index 25e071718..41436a4ea 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0584cd314..387136140 100644 +index 948438829..5adb59172 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -446,7 +446,7 @@ public class WorldServer extends World { @@ -32,5 +32,5 @@ index 0584cd314..387136140 100644 if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch index 03f45dae8..67f71d318 100644 --- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch @@ -1,4 +1,4 @@ -From ea36944e4b2f0f7c0edff0ff49ce97e08870ba48 Mon Sep 17 00:00:00 2001 +From 113e75e1dda3f6ba8ec9bef997ab5068c2cf4de0 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -19,7 +19,7 @@ index 41436a4ea..f53d8b967 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 387136140..c40aebc41 100644 +index 5adb59172..173e3857e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -466,7 +466,7 @@ public class WorldServer extends World { @@ -32,5 +32,5 @@ index 387136140..c40aebc41 100644 BlockPosition blockposition1 = blockposition.down(); BiomeBase biomebase = this.getBiome(blockposition); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch index 85e7e3722..1a9b5d755 100644 --- a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch @@ -1,4 +1,4 @@ -From a5c5c4e007001bce2c77cf3267946058c89d7b06 Mon Sep 17 00:00:00 2001 +From 11d856c9142722c092742373c440eb2dd8f6ecf2 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 15:03:53 -0600 Subject: [PATCH] Configurable mob spawner tick rate @@ -64,5 +64,5 @@ index 813de2a6d..deb32db2b 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch index 3fc74873a..814fa8d5b 100644 --- a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch +++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch @@ -1,4 +1,4 @@ -From f412c674a6f0cae1ba9680b6f8666c9d49f87813 Mon Sep 17 00:00:00 2001 +From b4faae88abba8ea23a3d5a3b1f30d1be8e1983f1 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 2 Mar 2016 23:13:07 -0600 Subject: [PATCH] Send absolute position the first time an entity is seen @@ -77,10 +77,10 @@ index a75e0ec54..a13fd9b34 100644 this.c(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index cd1579750..17275c35f 100644 +index dcfb37004..89433004d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -1181,10 +1181,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1186,10 +1186,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { private final Entity tracker; private final int trackingDistance; private SectionPosition e; @@ -97,7 +97,7 @@ index cd1579750..17275c35f 100644 this.tracker = entity; this.trackingDistance = i; this.e = SectionPosition.a(entity); -@@ -1266,7 +1270,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1271,7 +1275,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId())); // CraftBukkit end @@ -107,5 +107,5 @@ index cd1579750..17275c35f 100644 } } else if (this.trackedPlayers.remove(entityplayer)) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch index 6f8bb534f..cbfa77d98 100644 --- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch @@ -1,11 +1,11 @@ -From d2e4d23521f1cc249c8ac8f6a5cc93c5c83240db Mon Sep 17 00:00:00 2001 +From f3f2ed87c739c1d162682a01e484e8460f62bc8e Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java -index 69d59a9f88..e510234db5 100644 +index 9614bec20..f62cf7219 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -14,6 +14,11 @@ import org.bukkit.craftbukkit.potion.CraftPotionUtil; @@ -67,5 +67,5 @@ index 69d59a9f88..e510234db5 100644 } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch index cfb10cd77..18747264a 100644 --- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch @@ -1,11 +1,11 @@ -From ae39546f7311f4271e399ee78803c75ea67c0f7e Mon Sep 17 00:00:00 2001 +From 276892365068cb1f6cd5535e5975d48caadf6407 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2e9bbc7e9..6c775986d 100644 +index 428deed56..a4da22ea6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -176,4 +176,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 2e9bbc7e9..6c775986d 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index eecdade96..55e8174bf 100644 +index bc0a1585d..f03395e2d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -45,5 +45,5 @@ index eecdade96..55e8174bf 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.23.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch index 0bb37a794..a5777334b 100644 --- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch @@ -1,4 +1,4 @@ -From a7b457ccb383638f2d1f86e5530ad98c3d75bcbd Mon Sep 17 00:00:00 2001 +From 032e1559199d44e5ed104c1df340049143915850 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 2 Mar 2016 23:42:37 -0600 Subject: [PATCH] Use UserCache for player heads @@ -24,5 +24,5 @@ index a6e95a909..4fb27cc7e 100644 return true; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index ff455b355..e6ff98b50 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -1,11 +1,11 @@ -From 2357ec11aeeff0b009a8d7c978218a13f0a566c3 Mon Sep 17 00:00:00 2001 +From f5ecc048426774f101e8e338b0f4ce954ac3bbdb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:45:17 -0600 Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5eff80d35..f4598134e 100644 +index 94eceac2f..634ec82b1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -658,9 +658,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -20,5 +20,5 @@ index 5eff80d35..f4598134e 100644 TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch index f8ff9180c..95a0c40fd 100644 --- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From dab65a988fe0797faad9731359cfd9b36751931b Mon Sep 17 00:00:00 2001 +From 323db20b3fd4afef99c64e7ed9ec50af17638871 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -32,5 +32,5 @@ index 1652a57e2..948a6e3b7 100644 String s1 = "local"; -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch index 6d36e9a9d..3eb63ea7a 100644 --- a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch +++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch @@ -1,4 +1,4 @@ -From 7687b0b9af411a973b794867e15d793d9e02ccd8 Mon Sep 17 00:00:00 2001 +From 9397491dad4f775c038000ad80dba9fa5704eb2a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:13:45 -0600 Subject: [PATCH] Configurable Disabling Cat Chest Detection @@ -36,5 +36,5 @@ index 033cb78d9..72fb92f7c 100644 if (!list.isEmpty()) { -- -2.24.0 +2.25.0.windows.1 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 b89dc2a7e..f8d316365 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 935414e173cae94fea0a72650e1d0030dcd85abb Mon Sep 17 00:00:00 2001 +From 5e6c1c9f400ed29514f3a5ff3ee87014e56f529e 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,7 +48,7 @@ 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 9071f3f2e..82d73bc10 100644 +index 0f84f3243..3fe8c34b8 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 { @@ -118,5 +118,5 @@ index e7b953ca3..ccea803f5 100644 { String[] split = restartScript.split( " " ); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch index 433b54866..fbef11ee3 100644 --- a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,4 +1,4 @@ -From ecd92c0006460eebd39762c760e565c218971cc5 Mon Sep 17 00:00:00 2001 +From 7c53690eb26599b91ca4ea2ad52a7b41640e19b8 Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle @@ -32,5 +32,5 @@ index 8e8526f37..3ecf73219 100644 if (random.nextInt(10) == 0 && flag && blockposition.getY() < 40) { return a(entitytypes, generatoraccess, enummobspawn, blockposition, random); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch index 64c431dc8..98c31dcaa 100644 --- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 71b2c1cb1242909e944ae6d3d572194c0740dc8b Mon Sep 17 00:00:00 2001 +From e9d95dfb7c49005ccf7726b8a13e3657aafc2f34 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 82d73bc10..a050fb87a 100644 +index 3fe8c34b8..20d454052 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 { @@ -17,5 +17,5 @@ index 82d73bc10..a050fb87a 100644 return commandMap; } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch index 2aa46980d..cdff3a920 100644 --- a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,4 +1,4 @@ -From 050e035a301c95145bb4c1c8f0c4a74a67d15f6d Mon Sep 17 00:00:00 2001 +From 9868dee937b6010be09250aef0f9c5f54adc6c29 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 Subject: [PATCH] Be a bit more informative in maxHealth exception @@ -21,5 +21,5 @@ index 9c1d4e758..029c2d475 100644 getHandle().setHealth((float) health); -- -2.22.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch index 9237836c7..cd813c844 100644 --- a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From b5b16593609b5cb8671f34aba347a44b0b09eea7 Mon Sep 17 00:00:00 2001 +From 6c3be7ba6d6fbcd4e5eb7895ce4e133b7cc53157 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -160,5 +160,5 @@ index 918045408..bbf5a652f 100644 public String getDisplayName() { return getHandle().displayName; -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch index 47a02c5f1..73334e1c8 100644 --- a/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch @@ -1,11 +1,11 @@ -From 7faee6b12019d2729f6714e3c97c8e5baa2aef99 Mon Sep 17 00:00:00 2001 +From d9325e0572213e7239ba0425215947c143a2d00f Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java -index 5cebc7506f..b4fcab4f08 100644 +index e38438db6..0c3a2f080 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -201,7 +201,7 @@ public abstract class Container { @@ -18,5 +18,5 @@ index 5cebc7506f..b4fcab4f08 100644 itemstack1 = playerinventory.getCarried(); if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.i.size()) && this.b(slot)) { -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch index 5beae7257..ffd390582 100644 --- a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch @@ -1,4 +1,4 @@ -From c48197025b94d692932bad5256ceb2e1a7fc2b50 Mon Sep 17 00:00:00 2001 +From a34e81c451d01fbd7f311f3795b76f30a71cce1b Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list @@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list use sets for faster removal diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f4598134e..6435b71ce 100644 +index 634ec82b1..cb369665c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -40,7 +40,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -15,9 +15,9 @@ index f4598134e..6435b71ce 100644 protected final List tileEntityListPending = Lists.newArrayList(); - protected final List tileEntityListUnload = Lists.newArrayList(); + protected final java.util.Set tileEntityListUnload = com.google.common.collect.Sets.newHashSet(); - final Thread serverThread; // CraftBukkit - package private // PAIL + public final Thread serverThread; private int c; protected int i = (new Random()).nextInt(); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch index 3f8aac4eb..5a27502e3 100644 --- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch @@ -1,4 +1,4 @@ -From 9331a06c96c797e2ddbf697c45a5f2f70bbc4f1e Mon Sep 17 00:00:00 2001 +From 7fd41e3eaf2305ff8ba5253e7ed1d7e5fd53c42e Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius @@ -21,7 +21,7 @@ index 62e793b71..cd47a4ca0 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4fcba0c0d..6314c4a19 100644 +index 1ce080287..be39f38d5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2574,7 +2574,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -34,7 +34,7 @@ index 4fcba0c0d..6314c4a19 100644 return null; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ab2d8015a..586c9c8ce 100644 +index f03395e2d..4289aadc6 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -751,7 +751,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -49,7 +49,7 @@ index ab2d8015a..586c9c8ce 100644 if (event.isCancelled() || event.getTo() == null) { return null; diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 503e3016a..b5f224e3b 100644 +index 19c54f1dd..f84dd6d9b 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -45,7 +45,7 @@ public class PortalTravelAgent { diff --git a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch index 7df47b12e..1ac6ea6ae 100644 --- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From 4a11cde4aec5f912cdb2443ccb89f201fb9e8eef Mon Sep 17 00:00:00 2001 +From 098fda9a90e274c5aa35932340f5d97283e09d86 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 a050fb87a..733abbbd9 100644 +index 20d454052..1e90c9c92 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 { @@ -63,7 +63,7 @@ index a29693674..bb07dec3c 100644 public double getHeight() { return getHandle().getHeight(); diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 70b187190..56f5f54bd 100644 +index 73fa74e3c..d96100061 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -76,7 +76,19 @@ public class WatchdogThread extends Thread @@ -88,5 +88,5 @@ index 70b187190..56f5f54bd 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.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch index 8a59250c6..f7957a36d 100644 --- a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch @@ -1,4 +1,4 @@ -From 89d3401e484feef419f291e5a3becd7a54ea107f Mon Sep 17 00:00:00 2001 +From 2a3c98072df76452c7a5d9f6ca485bd0a977c900 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Configurable inter-world teleportation safety @@ -43,5 +43,5 @@ index bbf5a652f..658854dc9 100644 return true; } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch index 5a168a0ad..c575db948 100644 --- a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 3ac6d5034d4d79744302c6eddf3aefc23ef9678a Mon Sep 17 00:00:00 2001 +From c96259dffb4ead729ef3e2e4055b543ce972333c Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -80,7 +80,7 @@ index f62429277..be32b31e7 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 459baf26d..038b7b68d 100644 +index 99afce39a..a3ef6dba7 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -15,6 +15,9 @@ import java.util.function.BooleanSupplier; @@ -121,10 +121,10 @@ index c9c2b0025..1422503e1 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 17275c35f..0886ab11d 100644 +index 89433004d..1627aeeef 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -694,6 +694,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -698,6 +698,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { this.world.checkSession(); } catch (ExceptionWorldConflict exceptionworldconflict) { PlayerChunkMap.LOGGER.error("Couldn't save chunk; already in use by another instance of Minecraft?", exceptionworldconflict); @@ -132,7 +132,7 @@ index 17275c35f..0886ab11d 100644 return false; } -@@ -721,6 +722,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -726,6 +727,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { return true; } catch (Exception exception) { PlayerChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception); @@ -209,7 +209,7 @@ index d5e9bae70..1bcf01c09 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 91cde6351..e89ea2403 100644 +index cb369665c..026007891 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,6 +2,9 @@ package net.minecraft.server; @@ -306,5 +306,5 @@ index 8823f94f7..552daf437 100644 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index f0d730a20..729be50d0 100644 --- a/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From e85e153d9c12b2d68bc3b5005a015cc0c4392305 Mon Sep 17 00:00:00 2001 +From 049488af16a1c77cb3c42e2767c59a25d0f39317 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index fa4eab5b0b..0ab611564e 100644 +index fa4eab5b0..0ab611564 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -29,7 +29,14 @@ public class PacketPlayOutChat implements Packet { @@ -26,5 +26,5 @@ index fa4eab5b0b..0ab611564e 100644 packetdataserializer.a(this.a); } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch index b60bee686..51b36d6dc 100644 --- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From 38ab592e9683f9b24222f701415adebdd3cfb056 Mon Sep 17 00:00:00 2001 +From d9fc47054d84380b936798b383e2b36b58fefc3c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default @@ -25,7 +25,7 @@ index abbf59bb9..04430aae5 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6314c4a19..405badea6 100644 +index be39f38d5..a38dd15f0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2265,6 +2265,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index 6314c4a19..405badea6 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e38be6eba..6e8adb65c 100644 +index 9bd673700..cd9c49747 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -535,6 +535,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 7f2cd8db2..19042135c 100644 --- a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From 8114e0e26ee38a3683d2167e0cba2ff3423bb941 Mon Sep 17 00:00:00 2001 +From fbd11428d86a6c70add046583c3aca83473053c6 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities @@ -26,5 +26,5 @@ index 029c2d475..7e9aff668 100644 + // Paper end } -- -2.22.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch index 28be59774..ebc4ac07e 100644 --- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From 0ec882ebb0a37aab44304a8121daee30f7ad733a Mon Sep 17 00:00:00 2001 +From 9a79f4087ddad325e6977edaff1534ba034fc8da Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API @@ -70,5 +70,5 @@ index 658854dc9..2cdea9f5d 100644 @Override -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch index da82ffa3b..f44d1418d 100644 --- a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From f16bb2a0b8b788e2a8158955ece3ee285c5d126e Mon Sep 17 00:00:00 2001 +From d4cb9bfcff7407bd54270893ed122aa74d4f4611 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index d1f4c4724..4ff261091 100644 +index c2312a227..cee1ea8f4 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -241,7 +241,7 @@ public class RegionFile implements AutoCloseable { @@ -50,5 +50,5 @@ index a7f19c849..2fe27b460 100644 public void close() throws IOException { -- -2.24.1 +2.25.0.windows.1 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 06b22d66e..b56fc45aa 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 ec2f6dd722010823cf75fb05071ee397441b9871 Mon Sep 17 00:00:00 2001 +From 67e3542b25005e84a8d915f65f0430ff933efd2b 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,7 +30,7 @@ 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 733abbbd9..cf12da15c 100644 +index 1e90c9c92..cb7ca7d77 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 { @@ -51,5 +51,5 @@ index 733abbbd9..cf12da15c 100644 syncCommands(); } -- -2.24.0 +2.25.0.windows.1 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 ca82b0815..c328ccb93 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 7f46adeb924e999511d8a4a236380f3228374ce1 Mon Sep 17 00:00:00 2001 +From 2c7034fa47ef57dab2edd1e776bfc9da6f206adf 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,7 +6,7 @@ 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 cf12da15c..110fee6b6 100644 +index cb7ca7d77..f723f01bf 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 { @@ -34,5 +34,5 @@ index cf12da15c..110fee6b6 100644 // Paper end } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index 8a91ad55f..fcc91cbfb 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 7a404dfb43ecfdf375aaa758a34374d93a643f9f Mon Sep 17 00:00:00 2001 +From ae42e08590dd44660b344e7976bf65094fb8e4bc 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,7 +7,7 @@ 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 110fee6b6..09c62261a 100644 +index f723f01bf..c745d0baa 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 { @@ -30,5 +30,5 @@ index 110fee6b6..09c62261a 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch index cd566a1e6..8f4dc3086 100644 --- a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 60ee3be356dc4198bb2335d982aa1f2849125fbf Mon Sep 17 00:00:00 2001 +From f5ef9c2edc0495ffb71c6449542838dd2019d5cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing diff --git a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch index 95fc0040c..4e32b8e34 100644 --- a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From 37b97c56b4967b2c92502eb50025a425499501e7 Mon Sep 17 00:00:00 2001 +From dd9d80cf009bb2aa64bb59893c32238e74cff2ee Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -330,5 +330,5 @@ index 0f901453d..5ee968f2e 100644 + } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch index 34066ec76..1cd45ea2a 100644 --- a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 919cdfa17b475a4bcd78767960cd286dbd642969 Mon Sep 17 00:00:00 2001 +From b85c2b8c568823781b70e9a16ba566eff507f4c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate diff --git a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch index 7c6338495..a6a7c1ab5 100644 --- a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From 538c2d1c4e8c4325641ea2577add8af9f8344c38 Mon Sep 17 00:00:00 2001 +From 4f88e97498979375c61bbe0c22b24ada9606dd6f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5d8404f8a..adc2e8ff7 100644 +index 026007891..37914c2f5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -235,6 +235,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -41,5 +41,5 @@ index 020e5c171..4ee13ac45 100644 return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f(); } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch index 03f714cd3..b9a2884f3 100644 --- a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch @@ -1,14 +1,14 @@ -From b6694f092eb5700091be881e5bf8b231aaf1d2ef Mon Sep 17 00:00:00 2001 +From 54f471c9138e0ee510be393934e6c9bfb7ed78da Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6e8adb65c..14097275c 100644 +index cd9c49747..1eca778d3 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2894,9 +2894,10 @@ public abstract class EntityLiving extends Entity { +@@ -2896,9 +2896,10 @@ public abstract class EntityLiving extends Entity { this.b(this.activeItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; @@ -20,7 +20,7 @@ index 6e8adb65c..14097275c 100644 world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { -@@ -2911,9 +2912,20 @@ public abstract class EntityLiving extends Entity { +@@ -2913,9 +2914,20 @@ public abstract class EntityLiving extends Entity { itemstack = this.activeItem.a(this.world, this); } @@ -42,5 +42,5 @@ index 6e8adb65c..14097275c 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch index e084e1ca0..0d42c0383 100644 --- a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From 4e76e29a4af2856f6b1e20d874d621ac17c9502e Mon Sep 17 00:00:00 2001 +From d6c7cf72d4289db7fc77d417f01ee01abc99b960 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 14097275c..bdbd89996 100644 +index 1eca778d3..08d0728e1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -496,7 +496,13 @@ public abstract class EntityLiving extends Entity { @@ -23,7 +23,7 @@ index 14097275c..bdbd89996 100644 if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) { GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10)); } -@@ -943,6 +949,10 @@ public abstract class EntityLiving extends Entity { +@@ -945,6 +951,10 @@ public abstract class EntityLiving extends Entity { } public void setHealth(float f) { @@ -34,7 +34,7 @@ index 14097275c..bdbd89996 100644 // CraftBukkit start - Handle scaled health if (this instanceof EntityPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); -@@ -2737,7 +2747,7 @@ public abstract class EntityLiving extends Entity { +@@ -2739,7 +2749,7 @@ public abstract class EntityLiving extends Entity { } public void setAbsorptionHearts(float f) { @@ -56,5 +56,5 @@ index 2cdea9f5d..8688b727a 100644 } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch index 742d3e3a8..b78fafd90 100644 --- a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From a66d2f0673a55577a9b59460106869d3de2409f3 Mon Sep 17 00:00:00 2001 +From c25adbfda1a5f7777b14d60914fa241228983718 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround This patch is a workaround for MC-63720 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index 88c3d7efaf..15af5927f3 100644 +index 88c3d7efa..15af5927f 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java @@ -4,7 +4,13 @@ import java.io.IOException; @@ -34,5 +34,5 @@ index 88c3d7efaf..15af5927f3 100644 @Override -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch index 5cc24ea5c..0f7e02b89 100644 --- a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From be7be89645b52c2a417433dc774971a12b5110c4 Mon Sep 17 00:00:00 2001 +From e6571749240e4580c986c049559599aa55a27cb3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2e5426432..167d22574 100644 +index a38dd15f0..6fe4e85d9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -41,5 +41,5 @@ index 2e5426432..167d22574 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch index 9ab8f89bb..381323f7b 100644 --- a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From 3fbb7edf2dc2243cc53b512329fa76f9b44d189b Mon Sep 17 00:00:00 2001 +From 9290f564d1b0d7b30aa8449be4bce60228f0d23f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -22,7 +22,7 @@ index 7de7b74ff..6ef0e1399 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c40aebc41..5bb94fb5e 100644 +index 173e3857e..0146573a3 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -450,7 +450,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 933d6917e..7187abfa5 100644 --- a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From 568ef66bc6542fa409549a32853318be49f874da Mon Sep 17 00:00:00 2001 +From 91f5356e6a891791dc57ff093432a4eed0d57d02 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -77,7 +77,7 @@ index 652067757..0d5deee36 100644 public ChunkSection(int i) { this(i, (short) 0, (short) 0, (short) 0); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4feb3e9d8..182376a0a 100644 +index 37914c2f5..18ee29e50 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -183,11 +183,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -95,5 +95,5 @@ index 4feb3e9d8..182376a0a 100644 public static boolean b(int i) { -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch index f431b1357..1e4521b74 100644 --- a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From 5074a41f7e90ce1a86a80067537d44d94eb76017 Mon Sep 17 00:00:00 2001 +From 664236ee844d81bf401718acc5806c827a160fac Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java -index 5873b76236..ef4cd7a7b6 100644 +index 5873b7623..ef4cd7a7b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java @@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i @@ -64,5 +64,5 @@ index 5873b76236..ef4cd7a7b6 100644 + // Paper end } -- -2.22.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 78cf9d58c..4042b4581 100644 --- a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -1,4 +1,4 @@ -From c0ffb2e399cf9413777905bb93594a900b7506ad Mon Sep 17 00:00:00 2001 +From 67c11042b01cdc1657b9e6701d6572ae0a7a8760 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener @@ -32,10 +32,10 @@ index 42e86881b..6cdce1158 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3f27c1c6c..457eea125 100644 +index 3d580a666..3094f763b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1136,6 +1136,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ea2e92967..38ab4628d 100644 +index 18ee29e50..824a3513a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -390,7 +390,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -66,7 +66,7 @@ index ea2e92967..38ab4628d 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5bb94fb5e..354400504 100644 +index 0146573a3..9161d6fd6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -75,6 +75,7 @@ public class WorldServer extends World { @@ -78,5 +78,5 @@ index 5bb94fb5e..354400504 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch index ba6b45d12..5ec3b1f9c 100644 --- a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,14 +1,14 @@ -From 9a72456102d41c94b143f280a277ac24859c17d5 Mon Sep 17 00:00:00 2001 +From 050929739349814b3532f81e389a5ee3efcb2714 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 354400504..ec8e07d3f 100644 +index 9161d6fd6..2a80fe846 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1132,7 +1132,7 @@ public class WorldServer extends World { +@@ -1142,7 +1142,7 @@ public class WorldServer extends World { if (entity instanceof EntityInsentient) { this.navigators.remove(((EntityInsentient) entity).getNavigation()); } @@ -17,7 +17,7 @@ index 354400504..ec8e07d3f 100644 entity.valid = false; // CraftBukkit } -@@ -1170,6 +1170,7 @@ public class WorldServer extends World { +@@ -1180,6 +1180,7 @@ public class WorldServer extends World { entity.origin = entity.getBukkitEntity().getLocation(); } // Paper end @@ -26,5 +26,5 @@ index 354400504..ec8e07d3f 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch index 870d0b0ce..59258b0f9 100644 --- a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch +++ b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch @@ -1,4 +1,4 @@ -From 336592342a931d216667dd38c95b50124050de28 Mon Sep 17 00:00:00 2001 +From 25fbadf155b0e1ccde33fc04eac74940af7bc4af Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Time diff --git a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch index 5bb74e04e..96267e56c 100644 --- a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 7c9c24d434a54e51e94f3c7160268291af77f2bf Mon Sep 17 00:00:00 2001 +From 139aa286339e8d2dda51c5ea1a2b02d899c1a76d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent @@ -98,5 +98,5 @@ index 5b057e96d..f16c6d1fa 100644 @Override -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch index 990d515de..d71bacc5e 100644 --- a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From 2c63f48776cf7970637588a35f6f5cb92accab89 Mon Sep 17 00:00:00 2001 +From f33920c8054472e73f9e712da3d32a5b34469cf2 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -38,5 +38,5 @@ index 2fe27b460..57ce53cfd 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch index 729fe3319..9eb416696 100644 --- a/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch @@ -1,11 +1,11 @@ -From 82722e2f0678bfcb418043e9d8d3465aaa9697c2 Mon Sep 17 00:00:00 2001 +From 2be2bc274a4a0279e51ed0e5528ae64e613d8b3f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index 818872944..1065c0dec 100644 +index 53c15c1c0..29c66b983 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -27,7 +27,7 @@ public class ChunkCache implements IBlockAccess, ICollisionAccess { @@ -83,5 +83,5 @@ index ef248ebcc..4240ca81c 100644 Material material = iblockdata.getMaterial(); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch index 8e0174cac..ee3c8c877 100644 --- a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 542cb79f92d27d6c006cca7f6b2c7a5c9fec0bee Mon Sep 17 00:00:00 2001 +From 8911d5abc6989c9bd7ef6f59ed6dd5ecce082a72 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -39,5 +39,5 @@ index d90c6a732..f91144693 100644 } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch index a90cc1c89..4b734c7a8 100644 --- a/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,4 +1,4 @@ -From 76c0ebf307133b782fff3fdf6be3b80a39b257af Mon Sep 17 00:00:00 2001 +From d458f33876ae84c9bb64e53c1da195149015d1ab Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client @@ -17,5 +17,5 @@ index 948a6e3b7..05ea0ace5 100644 entityplayer.getStatisticManager().c(); entityplayer.B().a(entityplayer); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch index 9a1ea221e..6ea00c722 100644 --- a/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,4 +1,4 @@ -From 22c0481aa92d6551cabea6b5bd6d4bc8c0646e28 Mon Sep 17 00:00:00 2001 +From 10137f18711c301c13f21a41fc205c5877cbcf2b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index f522f9167..cd7e22e45 100644 --- a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 54d988e5c406fb6f6cacac327c994b2d6132d0b9 Mon Sep 17 00:00:00 2001 +From 19db856846c074e7895453150b99b54385fe9392 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1519e9e6b..4870264c6 100644 +index 824a3513a..e7d441b22 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -460,6 +460,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -17,5 +17,5 @@ index 1519e9e6b..4870264c6 100644 this.a(blockposition.east(), block, blockposition); this.a(blockposition.down(), block, blockposition); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch index 5c1ec47d5..b7b085dc3 100644 --- a/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From ab6f206ddbb3e74fb23a95cedb6c0acdc74f5d54 Mon Sep 17 00:00:00 2001 +From 1143db7ba761c06a82f9e521d6821bd40cb48360 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits @@ -53,5 +53,5 @@ index 2edd9b871..f9680b683 100644 int k = j >> 6; int l = (i + 1) * this.b - 1 >> 6; -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index b8396dd43..785245cf6 100644 --- a/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From 5777cc7c9975620edb3bf09beec4f760c0f66ae1 Mon Sep 17 00:00:00 2001 +From caaba70e8e56d2d3fcfb0ffb4eb88b3a9dcde929 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names diff --git a/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch index f670dfd62..987b6f3d0 100644 --- a/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 7ee6c719c0ddc2ae644174b3952ba4e02035605d Mon Sep 17 00:00:00 2001 +From 6799e6163cba87bf172a941184d8716b3da5fa8c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -28,5 +28,5 @@ index 8688b727a..5647eb135 100644 public void setSneaking(boolean sneak) { getHandle().setSneaking(sneak); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch index 54399a8ae..307cc62d7 100644 --- a/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 8f6b97e704c5433fc6957265c4c2bb776dfc95ab Mon Sep 17 00:00:00 2001 +From 6bbea6f4606dafaf738658a00512fdbddd28c9e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9d68451c8..959d2543c 100644 +index e7d441b22..50c138d06 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -40,7 +40,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -67,10 +67,10 @@ index 9d68451c8..959d2543c 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ec8e07d3f..f5031aed8 100644 +index 2a80fe846..9121aa2e4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1617,7 +1617,7 @@ public class WorldServer extends World { +@@ -1627,7 +1627,7 @@ public class WorldServer extends World { } bufferedwriter.write(String.format("entities: %d\n", this.entitiesById.size())); @@ -79,7 +79,7 @@ index ec8e07d3f..f5031aed8 100644 bufferedwriter.write(String.format("block_ticks: %d\n", this.getBlockTickList().a())); bufferedwriter.write(String.format("fluid_ticks: %d\n", this.getFluidTickList().a())); bufferedwriter.write("distance_manager: " + playerchunkmap.e().c() + "\n"); -@@ -1780,7 +1780,7 @@ public class WorldServer extends World { +@@ -1790,7 +1790,7 @@ public class WorldServer extends World { private void a(Writer writer) throws IOException { CSVWriter csvwriter = CSVWriter.a().a("x").a("y").a("z").a("type").a(writer); @@ -89,5 +89,5 @@ index ec8e07d3f..f5031aed8 100644 while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch index e9cfe2e17..7b00c355c 100644 --- a/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch @@ -1,4 +1,4 @@ -From 3319f42462f09528ba6daa8d7803c92ca0f53cad Mon Sep 17 00:00:00 2001 +From 966b1f2e49ba52fc3f69e567df734e2db2623677 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code @@ -27,5 +27,5 @@ index 99442bb13..177cceb77 100644 Block block = this.getBlock().getBlock(); -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch index 0856a40f2..29bf0a21a 100644 --- a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From 91d001f58b8055d79681b68865013416ce4b818e Mon Sep 17 00:00:00 2001 +From 51a8cb2552bb9d8bea3c784b46500428e0c9c86b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision @@ -19,10 +19,10 @@ index d500cd75a..e4f0db64c 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 25774fb73..696cab131 100644 +index 3094f763b..deffa2ddb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -453,6 +453,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -45,5 +45,5 @@ index 963dbd064..d0b9c6e3d 100644 if ( split.length == 3 || split.length == 4 ) { packethandshakinginsetprotocol.hostname = split[0]; -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch index 47bd5b91a..55341e415 100644 --- a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From ee7d5d106982a5476dcd5f899b0ae62dd576b057 Mon Sep 17 00:00:00 2001 +From 0bfe46238985e32e6f2b732447aac7a0fbadc027 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address @@ -58,5 +58,5 @@ index e48d6dcd7..2ce490be0 100644 this.i = "0.0.0.0"; } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch index f89f10bc0..95750e298 100644 --- a/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 0fca532bd3ecf3a33d32ae4740192ea70fda6067 Mon Sep 17 00:00:00 2001 +From ff45fd6abb41459f6ee61488053d80d6495c40f2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks @@ -53,5 +53,5 @@ index 2909f78f8..0ece78d4d 100644 } -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch index 72ab11f7b..025b14e7a 100644 --- a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 6f4c8c4c2821aefc9c4b9d9559145754d8387185 Mon Sep 17 00:00:00 2001 +From da29415c772bbff8d14c2af933489884c855fb4c Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 586c9c8ce..de4634486 100644 +index 4289aadc6..1f5145d49 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand; @@ -65,5 +65,5 @@ index 5647eb135..447ecf636 100644 { Set ret = new HashSet(); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch index 027640232..8e897ac09 100644 --- a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From e432e5cddfd6f7a262bc077627e112ed651cbaa7 Mon Sep 17 00:00:00 2001 +From 959c74cd7de5d0340edbcd7f365d14d7ce7950c1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -6,10 +6,10 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Don't even get me started diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bdbd89996..191e7dfaf 100644 +index 08d0728e1..dd1caec9d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -922,10 +922,16 @@ public abstract class EntityLiving extends Entity { +@@ -924,10 +924,16 @@ public abstract class EntityLiving extends Entity { } public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) { @@ -41,5 +41,5 @@ index 01d702d5c..c3a9a9bd4 100644 this.foodTickTimer = 0; } -- -2.24.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch index 30e91f7a4..785adadca 100644 --- a/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,4 +1,4 @@ -From eacd489c663c807ba70b9939224dc2d29cf5ddf5 Mon Sep 17 00:00:00 2001 +From e6d0c96e08e21c3bca5bf86573d993ff541e1963 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch index 0d826f3f7..2b96462cd 100644 --- a/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 3479646f77022bda2f0127cf2d914addab3ad3e1 Mon Sep 17 00:00:00 2001 +From 6e2d54dddc8e295098bb5d4afdd38e777ef62fc3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 696cab131..2a40bb0b8 100644 +index deffa2ddb..f45c65877 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -68,6 +68,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot @@ -25,7 +25,7 @@ index 696cab131..2a40bb0b8 100644 this.resourcePackRepository = new ResourcePackRepository<>(ResourcePackLoader::new); this.craftingManager = new CraftingManager(); this.tagRegistry = new TagRegistry(); -@@ -2169,7 +2171,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 4a2009550..2cce9d12f 100644 +index 747f5eeb6..2a54723a6 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -615,6 +615,12 @@ public abstract class EntityHuman extends EntityLiving { @@ -102,10 +102,10 @@ index a56ac3da8..2f1be1995 100644 for ( org.bukkit.map.MapCursor cursor : render.cursors) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f5031aed8..8b3f6b2e1 100644 +index 9121aa2e4..9c20b5f6f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1094,6 +1094,7 @@ public class WorldServer extends World { +@@ -1104,6 +1104,7 @@ public class WorldServer extends World { { if ( iter.next().trackee == entity ) { @@ -127,5 +127,5 @@ index 256a13178..5768cd512 100644 public RenderData() { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch index eead06ab4..457bf2a7b 100644 --- a/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From bceca705427862859ac4918b4b2e189730186c4b Mon Sep 17 00:00:00 2001 +From 768ddfda8040f7a73213932aebaca404ce901518 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -520,7 +520,7 @@ index 000000000..d50410532 + } +} diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4201f5191..5a168037f 100644 +index 6fe4e85d9..9157de0f5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -532,7 +532,7 @@ index 4201f5191..5a168037f 100644 public CraftEntity getBukkitEntity() { diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index 72d0c53cd..fd8e8ae20 100644 +index 34ceace23..60efd439a 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp @@ -591,7 +591,7 @@ index 72d0c53cd..fd8e8ae20 100644 if (entityhuman != null) { diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index 8f776e0df..04a6511ff 100644 +index f5316a404..d4cbce324 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -6,8 +6,9 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index 1e7864fc0..ec49cb66e 100644 --- a/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,4 +1,4 @@ -From c4233c4dd155a34c72f37ecdc80a2cebdd537d8e Mon Sep 17 00:00:00 2001 +From 5f5a1708e434f8f6483ec908c404f2dd456f0d69 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat @@ -31,5 +31,5 @@ index 1eab0c310..6bf66972f 100644 nbttagcompound.setString("Name", scoreboardteam.getName()); -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch index 22ecd79aa..7e71de422 100644 --- a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch @@ -1,11 +1,11 @@ -From 9c7277dfab9dcd62aa8a511cc200a97a058f8334 Mon Sep 17 00:00:00 2001 +From d0c56d4f2d5aca382f551386c18fea7726c654c6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 56f5f54bd..9532aada8 100644 +index d96100061..121c7ff60 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -57,7 +57,7 @@ public class WatchdogThread extends Thread @@ -18,5 +18,5 @@ index 56f5f54bd..9532aada8 100644 Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "------------------------------" ); -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch index d6e8b2051..625ae4ecd 100644 --- a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From 01e45083672563157c8546ae0325ad38e8a9caa1 Mon Sep 17 00:00:00 2001 +From 84457c5734836495012f766a1fd8ca4d96081da7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase the user never changed the default setting for Spigot's save on stop only. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2a40bb0b8..38bf3ea44 100644 +index f45c65877..bdc98d12c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -759,7 +759,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -6,18 +6,18 @@ Subject: [PATCH] Avoid blocking on Network Manager creation Per Paper issue 294 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index bd5563577..e6fac155d 100644 +index e7e216850..9cd7c9064 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -39,6 +39,15 @@ public class ServerConnection { public volatile boolean c; - private final List f = Collections.synchronizedList(Lists.newArrayList()); - private final List listeningChannels = Collections.synchronizedList(Lists.newArrayList()); + private final List listeningChannels = Collections.synchronizedList(Lists.newArrayList()); + private final List connectedChannels = Collections.synchronizedList(Lists.newArrayList()); + // Paper start - prevent blocking on adding a new network manager while the server is ticking + private final List pending = Collections.synchronizedList(Lists.newArrayList()); + private void addPending() { + synchronized (pending) { -+ this.listeningChannels.addAll(pending); ++ connectedChannels.addAll(pending); + pending.clear(); + } + } @@ -29,19 +29,19 @@ index bd5563577..e6fac155d 100644 channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyPingHandler(ServerConnection.this)).addLast("splitter", new PacketSplitter()).addLast("decoder", new PacketDecoder(EnumProtocolDirection.SERVERBOUND)).addLast("prepender", new PacketPrepender()).addLast("encoder", new PacketEncoder(EnumProtocolDirection.CLIENTBOUND)); NetworkManager networkmanager = new NetworkManager(EnumProtocolDirection.SERVERBOUND); -- ServerConnection.this.listeningChannels.add(networkmanager); +- ServerConnection.this.connectedChannels.add(networkmanager); + pending.add(networkmanager); // Paper channel.pipeline().addLast("packet_handler", networkmanager); networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.e, networkmanager)); } @@ -112,6 +121,7 @@ public class ServerConnection { - synchronized (this.listeningChannels) { + synchronized (this.connectedChannels) { // Spigot Start -+ addPending(); // Paper ++ this.addPending(); // Paper // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch index 94ef3a752..b28336345 100644 --- a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch @@ -1,4 +1,4 @@ -From f7302b3957b44d6362167888ffad640ad010e6bb Mon Sep 17 00:00:00 2001 +From db8a15a976806aa35cba6d86c300c6c840b17cbe Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water @@ -32,7 +32,7 @@ index 6db131203..8cf3076f4 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5a168037f..d6da1efd4 100644 +index 9157de0f5..3dff47bc3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2713,6 +2713,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch index 821bb91db..5adea761e 100644 --- a/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From d20759aaff7ab4cb1819c6677dc52aa2871cffa1 Mon Sep 17 00:00:00 2001 +From 8ee359809fdfa59eb43c143b10ffd3693f238ce2 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal @@ -77,7 +77,7 @@ index 98a255ae5..4c3062ece 100644 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7d5f6e220..312e32f1b 100644 +index 50c138d06..c7a4fab1c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -98,6 +98,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -89,5 +89,5 @@ index 7d5f6e220..312e32f1b 100644 public CraftWorld getWorld() { return this.world; -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch index 12019f5c2..7d4df22ef 100644 --- a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch @@ -1,14 +1,14 @@ -From 8a1aad77aff1c228dc3c0b3b00ce5f0f6ffde89d Mon Sep 17 00:00:00 2001 +From 5c109a39c1e11c268d1c4e8f683a25e3b6709e3c Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 2481c1860..4a4e56e76 100644 +index ea7d9f1d0..40e7c895c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -136,6 +136,14 @@ public class Main { +@@ -137,6 +137,14 @@ public class Main { .defaultsTo(new File("paper.yml")) .describedAs("Yml file"); // Paper end @@ -24,5 +24,5 @@ index 2481c1860..4a4e56e76 100644 }; -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 402519ad8..79edec6de 100644 --- a/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From aef341f706c37a285e09e421050f6e029eb47d6c Mon Sep 17 00:00:00 2001 +From 2a7f56466e57511d1fd2ca9274f855a019c5a639 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -42,5 +42,5 @@ index 2edf466ee..2e95069c1 100644 double deltaZ = this.locZ() - player.locZ(); double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch index 2705266ca..a2788213f 100644 --- a/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From d9e254254db880d33ffa8ee1c9c04e297b98cd8b Mon Sep 17 00:00:00 2001 +From 39993e55a99aafb6e160327db8d81fc95c84bc0c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -8,10 +8,10 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8b3f6b2e1..b62e641e6 100644 +index 9c20b5f6f..48737366f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -983,6 +983,7 @@ public class WorldServer extends World { +@@ -993,6 +993,7 @@ public class WorldServer extends World { // CraftBukkit start private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot @@ -20,5 +20,5 @@ index 8b3f6b2e1..b62e641e6 100644 // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch index 166d4d272..42002171c 100644 --- a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From abef8b250ac2af6f388497dc00abd5fbb8fc7c70 Mon Sep 17 00:00:00 2001 +From cf5b5fcf4e9af28f844a2c689178a29310b466db Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -58,5 +58,5 @@ index 4a48c09e9..03f6ddf00 100644 if (this.world instanceof WorldServer) { try { -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index be371d087..710bba4b1 100644 --- a/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,11 +1,11 @@ -From 09d2c6aeec8d9ec23c454e41eff56df692cdf858 Mon Sep 17 00:00:00 2001 +From 4e581e04eb2450565558e23d4ae4e2fa225a704f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 566f3db39..e8143eff4 100644 +index d32bec70d..581199e6d 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -86,7 +86,7 @@ public class UserCache { @@ -18,5 +18,5 @@ index 566f3db39..e8143eff4 100644 GameProfile gameprofile = new GameProfile(uuid, s); -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch index 986f9effe..6ad1de69b 100644 --- a/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch @@ -1,4 +1,4 @@ -From ae8e72862897e15a4aeb4e6acbe938df9cb5ee6e Mon Sep 17 00:00:00 2001 +From da7dfb51186a49d21d5bade2a16ea1cc2cec7699 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message @@ -18,5 +18,5 @@ index 8f182fcc8..53d201c59 100644 Location curPos = this.getPlayer().getLocation(); // Spigot -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch index 076f584e5..6c3fc4769 100644 --- a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch @@ -1,11 +1,11 @@ -From 5076722134520b0ae09562ca892ccf0a0f120c4f Mon Sep 17 00:00:00 2001 +From 20405ad1a330c2f8ae512f7a5847e77c60507495 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index de4634486..8ccaccee3 100644 +index 1f5145d49..b2c070397 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -993,6 +993,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { 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 cb23b411b..5f366b6f1 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 26c83d73e35ac4a256132b67ea1b142006b7b89a Mon Sep 17 00:00:00 2001 +From 9cc11ae8d02de119cafb4bab6df76135c53f09ab 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,7 +45,7 @@ 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 09c62261a..08019fc94 100644 +index c745d0baa..6a8c22b6b 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 { @@ -59,5 +59,5 @@ index 09c62261a..08019fc94 100644 profile = console.getUserCache().getProfile( name ); } -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch index 784b0c1ae..26c2cea90 100644 --- a/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch +++ b/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch @@ -1,4 +1,4 @@ -From ea817a1e785ca6f37864a8d6f05700b020fd05aa Mon Sep 17 00:00:00 2001 +From 2c83bedf7d66dfe55c5b1bd757874c2f4de5f120 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockState's hashCode/equals @@ -83,5 +83,5 @@ index 6f35c365f..0499a7170 100644 return true; } else if (object instanceof BlockStateInteger && super.equals(object)) { -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch index a0d6a79bf..73dd19dba 100644 --- a/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch @@ -1,4 +1,4 @@ -From d2a96b33351af347c2a04ff69900bb0a12cac3a3 Mon Sep 17 00:00:00 2001 +From 82df99d1570b1ea9b89a46e9f3817a764418c61d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold @@ -44,5 +44,5 @@ index 53d201c59..77cfec712 100644 limitedPackets = 0; return true; -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch index 6cd497d81..8a71f9b0e 100644 --- a/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch @@ -1,4 +1,4 @@ -From 7248ca8d9378b2bc237f55b06d86c4b12ec3ce4a Mon Sep 17 00:00:00 2001 +From adc6e9c72662e89c3fc6e09f8bb277dd0c3aea3f Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages @@ -43,5 +43,5 @@ index 77cfec712..16b70221e 100644 } } else { -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch index ed9e320d9..050ed6141 100644 --- a/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 6e50dc8bbe8fc8a73a37458727e1d655cab8ae7d Mon Sep 17 00:00:00 2001 +From fc323bdca782d5ee6048969638c3ca5f2c6908fb Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b62e641e6..9063e4b77 100644 +index 48737366f..fe1a87ba5 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -682,7 +682,7 @@ public class WorldServer extends World { +@@ -692,7 +692,7 @@ public class WorldServer extends World { public void chunkCheck(Entity entity) { this.getMethodProfiler().enter("chunkCheck"); int i = MathHelper.floor(entity.locX() / 16.0D); @@ -21,5 +21,5 @@ index b62e641e6..9063e4b77 100644 if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 5696358f5..babf1dbbe 100644 --- a/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,4 +1,4 @@ -From 5d8c462a578281978caa06c6224ed118f19736ed Mon Sep 17 00:00:00 2001 +From 5938c13768591563917195f140c984e324ef8fd2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Jun 2016 00:17:23 -0400 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal @@ -25,5 +25,5 @@ index cd04a2b99..174b9f543 100644 + } -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch index 373fb0406..82e9eb85a 100644 --- a/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From f54ca60d7f124a6a1628f7824a08050818fda2e2 Mon Sep 17 00:00:00 2001 +From bde47603ed2163a6a9335a3bd9a087972d9aeec7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login @@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login Bring down to a saner Y level if super high, as this can cause the server to crash diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a9827322c..2582f76d3 100644 +index b2c070397..cb4d49b1e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -193,6 +193,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,5 +18,5 @@ index a9827322c..2582f76d3 100644 if (this.getMinecraftServer().getForceGamemode()) { this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode()); -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch index 396c435bd..780e99e36 100644 --- a/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch @@ -1,4 +1,4 @@ -From 4e95a0f3ccd7eaee08275b35a5b2b19f40e021e7 Mon Sep 17 00:00:00 2001 +From e6ba1a2e2785f34574ea5ee7c0f93dbde806c2aa Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities diff --git a/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch index a0270f025..0a8c10b33 100644 --- a/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From f4f90c3939dfe084f8fba90b9dd98d69e9f4fe90 Mon Sep 17 00:00:00 2001 +From 973596b4d92e7ffb1448f36388f85098cacf0f4a Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent @@ -22,7 +22,7 @@ index 5c24e22c7..8d277566e 100644 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 1eca7f354..8b85956e5 100644 +index f72347050..5e3835851 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -681,6 +681,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -58,5 +58,5 @@ index 72b8677f2..2d454a3c3 100644 HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index 1ce0febec..29805f719 100644 --- a/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,4 +1,4 @@ -From 25812e37d4d662f3588031f24b01b1d7e38cabf6 Mon Sep 17 00:00:00 2001 +From ce23eb4d272747cad99b07acc601c47f64b4479d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items @@ -30,10 +30,10 @@ index 721eceeff..bff2e9d26 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index c3c3e58ce..d302712a5 100644 +index 40fd012ae..798942a2b 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -231,6 +231,15 @@ public class EntityFallingBlock extends Entity { +@@ -232,6 +232,15 @@ public class EntityFallingBlock extends Entity { @Override protected void a(NBTTagCompound nbttagcompound) { this.block = GameProfileSerializer.d(nbttagcompound.getCompound("BlockState")); diff --git a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch index 10e5142a7..b4f33770a 100644 --- a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch @@ -1,11 +1,11 @@ -From a3f76428be43b103a928b7a5e2971c96b0affa9d Mon Sep 17 00:00:00 2001 +From a289a83b759623cd1ca4d8cd8aba88fbbb176047 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 52ffdffa0..f40eab51f 100644 +index cb4d49b1e..8aef7e480 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; diff --git a/Spigot-Server-Patches/0123-Optimise-removeQueue.patch b/Spigot-Server-Patches/0123-Optimise-removeQueue.patch index eee2fdc67..9a4482f81 100644 --- a/Spigot-Server-Patches/0123-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0123-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From 3191d5030755745de632e7c0bd730420854ab721 Mon Sep 17 00:00:00 2001 +From 95def3e63a98c3034e5e5eee21c13deb21c7775c Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 2480bc64b..3683fa298 100644 +index c6fd50daa..19e72da6d 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -97,6 +97,12 @@ public class LoginListener implements PacketLoginInListener { @@ -54,7 +54,7 @@ index 2480bc64b..3683fa298 100644 @@ -251,10 +259,8 @@ public class LoginListener implements PacketLoginInListener { - return LoginListener.this.server.X() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null; + return LoginListener.this.server.Y() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null; } - }; - @@ -66,5 +66,5 @@ index 2480bc64b..3683fa298 100644 } -- -2.17.1 +2.25.0.windows.1 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 934225b65..f29a07b33 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 5d6cdd4b74075ea7c458c940fef53f190a094039 Mon Sep 17 00:00:00 2001 +From 98f58de854300bb08212ed7cac99461d45a3cbd6 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,7 +6,7 @@ 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 08019fc94..811c33b90 100644 +index 6a8c22b6b..e79d037a4 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 { @@ -35,5 +35,5 @@ index 08019fc94..811c33b90 100644 // Paper end } -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch index fdd34295a..7cd1a3106 100644 --- a/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From d4b92d6ee23a2e456ecb67ee44534d0925e2eed8 Mon Sep 17 00:00:00 2001 +From 520d201ae95118a130e5bf74a3fefe6e757a9524 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent @@ -48,5 +48,5 @@ index 2d454a3c3..95973558e 100644 return handleBlockGrowEvent(world, pos, block, 3); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch index 36da24643..8966f167f 100644 --- a/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch @@ -1,11 +1,11 @@ -From 2dfb3d9a41f295d3dccb9165aa9c8c7ce86d3af6 Mon Sep 17 00:00:00 2001 +From a5768da83c6aba10ce497130a14e158cfcbccd57 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:19 -0600 Subject: [PATCH] Don't let fishinghooks use portals diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e04b3f4e2..63d44401a 100644 +index 3dff47bc3..aad703d68 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -161,7 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -35,5 +35,5 @@ index b10de807e..7a8b8b0d6 100644 } -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch index 285ba03cb..633cea7f3 100644 --- a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 111caf6db3cfce479a88fde5a8e75b5dc1b609fb Mon Sep 17 00:00:00 2001 +From 0cd9a212baf7752ed5a6b1c7a30dae36bdc8305d Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -114,5 +114,5 @@ index 95973558e..c45b7c15f 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch index 86e2e724b..9ae7a5d35 100644 --- a/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From b89099d63eb89b7c3abd6fa4e07b99cd6668ab98 Mon Sep 17 00:00:00 2001 +From 9a9c2c4e2b97c584ca1156e5798f405279213420 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Dec 2016 23:07:42 -0500 Subject: [PATCH] Prevent Pathfinding out of World Border @@ -19,5 +19,5 @@ index 39a0c45bb..bdd092e49 100644 if (!copiedSet) { copiedSet = true; -- -2.17.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch index 94d832354..ff9280fb6 100644 --- a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From 6f3694fc16bfe1aa83e509272a6e5061f0cac424 Mon Sep 17 00:00:00 2001 +From 9b0195f22a3d8c5de5d39de2a01de5335c32c84f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Dec 2016 00:11:43 -0500 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3a52958a16..50808b1a9f 100644 +index c7a4fab1c..58f1136df 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -237,6 +237,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -22,5 +22,5 @@ index 3a52958a16..50808b1a9f 100644 return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch index e0c3edb98..9d80bf8dd 100644 --- a/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From 4bc309b797100c0fa004b93a0c8aa59be67ebf9e Mon Sep 17 00:00:00 2001 +From f210484a8d88355c4669f3100af808e178633995 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:15:11 -0500 Subject: [PATCH] Bound Treasure Maps to World Border @@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable one is in border that would of been missed. diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index 0f248b6de3..e8ce2ecf23 100644 +index 0f248b6de..e8ce2ecf2 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -108,6 +108,7 @@ public abstract class StructureGenerator @@ -23,7 +23,7 @@ index 0f248b6de3..e8ce2ecf23 100644 if (structurestart != null && structurestart.e()) { diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 4ee13ac454..5f10c4338e 100644 +index 4ee13ac45..5f10c4338 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -24,6 +24,18 @@ public class WorldBorder { @@ -46,5 +46,5 @@ index 4ee13ac454..5f10c4338e 100644 return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f(); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch index c27d5eaf0..0c68c02f4 100644 --- a/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 889dfd798b25b7f30ee074cc7b75d1998524e4bf Mon Sep 17 00:00:00 2001 +From b24644a151756ba4b737e8131605ae8f3b83b58e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps diff --git a/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch index 352d27739..0537cb532 100644 --- a/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From 1b09bcf4e69cb92dc412a07237446afbd101ecf6 Mon Sep 17 00:00:00 2001 +From c731a821d8577959c6ff754dc9bbe1223dad3676 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 03:48:29 -0500 Subject: [PATCH] Optimize ItemStack.isEmpty() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty() Remove hashMap lookup every check, simplify code to remove ternary diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 0a1596ff06..2d0a8c58fb 100644 +index 213e3779d..2f08979f0 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -150,7 +150,7 @@ public final class ItemStack { @@ -19,5 +19,5 @@ index 0a1596ff06..2d0a8c58fb 100644 public ItemStack cloneAndSubtract(int i) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch index 9a7bd9e55..6345751c8 100644 --- a/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 2dee4cbf0de58c1b0bb4d85de55cb30e5d167baa Mon Sep 17 00:00:00 2001 +From d23e6a02d99b8f7f436d4a92fda213290ae94492 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 9d0b85d1c1..37ce4d48bc 100644 +index ed6092f65..176af6c88 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving { @@ -31,7 +31,7 @@ index 9d0b85d1c1..37ce4d48bc 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 2b66a08ade..124c3185bc 100644 +index 2b66a08ad..124c3185b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -52,5 +52,5 @@ index 2b66a08ade..124c3185bc 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch index 6d4b422fb..b818dc057 100644 --- a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 504991dab4fcd1e9471216cfdb1d1699226ea49f Mon Sep 17 00:00:00 2001 +From 6060dd5bf706c1c2a6bf4672884a80c859ae23bf Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f40eab51f..636667a8e 100644 +index 8aef7e480..68b19a3fc 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1796,7 +1796,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch index 750960973..1319fbf11 100644 --- a/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From bac065c13e2c9a7d34d770074889a669dfa7cb21 Mon Sep 17 00:00:00 2001 +From b25e2d534653a255280c644681141cf999a1dc7b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API @@ -65,5 +65,5 @@ index 447ecf636..3a2a88618 100644 public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { if (header != null) { -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0136-Firework-API-s.patch b/Spigot-Server-Patches/0136-Firework-API-s.patch index c75b45db9..723eba132 100644 --- a/Spigot-Server-Patches/0136-Firework-API-s.patch +++ b/Spigot-Server-Patches/0136-Firework-API-s.patch @@ -1,11 +1,11 @@ -From 421a62ed00b0fb4660535dbf0e65a9eee5ac7b93 Mon Sep 17 00:00:00 2001 +From 51e28b99908d298f072a70e0a2fe902553a11cc3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 07:18:33 +0100 Subject: [PATCH] Firework API's diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 4f51b9b654..278ef79d89 100644 +index 4f51b9b65..278ef79d8 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -53,7 +53,7 @@ index 4f51b9b654..278ef79d89 100644 @Override diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 6f2f6b9f5d..608be9e70a 100644 +index 313076d6d..7be41c869 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -65,11 +65,11 @@ index 6f2f6b9f5d..608be9e70a 100644 object = a(world, entityliving, itemstack, itemstack1); if (flag || f3 != 0.0F) { diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 914297bad6..76b253a50d 100644 +index 058c016b7..92dac35ec 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -18,6 +18,7 @@ public class ItemFireworks extends Item { - Vec3D vec3d = itemactioncontext.j(); + Vec3D vec3d = itemactioncontext.getPos(); EnumDirection enumdirection = itemactioncontext.getClickedFace(); EntityFireworks entityfireworks = new EntityFireworks(world, vec3d.x + (double) enumdirection.getAdjacentX() * 0.15D, vec3d.y + (double) enumdirection.getAdjacentY() * 0.15D, vec3d.z + (double) enumdirection.getAdjacentZ() * 0.15D, itemstack); + entityfireworks.spawningEntity = itemactioncontext.getEntity().getUniqueID(); // Paper @@ -90,7 +90,7 @@ index 914297bad6..76b253a50d 100644 itemstack.subtract(1); } diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 75604dbc69..98deaba12c 100644 +index 75604dbc6..98deaba12 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -136,7 +136,7 @@ public class NBTTagCompound implements NBTBase { @@ -103,7 +103,7 @@ index 75604dbc69..98deaba12c 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 475b7b004b..de74e7214a 100644 +index 475b7b004..de74e7214 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity; @@ -145,5 +145,5 @@ index 475b7b004b..de74e7214a 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch index b4ff09f91..cf4180b0a 100644 --- a/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 814c2c20ab537baeb9d6e960d5224ce189271876 Mon Sep 17 00:00:00 2001 +From f0bf33be3ce52334e0e22af9af7213f0648a1994 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index b907a3c4d8..78fba79378 100644 +index b907a3c4d..78fba7937 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -133,7 +133,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -19,5 +19,5 @@ index b907a3c4d8..78fba79378 100644 if (teleEvent.isCancelled()) { return; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch index 3e56cb50a..9312078dd 100644 --- a/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From dc8a85f334f4a297b9465b854ac323eadd02c9f7 Mon Sep 17 00:00:00 2001 +From 15d40ccec1d004a3184d64acede40edc0f971e18 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 75f6c1bb9b..426a8835d8 100644 +index 2c0a426a5..ec7396f2a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -275,6 +275,48 @@ public class CraftWorld implements World { @@ -60,5 +60,5 @@ index 75f6c1bb9b..426a8835d8 100644 public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch index 28c0452e8..ea9dd9394 100644 --- a/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 70b62dec73d594de95c2a87b103aa4c191f95c99 Mon Sep 17 00:00:00 2001 +From 6f2ec40f9f93d4c3d31a85d5fa3af7221c1f0e5f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b7012b5b64..ce5bd2229e 100644 +index b7012b5b6..ce5bd2229 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -931,11 +931,13 @@ public abstract class PlayerList { @@ -25,5 +25,5 @@ index b7012b5b64..ce5bd2229e 100644 public WhiteList getWhitelist() { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch index f668ac777..322f1a7ff 100644 --- a/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,11 +1,11 @@ -From 265ea866a833bd7b24bd2c9291f5f59c98be3c19 Mon Sep 17 00:00:00 2001 +From e72182a7e9e07c23fa7d1819ef6b90a1bd129168 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 63d44401ab..1619d9f415 100644 +index aad703d68..1b8a49383 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2025,6 +2025,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,5 +17,5 @@ index 63d44401ab..1619d9f415 100644 throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { -- -2.24.1 +2.25.0.windows.1 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 3db04ae00..2d9eec037 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 2040bdb786fa04479a79595afc86c69bf73bf8a4 Mon Sep 17 00:00:00 2001 +From fd449e849fdc1c5ead4a613a1f56bfe19feba32a 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 e0d240a89a..07abcc1e24 100644 +index e0d240a89..07abcc1e2 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 e0d240a89a..07abcc1e24 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,7 +134,7 @@ 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 8ad0d0db1..8d48154e5 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 { @@ -147,10 +147,10 @@ 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 191e7dfaf6..be85a76acd 100644 +index dd1caec9d..2775afc32 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1377,7 +1377,8 @@ public abstract class EntityLiving extends Entity { +@@ -1379,7 +1379,8 @@ public abstract class EntityLiving extends Entity { int j = EntityExperienceOrb.getOrbValue(i); i -= j; @@ -161,7 +161,7 @@ index 191e7dfaf6..be85a76acd 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 8b85956e55..8b0c401472 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 8b85956e55..8b0c401472 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 2a51a241ee..0419aea923 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 2a51a241ee..0419aea923 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 426a8835d8..06bf562446 100644 +index ec7396f2a..63b1cb2a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1780,7 +1780,7 @@ public class CraftWorld implements World { @@ -278,7 +278,7 @@ index 426a8835d8..06bf562446 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 { @@ -301,5 +301,5 @@ index 1b512cc45c..fbad045675 100644 public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch index 33a8ae1f1..4d4540888 100644 --- a/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From c18a30b8936217bab75d84459f912ce82990eb7d Mon Sep 17 00:00:00 2001 +From 37f614ddeea80462ea7e2c996f5fa19922ea4d4f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -27,7 +27,7 @@ index f164844f3..751551f17 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 764e779b1..9c1607377 100644 +index 1b8a49383..20a8041ba 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,10 +39,10 @@ index 764e779b1..9c1607377 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index be85a76ac..6379b361a 100644 +index 2775afc32..74de19bbf 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2621,8 +2621,11 @@ public abstract class EntityLiving extends Entity { +@@ -2623,8 +2623,11 @@ public abstract class EntityLiving extends Entity { } } diff --git a/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch index c11183ea1..10e7bc8e1 100644 --- a/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From 1819a4fd44fc92d50e4861e5e6698c97ec1bf515 Mon Sep 17 00:00:00 2001 +From f2851935c9285c2c9454123b166bcdb733cc50a2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -9,7 +9,7 @@ One report of a suspected memory leak with the system. This adds additional overhead to asynchronous task dispatching diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 552daf4376..e102be583c 100644 +index 552daf437..e102be583 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -47,5 +47,5 @@ index 552daf4376..e102be583c 100644 @Deprecated -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 66c7b2f54..5e10fd774 100644 --- a/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From eb4aafb32370e25b946c1ea98df597aae2c31e84 Mon Sep 17 00:00:00 2001 +From d29b34d68e68ffcf2b8233a257389f7f3216392c Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 0886ab11d..122e46e66 100644 +index 1627aeeef..4fefdb9ce 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -110,7 +110,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -37,5 +37,5 @@ index 0886ab11d..122e46e66 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch index 07766fc6f..5b9e7813e 100644 --- a/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From 5e59ad29bd851e66e208d654a3ef888007f43c0b Mon Sep 17 00:00:00 2001 +From 70589bdf9b826b5b1ee18076b19b8644525f86ac Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 37ce4d48bc..80bf58b052 100644 +index 176af6c88..992d7bfb0 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index 37ce4d48bc..80bf58b052 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6379b361a9..f6cb18639c 100644 +index 74de19bbf..b31355f2b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 6379b361a9..f6cb18639c 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch index fa1f4eba2..7d158d12b 100644 --- a/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From 06e0b57232e7d6e1f4307a3f348ba347fcf5bd60 Mon Sep 17 00:00:00 2001 +From c946999fea61c4fdb1cc1cff2d13dc57c2f28ebc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 38bf3ea449..a180ba6b0c 100644 +index bdc98d12c..e41352681 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -88,6 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without limiting incoming data from packets in some other way. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index 0e89025a06..1bf74bdaea 100644 +index 08f3a315f..6ddb13358 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { @@ -57,5 +57,5 @@ index 0e89025a06..1bf74bdaea 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 57d4b7d10..1b759b724 100644 --- a/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 7fa11256d1579a6b9db98fbc7d2333da0bcef3df Mon Sep 17 00:00:00 2001 +From 67f44d3e0ef99546dfe06d45068101403a7ebaaf Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement @@ -26,7 +26,7 @@ index 751551f17..eae1690cc 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 517bb0748..9054e77ae 100644 +index 2a54723a6..6c9c0f2b7 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving { 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 acb6f7b91..895e241b4 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 afcc911a162ba846da9493a6642a834db37a8a2c Mon Sep 17 00:00:00 2001 +From 98a89361832d2bdcdd02d7eeaa540682474a1f39 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5a83fc21cb..295b8390cb 100644 +index 5a83fc21c..295b8390c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -259,4 +259,9 @@ public class PaperConfig { @@ -20,7 +20,7 @@ index 5a83fc21cb..295b8390cb 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 811c33b900..77bb686052 100644 +index e79d037a4..f01d3d382 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 { @@ -35,5 +35,5 @@ index 811c33b900..77bb686052 100644 // Paper end } -- -2.24.1 +2.25.0.windows.1 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 093b9d4d3..895a36621 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 21da989cf9e5f7f7d6b5737d927d5209eff853db Mon Sep 17 00:00:00 2001 +From aec337e66237495db8935baae5b323a74ffc44f5 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 22e4ce22a..011920eb1 100644 +index ee7d3d521..93c1a04bc 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,27 @@ @@ -143,10 +143,10 @@ index 000000000..685deaa0e + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index a5a8bad4f..dfe806291 100644 +index a78896dc8..886900006 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -85,6 +85,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -86,6 +86,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer if (!org.bukkit.craftbukkit.Main.useConsole) { return; } @@ -156,7 +156,7 @@ index a5a8bad4f..dfe806291 100644 jline.console.ConsoleReader bufferedreader = reader; // CraftBukkit end -@@ -117,6 +120,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -118,6 +121,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer DedicatedServer.LOGGER.error("Exception handling console input", ioexception); } @@ -165,7 +165,7 @@ index a5a8bad4f..dfe806291 100644 } }; -@@ -128,6 +133,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -129,6 +134,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler()); @@ -175,7 +175,7 @@ index a5a8bad4f..dfe806291 100644 final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger()); for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) { if (appender instanceof org.apache.logging.log4j.core.appender.ConsoleAppender) { -@@ -136,6 +144,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -137,6 +145,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader).start(); @@ -185,7 +185,7 @@ index a5a8bad4f..dfe806291 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 321875948..44c8dffd2 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; @@ -225,7 +225,7 @@ index 321875948..44c8dffd2 100644 Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this)); } // CraftBukkit end -@@ -950,7 +954,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant -- -+ + -- -- +- - -- +- + + + + + + + + + @@ -600,14 +604,18 @@ index 490a9acc7..08b6bb7f9 100644 -@@ -19,7 +18,6 @@ +@@ -24,10 +24,9 @@ -- +- +- ++ + + -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch index 2a9fdc813..376b792ce 100644 --- a/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From 204d562f714621571b27cb96ff2f4adc13aeaadf Mon Sep 17 00:00:00 2001 +From ba211b765d1d39b30afea49c4f755efc576a28c4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Jun 2017 21:01:18 +0100 Subject: [PATCH] provide a configurable option to disable creeper lingering @@ -21,7 +21,7 @@ index eae1690cc..39ab54575 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 859b52845..dabe40c5f 100644 +index cc9887d04..374cf28fb 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster { diff --git a/Spigot-Server-Patches/0152-Item-canEntityPickup.patch b/Spigot-Server-Patches/0152-Item-canEntityPickup.patch index 0bff5224e..554e50ced 100644 --- a/Spigot-Server-Patches/0152-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0152-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From 37702d06c80affdbcdff440d82ad3357e660fe1d Mon Sep 17 00:00:00 2001 +From f1a23b56cf060e8ca98f48426d7d1bd9f5cc5dae Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:17 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index dac3540c6b..eadac07f69 100644 +index f389e5565..5ca281172 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -513,6 +513,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -21,7 +21,7 @@ index dac3540c6b..eadac07f69 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index f657607a15..9973fc0b12 100644 +index f657607a1..9973fc0b1 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -20,6 +20,7 @@ public class EntityItem extends Entity { @@ -33,7 +33,7 @@ index f657607a15..9973fc0b12 100644 public EntityItem(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index cc593fbc99..3f552b5905 100644 +index cc593fbc9..3f552b590 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item { @@ -54,5 +54,5 @@ index cc593fbc99..3f552b5905 100644 public String toString() { return "CraftItem"; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch index cd899ec3c..2370572cd 100644 --- a/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 22e480619883ebfb9c513063ee24f30ed745b7a0 Mon Sep 17 00:00:00 2001 +From 5adb935325d11e6eec89a40d2b60af88e2c69eff Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:09 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 9973fc0b12..4b2e19f308 100644 +index 9973fc0b1..4b2e19f30 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -322,6 +322,7 @@ public class EntityItem extends Entity { @@ -45,5 +45,5 @@ index 9973fc0b12..4b2e19f308 100644 this.die(); itemstack.setCount(i); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch index cb77652bc..b62776353 100644 --- a/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From d23ead16ce3d5eb25d6e66d733194b07cc598101 Mon Sep 17 00:00:00 2001 +From bf2d3ddb6441d9937087cb21338d2129bf2275e3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:30 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 4b2e19f308..fcc1c0993d 100644 +index 4b2e19f30..fcc1c0993 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -9,6 +9,7 @@ import javax.annotation.Nullable; @@ -40,5 +40,5 @@ index 4b2e19f308..fcc1c0993d 100644 itemstack.setCount(canHold); // Call legacy event -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch index 3b75b59de..1e72867a1 100644 --- a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From 87dbe871dc3acb33ff070e684f6743048f96d41f Mon Sep 17 00:00:00 2001 +From 22f20b3211a21e4111863b3e7a30173e598c81db 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 cd58906ad4..202f6ad68b 100644 +index 05efbd67d..530156f70 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; @@ -40,5 +40,5 @@ index cd58906ad4..202f6ad68b 100644 // Spigot end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch index bd230a535..cc35f44bc 100644 --- a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 701befb83fdaa729136843a5b102226c44de41de Mon Sep 17 00:00:00 2001 +From 7c1bfbef421a19f61008320ef8e3d26ba6ae8098 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 2f10dab36c..670f8313ae 100644 +index 2f10dab36..670f8313a 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -1,7 +1,10 @@ @@ -429,19 +429,19 @@ index 2f10dab36c..670f8313ae 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 7df3ae0ec5..1ddb10741b 100644 +index 7016dac2d..c15ca642d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1289,7 +1289,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 673e2b79d5..2d982ce1e0 100644 +index 6c9c0f2b7..9717c40f4 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1893,20 +1893,44 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1894,20 +1894,44 @@ public abstract class EntityHuman extends EntityLiving { } @@ -58,7 +58,7 @@ index 673e2b79d5..2d982ce1e0 100644 @Override public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 66cd2db1ea..a1397d1427 100644 +index 66cd2db1e..a1397d142 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -665,6 +665,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -95,5 +95,5 @@ index 66cd2db1ea..a1397d1427 100644 public boolean discoverRecipe(NamespacedKey recipe) { return discoverRecipes(Arrays.asList(recipe)) != 0; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch index 596880fd2..067df0578 100644 --- a/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 16e3b587fce6bea6237f111906fb01d94eb0b0db Mon Sep 17 00:00:00 2001 +From d972b9f4d8b1cf7b7f1904760ea4a51d4ce481b9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 17:00:32 -0400 Subject: [PATCH] Profile Lookup Events @@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java -index 3bcdb8f93f..bb9894318e 100644 +index 3bcdb8f93..bb9894318 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java @@ -1,17 +1,68 @@ @@ -81,5 +81,5 @@ index 3bcdb8f93f..bb9894318e 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch index bab279e5c..c4bca0965 100644 --- a/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch @@ -1,11 +1,11 @@ -From af3ffc6a7e90eb89f8a73291717e6cd3eb038500 Mon Sep 17 00:00:00 2001 +From 6826d03ce0fda52f196d1a15750eafc9cfb59fe3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Jul 2017 21:35:56 -0500 Subject: [PATCH] Block player logins during server shutdown diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 3683fa2984..6f7c715794 100644 +index 19e72da6d..234451ebc 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener { @@ -22,5 +22,5 @@ index 3683fa2984..6f7c715794 100644 this.c(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch index df9e31a83..a7fcbb405 100644 --- a/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From 320aa57d604f28bc1f678be85099222483c4dba7 Mon Sep 17 00:00:00 2001 +From 72c1fb503685b0ff02c3c288cb218a2a0afb78f0 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fcfe8f550d..7c4ab7fe72 100644 +index 20a8041ba..e57b623ef 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index fcfe8f550d..7c4ab7fe72 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index deb32db2b2..8384a2cbf8 100644 +index deb32db2b..8384a2cbf 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -134,6 +134,7 @@ public abstract class MobSpawnerAbstract { @@ -49,7 +49,7 @@ index deb32db2b2..8384a2cbf8 100644 if ( entity.world.spigotConfig.nerfSpawnerMobs ) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index bb07dec3c8..495a7c464f 100644 +index bb07dec3c..495a7c464 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1045,5 +1045,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -64,5 +64,5 @@ index bb07dec3c8..495a7c464f 100644 // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch index 8e07c0713..ac272584e 100644 --- a/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 62cabe177f1205d2a6dc64aea56a228b0d2e20ae Mon Sep 17 00:00:00 2001 +From bdf1253f1cb07a518bb9a7e41e1fefb64b022f11 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:24:06 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 09016e3547..9952db3eb5 100644 +index 09016e354..9952db3eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract; @@ -27,7 +27,7 @@ index 09016e3547..9952db3eb5 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java -index 63991bf4be..9a47a1adc1 100644 +index 63991bf4b..9a47a1adc 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory; @@ -41,7 +41,7 @@ index 63991bf4be..9a47a1adc1 100644 super(inventory); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java new file mode 100644 -index 0000000000..99cfbaf90b +index 000000000..99cfbaf90 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -0,0 +1,15 @@ @@ -61,5 +61,5 @@ index 0000000000..99cfbaf90b + +} -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch index f5d34b888..b62750506 100644 --- a/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From a1209416ec3aa88eaa43a52746caff71f1044a61 Mon Sep 17 00:00:00 2001 +From e2ec596f328db2922bc58371a5af7e215905d352 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 22:43:12 -0400 Subject: [PATCH] Implement ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 01ab19434a..8b219b5fa2 100644 +index 01ab19434..8b219b5fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory { @@ -22,5 +22,5 @@ index 01ab19434a..8b219b5fa2 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch index 14c9b4dee..ec5f167c7 100644 --- a/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From c10308e739e8fb37c042b6933967e4fa1f91d80d Mon Sep 17 00:00:00 2001 +From e823c6756ac082bef0eb66921145b90225a01fbb Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:59:38 -0400 Subject: [PATCH] Implement getI18NDisplayName @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java -index c0c13798f8..6012739331 100644 +index c0c13798f..601273933 100644 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java @@ -65,10 +65,12 @@ public class LocaleLanguage { @@ -25,7 +25,7 @@ index c0c13798f8..6012739331 100644 return this.c(s); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 8b219b5fa2..23d7756456 100644 +index 8b219b5fa..23d775645 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory { @@ -48,5 +48,5 @@ index 8b219b5fa2..23d7756456 100644 // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch index 955263e67..4d243b04b 100644 --- a/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From ea49daa5f717ed9027cd001e027289b0ca562101 Mon Sep 17 00:00:00 2001 +From e9bdd9e117f76a4b2a23d8386809df4566de70d5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:10 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 308bc3baf2..002f7e844a 100644 +index 308bc3baf..002f7e844 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -522,9 +522,9 @@ public abstract class PlayerList { @@ -48,5 +48,5 @@ index 308bc3baf2..002f7e844a 100644 public boolean isOp(GameProfile gameprofile) { return this.operators.d(gameprofile) || this.server.a(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch index dbed726cc..3971bb893 100644 --- a/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 97c7817be5579f8567f4e3237fe9cd348d9c0234 Mon Sep 17 00:00:00 2001 +From 03b9b52d8459a795dcc69eb20c7e7fee18f07448 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,10 +9,10 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d0af5086..75d3cbc4 100644 +index d1636ce21..eb5f44e30 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -217,10 +217,12 @@ public class Main { +@@ -218,10 +218,12 @@ public class Main { Calendar deadline = Calendar.getInstance(); deadline.add(Calendar.DAY_OF_YEAR, -14); if (buildDate.before(deadline.getTime())) { @@ -29,5 +29,5 @@ index d0af5086..75d3cbc4 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch index 7400d24c0..c6f39e21c 100644 --- a/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,11 +1,11 @@ -From c6cb9206eb7d1a561e945c54df100e21c1c3ed33 Mon Sep 17 00:00:00 2001 +From b85a89090ea6103014d91a52477423811b2052a3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:54:40 -0500 Subject: [PATCH] Ocelot despawns should honor nametags and leash diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 0624114553..d9a7b8ac1e 100644 +index 062411455..d9a7b8ac1 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal { @@ -18,5 +18,5 @@ index 0624114553..d9a7b8ac1e 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index d8332980b..a321ff856 100644 --- a/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,11 +1,11 @@ -From b316d460813fc1076648fe0772afc1b6c381d18e Mon Sep 17 00:00:00 2001 +From fe9d2d7e016e997976674ae65da333ca710c2809 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:45:19 -0500 Subject: [PATCH] Reset spawner timer when spawner event is cancelled diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 8384a2cbf8..258e96ba5c 100644 +index 8384a2cbf..258e96ba5 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -140,6 +140,9 @@ public abstract class MobSpawnerAbstract { @@ -28,5 +28,5 @@ index 8384a2cbf8..258e96ba5c 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 3e7429839..f39a496b3 100644 --- a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From 35728314aaf56249d3997a4e6c5200041d319ea1 Mon Sep 17 00:00:00 2001 +From 4ce92c4f165f461b8a363f1d3217764144872656 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Aug 2017 17:51:22 -0500 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 50808b1a9f..948c025c1f 100644 +index 58f1136df..eb5c95e37 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -671,7 +671,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -22,5 +22,5 @@ index 50808b1a9f..948c025c1f 100644 this.tileEntityListUnload.clear(); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch index e4d9ffab1..78ea54e0a 100644 --- a/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From 218046707327f37b5b49ef297b19cd62d665d54d Mon Sep 17 00:00:00 2001 +From 2b45f2bf214d748972f84a3037a766828f4f1c42 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 17 Aug 2017 16:08:20 -0700 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 295b8390cb..5884b04f7e 100644 +index 295b8390c..5884b04f7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -27,7 +27,7 @@ index 295b8390cb..5884b04f7e 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 6f7c715794..a1be28390d 100644 +index 234451ebc..758fe7748 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -247,6 +247,10 @@ public class LoginListener implements PacketLoginInListener { @@ -42,5 +42,5 @@ index 6f7c715794..a1be28390d 100644 LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable"); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch index 14d89abf6..b1f2d9b0c 100644 --- a/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From c0ee1c5b592500d2be274cdb15cfefee63489237 Mon Sep 17 00:00:00 2001 +From 69f7c5a7365a083a5e7b5c7e445c6d5664c89e3e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:48 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f6cb18639c..bf049bfc44 100644 +index b31355f2b..c7b62872c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity { @@ -18,7 +18,7 @@ index f6cb18639c..bf049bfc44 100644 protected int ticksFarFromPlayer; protected float aR; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 7e9aff6684..b8482c6328 100644 +index 7e9aff668..b8482c632 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -317,6 +317,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -39,5 +39,5 @@ index 7e9aff6684..b8482c6328 100644 public boolean addPotionEffect(PotionEffect effect) { return addPotionEffect(effect, false); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index bbcac77e1..23a8aa865 100644 --- a/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From 3915b039ecab5ac03a22ce6cd519578b9ddec572 Mon Sep 17 00:00:00 2001 +From 8e4e7526d65ab60ec0c5b51524448837abe6249d Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -12,7 +12,7 @@ results in a separate line, even though it should not result in a line break. Log4j's implementation handles it correctly. diff --git a/pom.xml b/pom.xml -index f716e98702..e6395c7734 100644 +index 93c1a04bc..663eacfe2 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,11 @@ @@ -28,10 +28,10 @@ index f716e98702..e6395c7734 100644 org.ow2.asm asm diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index dfe8062919..6e95a0452e 100644 +index 886900006..0411fb3ee 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -147,8 +147,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -148,8 +148,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer */ // Paper end @@ -45,5 +45,5 @@ index dfe8062919..6e95a0452e 100644 thread.setDaemon(true); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch index 7b5a6ae9c..961384a63 100644 --- a/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From c10820f45b843ebe4597c7431f9d32f0f2213131 Mon Sep 17 00:00:00 2001 +From 02defb30546e8f70326f06dc850b15c518b0ec92 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index e6395c7734..026dcfdab5 100644 +index 663eacfe2..7132e2021 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ @@ -28,7 +28,7 @@ index e6395c7734..026dcfdab5 100644 org.apache.logging.log4j diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index fdca34346a..6d77bbc5aa 100644 +index fdca34346..6d77bbc5a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -286,7 +286,7 @@ public class SpigotConfig @@ -41,12 +41,12 @@ index fdca34346a..6d77bbc5aa 100644 public static int playerShuffle; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 08b6bb7f97..9f8334376f 100644 +index 5a049e1b5..4b3c0269e 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml -@@ -2,10 +2,22 @@ - - +@@ -8,10 +8,22 @@ + + - + @@ -70,5 +70,5 @@ index 08b6bb7f97..9f8334376f 100644 -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch index 4168513fd..86179bf8a 100644 --- a/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch @@ -1,11 +1,11 @@ -From 3c2712cd3fc1aa4f3437344970425c423a0d584e Mon Sep 17 00:00:00 2001 +From 3b94bf80be80647c75ad63c0858e94ddd67102bf Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index 026dcfdab5..dbc425524c 100644 +index 7132e2021..9e06edfe2 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,12 @@ @@ -22,5 +22,5 @@ index 026dcfdab5..dbc425524c 100644 org.apache.logging.log4j log4j-iostreams -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch index 61319c123..95dfb9ca6 100644 --- a/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From 5451a743dbe25a42d5da3889ac1ef95c0f749c12 Mon Sep 17 00:00:00 2001 +From e0d08cc7e4ca64bcb7afcc27cde365d838b6b155 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 23 Sep 2017 21:07:20 +0200 Subject: [PATCH] Disable logger prefix for various plugins bypassing the @@ -11,10 +11,10 @@ log. Disable the logger prefix for these plugins so the messages show up correctly. diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 9f8334376f..6711e6dff9 100644 +index 4b3c0269e..869bff4af 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml -@@ -5,7 +5,8 @@ +@@ -11,7 +11,8 @@ @@ -24,7 +24,7 @@ index 9f8334376f..6711e6dff9 100644 pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" /> -@@ -14,7 +15,8 @@ +@@ -20,7 +21,8 @@ @@ -35,5 +35,5 @@ index 9f8334376f..6711e6dff9 100644 -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch index 17a945fb2..69667388d 100644 --- a/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch @@ -1,11 +1,11 @@ -From 44f20e09eafe43f04041c71d71da4ff084354300 Mon Sep 17 00:00:00 2001 +From 29e465db3a37f912340a2a5e225dd8a18f3464f5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:44 -0400 Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 01ab2e1516..399724d6ac 100644 +index 01ab2e151..399724d6a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory; @@ -54,5 +54,5 @@ index 01ab2e1516..399724d6ac 100644 this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch index d89a253f9..b0619e040 100644 --- a/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From 2f09acaa257b5cae146cf981ffa42577d506011b Mon Sep 17 00:00:00 2001 +From 056ed0a9981963afaea02490a6e4cafec63a6ef5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 399724d6ac..a4660f2b87 100644 +index 399724d6a..a4660f2b8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2486,14 +2486,18 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -40,5 +40,5 @@ index 399724d6ac..a4660f2b87 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch index 881b1160b..0884986d8 100644 --- a/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From f8d0b154e05d43282e673789e760d97f2f238204 Mon Sep 17 00:00:00 2001 +From 2f46af2d4c7bc61d9f51358a60862fc1bf781f7e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:45:20 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -136,5 +136,5 @@ index 3a2a88618..5b5f2418e 100644 public double getEyeHeight(boolean ignorePose) { if (ignorePose) { -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch index 37a9a2dc5..08f729c3f 100644 --- a/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch +++ b/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch @@ -1,4 +1,4 @@ -From 4c399ba80cf163df1dd379e0dc0770840a9b2993 Mon Sep 17 00:00:00 2001 +From 1df27470e2146c16bc274662daae71b2f8636215 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Oct 2017 00:29:07 +0100 Subject: [PATCH] revert serverside behavior of keepalives @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a4660f2b87..9af8e947ef 100644 +index a4660f2b8..9af8e947e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -74,5 +74,5 @@ index a4660f2b87..9af8e947ef 100644 this.minecraftServer.getMethodProfiler().exit(); // CraftBukkit start -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch index cb7eea9d7..24e3a1a6f 100644 --- a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From 2bc49a24a1222a95085870214fd1db6c6376e94f Mon Sep 17 00:00:00 2001 +From 535cc9801026b2c483133daab0b0da589c002b74 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 31 Oct 2017 03:26:18 +0100 Subject: [PATCH] Send attack SoundEffects only to players who can see the @@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 2d982ce1e0..fd7de143e3 100644 +index 9717c40f4..be8b088fc 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1023,6 +1023,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -72,7 +72,7 @@ index 2d982ce1e0..fd7de143e3 100644 entity.extinguish(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 948c025c1f..c065a5f6e1 100644 +index eb5c95e37..74bb96ebf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -608,6 +608,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -88,5 +88,5 @@ index 948c025c1f..c065a5f6e1 100644 public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch index f66088be2..f8d16145f 100644 --- a/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,4 +1,4 @@ -From b39cefe2d8a88197428fb9e92720719749665af7 Mon Sep 17 00:00:00 2001 +From 50a68d7b2efc0d066f9a0b327e39f3b2a2fae2df Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch index 23c80e131..2ddc19203 100644 --- a/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch @@ -1,11 +1,11 @@ -From 26c247a323e2e822648af09f81bb1131b8e61203 Mon Sep 17 00:00:00 2001 +From 59e3a903221a2e6d6dfb17758238b93701debbbd Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:46:34 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bf049bfc44..c03fcd2d38 100644 +index c7b62872c..fe0b08220 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ @@ -15,7 +15,7 @@ index bf049bfc44..c03fcd2d38 100644 import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -@@ -2334,6 +2335,13 @@ public abstract class EntityLiving extends Entity { +@@ -2336,6 +2337,13 @@ public abstract class EntityLiving extends Entity { ItemStack itemstack1 = this.getEquipment(enumitemslot); if (!ItemStack.matches(itemstack1, itemstack)) { @@ -30,7 +30,7 @@ index bf049bfc44..c03fcd2d38 100644 if (!itemstack.isEmpty()) { this.getAttributeMap().a(itemstack.a(enumitemslot)); diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java -index 02a7ae6785..60b235f16f 100644 +index 02a7ae678..60b235f16 100644 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java @@ -16,6 +16,7 @@ public enum EnumItemSlot { @@ -42,5 +42,5 @@ index 02a7ae6785..60b235f16f 100644 return this.g; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch index 5535bcd9e..beb41f4f3 100644 --- a/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From 90ceaaaef9632c727719ec42a402016d217e863e Mon Sep 17 00:00:00 2001 +From a5f884dbea930849d5e6cb21f046f01109d4707b Mon Sep 17 00:00:00 2001 From: killme Date: Sun, 12 Nov 2017 19:40:01 +0100 Subject: [PATCH] Prevent logins from being processed when the player has @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index a1be28390d..828b64e419 100644 +index 758fe7748..1fb609dcf 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener { @@ -23,5 +23,5 @@ index a1be28390d..828b64e419 100644 EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId()); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch index 3e3777800..60d7e8715 100644 --- a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From d9b7412b5f93b09eb3685a630972fa96a13e7665 Mon Sep 17 00:00:00 2001 +From ae2a08ed40765dbc4a9a32601932d43884796434 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c065a5f6e1..8b2ee61b3b 100644 +index 74bb96ebf..9987adb6f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -299,7 +299,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -31,5 +31,5 @@ index c065a5f6e1..8b2ee61b3b 100644 } // CraftBukkit end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch index 85ad5fa82..26f4c3854 100644 --- a/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From ae21a2ecfd6ab6db948e04a340c54fde01e7162d Mon Sep 17 00:00:00 2001 +From 8ca75647c77e87e68810468aec0066d3c9280385 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 630b279158..958279249f 100644 +index 630b27915..958279249 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -39,7 +39,7 @@ index 630b279158..958279249f 100644 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index c0f557568d..fa840c3d38 100644 +index c0f557568..fa840c3d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -309,6 +309,20 @@ public class CraftBlock implements Block { @@ -64,7 +64,7 @@ index c0f557568d..fa840c3d38 100644 switch (material) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 17d80b5c6e..f6401e2cde 100644 +index 17d80b5c6..f6401e2cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -26,20 +26,40 @@ public class CraftBlockEntityState extends CraftBlockState @@ -114,7 +114,7 @@ index 17d80b5c6e..f6401e2cde 100644 private T createSnapshot(T tileEntity) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 15022ada0c..af15656cc4 100644 +index 15022ada0..af15656cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState implements @@ -131,5 +131,5 @@ index 15022ada0c..af15656cc4 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch index 9fec29911..471f3fe89 100644 --- a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 8f3096e85007f17edeb22fc8f12dced89ed94ebb Mon Sep 17 00:00:00 2001 +From 92d990fcfc05f56d1d7d54982cd86e0c4439478a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9af8e947ef..ad2a366275 100644 +index 9af8e947e..ad2a36627 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -72,7 +72,7 @@ index 9af8e947ef..ad2a366275 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2f7769c00e..9fe19fb595 100644 +index 96112243a..3fa327eb3 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 { @@ -85,7 +85,7 @@ index 2f7769c00e..9fe19fb595 100644 return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions(); diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 5510266fb1..a51202ed53 100644 +index 5510266fb..a51202ed5 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer { @@ -129,5 +129,5 @@ index 5510266fb1..a51202ed53 100644 Waitable> waitable = new Waitable>() { @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch index 7fd16c467..e7d8b57fa 100644 --- a/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,11 +1,11 @@ -From 231de19cfd14c831c6755f5e674f2e5f0c796af8 Mon Sep 17 00:00:00 2001 +From fad81fed4375e1773483c5c5aedbaac86b273ee3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Nov 2017 22:18:54 -0500 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java -index eafdcb916a..d37a2fa0ab 100644 +index eafdcb916..d37a2fa0a 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal { @@ -18,5 +18,5 @@ index eafdcb916a..d37a2fa0ab 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch index 313a178a8..83ee76091 100644 --- a/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 447f68c2177cc27b6aa2e64539bda549240c01ef Mon Sep 17 00:00:00 2001 +From 56a4ee76472e9a5f1ff0f87ce17861a6e6f02902 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:02:53 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index d4275e733d..b3edb69a96 100644 +index d4275e733..b3edb69a9 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity { @@ -19,5 +19,5 @@ index d4275e733d..b3edb69a96 100644 entityhuman.receive(this, 1); Entry entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch index 9433e5aa8..be071c0ec 100644 --- a/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 8d80975c58af1fe97df707e7589d5ba1bd055765 Mon Sep 17 00:00:00 2001 +From 622d39c492cb528a355db488bf741826bd1dfd6f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -21,5 +21,5 @@ index dbda8b35a..f9b0f39f7 100644 if ((int) newTotal < 0) continue; // Overflow if (maxValue > 0 && newTotal > (long)maxValue) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch index 8cc28bb55..015d38fdd 100644 --- a/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 6f4caccabb863282eaa9bdbe79f1d60c97923af0 Mon Sep 17 00:00:00 2001 +From d38b801d38490495780f41c3ded0a0cc9420de1c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:36:49 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -86,5 +86,5 @@ index 5b5f2418e..6f47768c9 100644 } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch index 761fca14a..bddc320b3 100644 --- a/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From 688bed2423785ca26fadf257a001659361eaa10d Mon Sep 17 00:00:00 2001 +From f6c29fb849a36f83268ede7c5c0f4dc0b6e0c506 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 11 Jan 2018 16:47:28 -0600 Subject: [PATCH] Make max squid spawn height configurable diff --git a/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch index 0f982f23e..e0ebf79cd 100644 --- a/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From 3d34d1826afa4a881b19c30a277d6794e50d4728 Mon Sep 17 00:00:00 2001 +From ae58ae6165d9295d062541494b29fcc8e70c95ec Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:01:31 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -15,7 +15,7 @@ instead and save a lot of server resources. See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 258e96ba5c..fe8bc7f75d 100644 +index 258e96ba5..fe8bc7f75 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -105,6 +105,27 @@ public abstract class MobSpawnerAbstract { @@ -47,7 +47,7 @@ index 258e96ba5c..fe8bc7f75d 100644 entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch); return entity1; diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 02157d051f..224443e03c 100644 +index 02157d051..224443e03 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -38,7 +38,7 @@ public final class SpawnerCreature { @@ -86,5 +86,5 @@ index 02157d051f..224443e03c 100644 Entity entity = entitytypes.a((World) worldserver); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch index 584ded232..b7983c1f8 100644 --- a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 7dce63362bb6c3841f8c6418d4eeae0271fbcbfb Mon Sep 17 00:00:00 2001 +From 0fa723c95f0e6c1eabde7c0a72a4ef58d5fb10a0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -9,10 +9,10 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 122e46e66..6012b86f1 100644 +index 4fefdb9ce..426beb181 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -847,12 +847,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -852,12 +852,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { chunkRange = (chunkRange > world.spigotConfig.viewDistance) ? (byte) world.spigotConfig.viewDistance : chunkRange; chunkRange = (chunkRange > 8) ? 8 : chunkRange; @@ -40,5 +40,5 @@ index 122e46e66..6012b86f1 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch index 50aa2e841..13cbb323b 100644 --- a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From 5ff4a71c1c866f9e7e8d4e8426667cfb5f9b84d0 Mon Sep 17 00:00:00 2001 +From 1b76177661b7b4000b35f129e23b5acc9c5ccb9e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -89,5 +89,5 @@ index 4fb27cc7e..96d62bbf8 100644 public OfflinePlayer getOwningPlayer() { if (hasOwner()) { -- -2.16.1.windows.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch index 12802b79f..36cfeccb0 100644 --- a/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 70b63c7727ebbe78bdbd664f30409d630b2e2271 Mon Sep 17 00:00:00 2001 +From 15e137ea3e7641dfc321dd6794ca6570a071c3eb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:26 -0500 Subject: [PATCH] Fill Profile Property Events @@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java -index 4b2a67423f..61cfdf73c8 100644 +index 4b2a67423..61cfdf73c 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -1,5 +1,7 @@ @@ -40,5 +40,5 @@ index 4b2a67423f..61cfdf73c8 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch index 4c7cee90b..88ce29a0f 100644 --- a/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch @@ -1,11 +1,11 @@ -From bcf95fe63d4cd386decaceeb3a2a713bd36086f3 Mon Sep 17 00:00:00 2001 +From 8c2dcc35a8e476df663dae550749a05544f9aff7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:29 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index 4407e760cb..fe5bea363f 100644 +index ca661f393..c41e13847 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -276,6 +276,12 @@ public class AdvancementDataPlayer { @@ -22,5 +22,5 @@ index 4407e760cb..fe5bea363f 100644 this.i.add(advancement); flag = true; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch index 682de1a6d..8fa5bce26 100644 --- a/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 2cac6305d9f20cbb442a69d9dedbe940c0087b5f Mon Sep 17 00:00:00 2001 +From f0369a9d8359f567e1f35e725dcdba6f04525987 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -13,7 +13,7 @@ starting point for future additions in this area. Fixes GH-559 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java -index f700522840..3723faccac 100644 +index f70052284..3723facca 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java @@ -8,13 +8,39 @@ import org.bukkit.Material; @@ -267,7 +267,7 @@ index f700522840..3723faccac 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 5ee968f2e0..1eede4bcc6 100644 +index 5ee968f2e..1eede4bcc 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1428,7 +1428,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -288,7 +288,7 @@ index 5ee968f2e0..1eede4bcc6 100644 } return HANDLED_TAGS; diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java -index 6302339601..3a82bede7c 100644 +index 630233960..3a82bede7 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -6,6 +6,7 @@ import java.util.ArrayList; @@ -308,5 +308,5 @@ index 6302339601..3a82bede7c 100644 return cleanStack; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch index ec279ddea..b1be6e6d6 100644 --- a/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From 01183d139a2b287c2ef78efb863c855655ee0bd3 Mon Sep 17 00:00:00 2001 +From 7a62ac52f1526a199a76ac57ee3a1e10b6a7ff9a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Feb 2018 10:43:46 +0000 Subject: [PATCH] Extend Player Interact cancellation @@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds when cancelling interaction. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 56f249c431..18ff6dd686 100644 +index dff3eb118..e2e5c17c2 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -137,6 +137,11 @@ public class PlayerInteractManager { @@ -55,5 +55,5 @@ index 56f249c431..18ff6dd686 100644 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS; } else if (this.gamemode == EnumGamemode.SPECTATOR) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch index 4ba31e0a5..5ce60c304 100644 --- a/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 38a1d36783c330734362167fde6718a19d496b02 Mon Sep 17 00:00:00 2001 +From 7213a8b3e9d24e4811f63257c67aca9619b0ac5e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 9952db3eb5..1aea5f3f05 100644 +index 9952db3eb..1aea5f3f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac @@ -21,7 +21,7 @@ index 9952db3eb5..1aea5f3f05 100644 return getHandle().getOwnerUUID(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java -index 5dfa40dda1..407b95cafd 100644 +index 5dfa40dda..407b95caf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat @@ -35,5 +35,5 @@ index 5dfa40dda1..407b95cafd 100644 try { return getHandle().getOwnerUUID(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch index 3b23c22b5..42ff339bf 100644 --- a/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,11 +1,11 @@ -From 53c70ef02af18b8a46227272d21fd4a24d35a931 Mon Sep 17 00:00:00 2001 +From cf3d6673746b149e8c9fef6cfd96601b8958466b Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sat, 10 Mar 2018 00:50:24 +0100 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e315a00cc3..2607c4e5fa 100644 +index 92e689150..77cdbfadf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -187,6 +187,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index e315a00cc3..2607c4e5fa 100644 private void allChunksAreSlimeChunks() { allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index fd7de143e3..eb8f3833ec 100644 +index be8b088fc..ef9eabb83 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1063,6 +1063,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -33,5 +33,5 @@ index fd7de143e3..eb8f3833ec 100644 if (flag2) { f *= 1.5F; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index 9b173d9a2..56a629ee5 100644 --- a/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From c7a1a29a606ac2ac3a6a2ecf0172ab530798dbec Mon Sep 17 00:00:00 2001 +From 77b76b34f7943945b14dba49b605e9cf132b1393 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened @@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index 5a9ac3960d..fd31b9a6dc 100644 +index 5a9ac3960..fd31b9a6d 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder; @@ -27,5 +27,5 @@ index 5a9ac3960d..fd31b9a6dc 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 07f445c72..286bb86de 100644 --- a/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,11 +1,11 @@ -From 37753ff75ed0edba06f7328de1ca42f56e78f090 Mon Sep 17 00:00:00 2001 +From cf9c139ba2c63601ec6e57502ff5e0f4e4f2182d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Mar 2018 16:33:15 -0500 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index 5e414138e4..638a0aa5ae 100644 +index 5e414138e..638a0aa5a 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -26,8 +26,8 @@ public class BlockIceFrost extends BlockIce { @@ -29,5 +29,5 @@ index 5e414138e4..638a0aa5ae 100644 if (j >= i) { boolean flag = false; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch index 8bf0f5846..342e925ef 100644 --- a/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From f2941c6f8f5805f8bcd34dad5d7c918f2e87b6b1 Mon Sep 17 00:00:00 2001 +From 639d610ba835a9747908b8e5e64efa14b726ea31 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 11 Mar 2018 14:13:33 -0400 Subject: [PATCH] Disable Explicit Network Manager Flushing @@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread. Renable flushing by passing -Dpaper.explicit-flush=true diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e2d8ed88f0..08e314af7c 100644 +index e2d8ed88f..08e314af7 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -33,5 +33,5 @@ index e2d8ed88f0..08e314af7c 100644 if (this.t++ % 20 == 0) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch index 9addf2f32..0c0cf1030 100644 --- a/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From f641996995a86cf099fcaa53f850625edb707bcc Mon Sep 17 00:00:00 2001 +From 82b2323c75b833cce83d74224d59f105b6603a6d Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java new file mode 100644 -index 0000000000..c1a8e295b6 +index 000000000..c1a8e295b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java @@ -0,0 +1,31 @@ @@ -43,7 +43,7 @@ index 0000000000..c1a8e295b6 +} diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java new file mode 100644 -index 0000000000..a2a409e635 +index 000000000..a2a409e63 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java @@ -0,0 +1,11 @@ @@ -60,7 +60,7 @@ index 0000000000..a2a409e635 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java new file mode 100644 -index 0000000000..a85466bc7e +index 000000000..a85466bc7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java @@ -0,0 +1,112 @@ @@ -177,7 +177,7 @@ index 0000000000..a85466bc7e + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1ddb10741b..97a0a69247 100644 +index c15ca642d..7c268eb54 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,6 +1,9 @@ @@ -190,7 +190,7 @@ index 1ddb10741b..97a0a69247 100644 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.JsonElement; -@@ -1083,7 +1086,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant= 5000000000L) { this.Z = i; this.serverPing.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.getMaxPlayers(), this.getPlayerCount())); @@ -200,7 +200,7 @@ index 1ddb10741b..97a0a69247 100644 for (int k = 0; k < agameprofile.length; ++k) { diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index 658ea609cb..4bb21c48bd 100644 +index 658ea609c..4bb21c48b 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener { @@ -223,7 +223,7 @@ index 658ea609cb..4bb21c48bd 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java -index aa125a52dc..ea52e89bd9 100644 +index aa125a52d..ea52e89bd 100644 --- a/src/main/java/net/minecraft/server/ServerPing.java +++ b/src/main/java/net/minecraft/server/ServerPing.java @@ -29,6 +29,7 @@ public class ServerPing { @@ -248,7 +248,7 @@ index aa125a52dc..ea52e89bd9 100644 this.c = agameprofile; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 6d77bbc5aa..1cf214eaca 100644 +index 6d77bbc5a..1cf214eac 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -285,7 +285,7 @@ public class SpigotConfig @@ -261,5 +261,5 @@ index 6d77bbc5aa..1cf214eaca 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch index 933d4c8a0..05ce2efc5 100644 --- a/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 18a12fd61ac30c984eec18f436140016bb7e072e Mon Sep 17 00:00:00 2001 +From d64b180eee3b104b95e6ceba2583c2913a0c3749 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler @@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue. diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java new file mode 100644 -index 0000000000..3c1992e212 +index 000000000..3c1992e21 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -0,0 +1,122 @@ @@ -159,7 +159,7 @@ index 0000000000..3c1992e212 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index e102be583c..5db848de14 100644 +index e102be583..5db848de1 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -365,5 +365,5 @@ index e102be583c..5db848de14 100644 private boolean isReady(final int currentTick) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 471af38e5..061701ce6 100644 --- a/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From 992532977da87f5636f6d26d3ca13a372071db85 Mon Sep 17 00:00:00 2001 +From 27e6be6396d1f96cf3a7833ad89c9ba3b69fbebf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:45:57 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 828b64e419..0614976b86 100644 +index 1fb609dcf..1b43f9216 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -1,5 +1,7 @@ @@ -44,5 +44,5 @@ index 828b64e419..0614976b86 100644 if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch index c223882bd..4248c04e9 100644 --- a/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From c17321568e2cff1078506c6d8c97f0b3dc277c6f Mon Sep 17 00:00:00 2001 +From e7b7e68bd9f3c6cfea4dbc2ed611f317971fa462 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0d3dceba6..1aa373ed3 100644 +index ef9eabb83..0f12f8386 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 0d3dceba6..1aa373ed3 100644 private final ItemCooldown bW; @Nullable diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 0614976b8..a985ae7ba 100644 +index 1b43f9216..1c4ac7bf7 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener { @@ -138,5 +138,5 @@ index 6f47768c9..c3f8f3f4c 100644 public void removeDisconnectingPlayer(Player player) { hiddenPlayers.remove(player.getUniqueId()); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch index 8b42edcad..901699daf 100644 --- a/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From 6a9a1797c502aa96a964168b5d5f0a32fae0709d Mon Sep 17 00:00:00 2001 +From cd9c5fb2772c2d4dbb2450cfaaad3bee55286884 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 20:52:07 -0400 Subject: [PATCH] Fix Dragon Server Crashes @@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge, it will infinitely keep looking for non air and eventually crash. diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java -index c42de9771e..40a8beff55 100644 +index c42de9771..40a8beff5 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -54,7 +54,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -20,5 +20,5 @@ index c42de9771e..40a8beff55 100644 if (d3 < 0.0D) { d3 = d2; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch index 9989841d1..902291e3d 100644 --- a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From b3f434caaf4cd3c54698cee75bbdd1fc66ebb530 Mon Sep 17 00:00:00 2001 +From 7ddb76f31f9ac6e7eef564305d6e6297bc1c56bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ 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 9fe19fb595..296a11f141 100644 +index 3fa327eb3..489f12152 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 { @@ -40,5 +40,5 @@ index 9fe19fb595..296a11f141 100644 @Deprecated public OfflinePlayer getOfflinePlayer(String name) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch index 504f3bbf1..972eb1eef 100644 --- a/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch @@ -1,11 +1,11 @@ -From cbdc8be63d8cc41da8d4d75ad99e066d9132fd04 Mon Sep 17 00:00:00 2001 +From 9e844af5534869173b64d8cc780ceb637c59467f Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 26 Mar 2018 18:30:53 +0300 Subject: [PATCH] Make player data saving configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5884b04f7e..ba341e0174 100644 +index 5884b04f7..ba341e017 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -270,4 +270,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 5884b04f7e..ba341e0174 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index a0254d8e51..e60e10c57d 100644 +index a0254d8e5..e60e10c57 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -35,5 +35,5 @@ index a0254d8e51..e60e10c57d 100644 NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound()); File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp"); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch index d0bc2e922..387c111e7 100644 --- a/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From 88e48ce26b86d60d39c9bb4d371d48e995fc6502 Mon Sep 17 00:00:00 2001 +From e00d41b0c5e486b4a9b2f5305c2fdbb2f8220205 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 18:22:50 +0200 Subject: [PATCH] Make legacy ping handler more reliable @@ -28,7 +28,7 @@ respond to the request. [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 9ee5a1ff02..063efe9bbe 100644 +index 9ee5a1ff0..063efe9bb 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter { @@ -167,5 +167,5 @@ index 9ee5a1ff02..063efe9bbe 100644 channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch index e1ffd92f4..314ec68ad 100644 --- a/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From 302dff4265ee6786aa146d3f0a91335e603e83fc Mon Sep 17 00:00:00 2001 +From 9a3e5b4bf61d8ca313389ffc04567a30b9d0b12c Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:51 +0200 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings @@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java new file mode 100644 -index 0000000000..74c012fd40 +index 000000000..74c012fd4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java @@ -0,0 +1,73 @@ @@ -84,7 +84,7 @@ index 0000000000..74c012fd40 + +} diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 063efe9bbe..4a49fe4cc6 100644 +index 063efe9bb..4a49fe4cc 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -1,5 +1,7 @@ @@ -153,5 +153,5 @@ index 063efe9bbe..4a49fe4cc6 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch index a4f016ca7..2c7645799 100644 --- a/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From 1b4ab63e7c443d50e49617d8c487370b90f650a6 Mon Sep 17 00:00:00 2001 +From ed65177c90b9a615bd215ae490fd2c8c1d77bf60 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 17:04:26 +0100 Subject: [PATCH] Flag to disable the channel limit @@ -30,5 +30,5 @@ index c3f8f3f4c..f4affa693 100644 if (channels.add(channel)) { server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch index 2ea422ecc..f5e5856f0 100644 --- a/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch @@ -1,11 +1,11 @@ -From a5fef17d17b313d74e01ed606dcb48ef44a87b79 Mon Sep 17 00:00:00 2001 +From 1307fc5c788198525489a1f45868d5b885e17c5f Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:29:37 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index a1397d1427..cd8ad27047 100644 +index a1397d142..cd8ad2704 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -764,4 +764,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -27,5 +27,5 @@ index a1397d1427..cd8ad27047 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch index 04f49f5db..f4cbb0bca 100644 --- a/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch @@ -1,4 +1,4 @@ -From 33100445f19f3f90c54e22eb6e201f2e9eb84a1e Mon Sep 17 00:00:00 2001 +From 5e79b0383c61e9474b21ecfa7805505bda9459a4 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 14 Apr 2018 20:20:46 +0200 Subject: [PATCH] Configurable sprint interruption on attack @@ -20,7 +20,7 @@ index 77cdbfadf..171c8e303 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 1aa373ed3..9595c3b0a 100644 +index 0f12f8386..2b7c0a29d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1112,7 +1112,11 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index ae08e8e74..8b3739253 100644 --- a/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,11 +1,11 @@ -From 525e9a5b2ced642a9fa7fd1ad5e1f5e3b12ea495 Mon Sep 17 00:00:00 2001 +From a03d0fda0fd2195c8c2b50b96ce17a9bce897080 Mon Sep 17 00:00:00 2001 From: 0x22 <0x22@futureclient.net> Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ad2a366275..8757b6751e 100644 +index ad2a36627..8757b6751 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2501,7 +2501,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index ad2a366275..8757b6751e 100644 SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); this.server.getPluginManager().callEvent(event); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch index 3cb2d4b3c..b1d9d3c74 100644 --- a/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch +++ b/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 9d46828b5e69a5ea24167b4696db0428520a559a Mon Sep 17 00:00:00 2001 +From 3be42a987d37a35a9a89ed6c41aa5c9e7bf7c1ee Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:15:55 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -81,5 +81,5 @@ index 1cc66108d..37ca65209 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch index 9c126d384..f433ba3d0 100644 --- a/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 35f7c053217f45c19fea1bae3ab1d64c3081ca0a Mon Sep 17 00:00:00 2001 +From 396e5ec1fbcb4993db13d4f7c6aa492e44d438b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:44 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 60ff027700..6868ca4154 100644 +index 37ca65209..a1a5129a6 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -193,6 +193,7 @@ public class EntityEnderman extends EntityMonster { @@ -18,7 +18,7 @@ index 60ff027700..6868ca4154 100644 if (!this.world.p_() && this.isAlive()) { double d0 = this.locX() + (this.random.nextDouble() - 0.5D) * 64.0D; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java -index 970efabd37..0c5f359346 100644 +index 970efabd3..0c5f35934 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman { @@ -30,5 +30,5 @@ index 970efabd37..0c5f359346 100644 public MaterialData getCarriedMaterial() { IBlockData blockData = getHandle().getCarried(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch index a33c80011..5d8516e12 100644 --- a/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch +++ b/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch @@ -1,4 +1,4 @@ -From 1014a6b22c4d4d7a6916d7cc31d9fbc993298a5a Mon Sep 17 00:00:00 2001 +From 6470e4c8b90ae14c4b05f2d98e072c5c86917966 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:15:26 -0400 Subject: [PATCH] Block Enderpearl Travel Exploit diff --git a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch index d018d4fa4..520c79c6d 100644 --- a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 4c2fee4cc060dab594d18db9cccb7506def3b3af Mon Sep 17 00:00:00 2001 +From 50345a69210dc593487981be003c2d2e516aa4bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9063e4b775..abf91bd8ce 100644 +index fe1a87ba5..9ee58acf7 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -56,7 +56,7 @@ public class WorldServer extends World { @@ -22,7 +22,7 @@ index 9063e4b775..abf91bd8ce 100644 boolean tickingEntities; private final MinecraftServer server; private final WorldNBTStorage dataManager; -@@ -1390,12 +1390,17 @@ public class WorldServer extends World { +@@ -1400,12 +1400,17 @@ public class WorldServer extends World { } public int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) { @@ -43,7 +43,7 @@ index 9063e4b775..abf91bd8ce 100644 if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 06bf562446..752826b730 100644 +index 63b1cb2a4..59036635d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2250,11 +2250,17 @@ public class CraftWorld implements World { @@ -66,5 +66,5 @@ index 06bf562446..752826b730 100644 x, y, z, // Position count, // Count -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch index f49dbff62..362acc2b3 100644 --- a/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From 24c9f46cdac11e14f83a383b6dbc4917c75dab16 Mon Sep 17 00:00:00 2001 +From f6fc2c7854b5b579a9ff53da916d794497e37d98 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:18:54 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 6868ca4154..607d6da6a4 100644 +index a1a5129a6..ca8e43fdf 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -141,7 +141,15 @@ public class EntityEnderman extends EntityMonster { @@ -28,5 +28,5 @@ index 6868ca4154..607d6da6a4 100644 if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch index a133fe233..9a3fbd683 100644 --- a/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 660fec333580d4510f4bcd1c645c14461a341c31 Mon Sep 17 00:00:00 2001 +From 6c351f735cd500670e4b7519ee5d8bec7514bc20 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:35:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent Fires when a witch consumes the potion in their hand diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index ddff0b5786..aa90111716 100644 +index ddff0b578..aa9011171 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -23,5 +23,5 @@ index ddff0b5786..aa90111716 100644 if (list != null) { Iterator iterator = list.iterator(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch index c5e92d328..52a775aaa 100644 --- a/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 6472b7b72f2ec634ac692407a510ee91e004db33 Mon Sep 17 00:00:00 2001 +From 923a9bb5d957171880b0599f4c3ae1b83dd1185a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:44:58 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index aa90111716..1f2759e95e 100644 +index aa9011171..1f2759e95 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -29,5 +29,5 @@ index aa90111716..1f2759e95e 100644 entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F); this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch index ce9ee4e77..7e90fb38e 100644 --- a/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From abc659a524bfb3e1826d09f1ce75afb50440e446 Mon Sep 17 00:00:00 2001 +From 4f31cdeae215ee9d214801cd8f3403a34423fc49 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity @@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function Item can be set inside of the Consumer pre spawn function. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 752826b730..40eb71d9b7 100644 +index 59036635d..66026f5a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1472,6 +1472,10 @@ public class CraftWorld implements World { @@ -23,5 +23,5 @@ index 752826b730..40eb71d9b7 100644 entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z))); } else if (Projectile.class.isAssignableFrom(clazz)) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch index 51d8f051d..ccd656758 100644 --- a/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch @@ -1,11 +1,11 @@ -From 799359edc3098c9b8ac49c02fdaf8e61f8793fd4 Mon Sep 17 00:00:00 2001 +From ec353e040667da4498b275444cbd0e0b3d5a1eb9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:26 -0400 Subject: [PATCH] WitchReadyPotionEvent diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 1f2759e95e..be6ecfb08a 100644 +index 1f2759e95..be6ecfb08 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -22,5 +22,5 @@ index 1f2759e95e..be6ecfb08a 100644 this.t(true); this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch index 2e2c7f66a..19972186a 100644 --- a/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 3668331a4c3224665732696a292e087603180f9e Mon Sep 17 00:00:00 2001 +From 73304cde973ae42e0f466ffda4c9b623ffc4066f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 23:00:29 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 2d0a8c58fb..5fc7124dd5 100644 +index 2f08979f0..1d2eb4a6e 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -548,6 +548,7 @@ public final class ItemStack { @@ -18,7 +18,7 @@ index 2d0a8c58fb..5fc7124dd5 100644 return this.getItem().f_(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 3dd912abe3..a41be8fdae 100644 +index 3dd912abe..a41be8fda 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack { @@ -36,5 +36,5 @@ index 3dd912abe3..a41be8fdae 100644 public void addUnsafeEnchantment(Enchantment ench, int level) { Validate.notNull(ench, "Cannot add null enchantment"); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch index 7bd0f12d4..9a58759c3 100644 --- a/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch @@ -1,11 +1,11 @@ -From 5df14fcf69aad1c5e8fedb327641895e3b825a1b Mon Sep 17 00:00:00 2001 +From 1e19459784bfceba96d48192000c9a8f2f34b4ad Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 14:08:39 +0200 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index 78fba79378..c71f76004e 100644 +index 78fba7937..c71f76004 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -145,8 +145,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -30,5 +30,5 @@ index 78fba79378..c71f76004e 100644 this.h(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index 9168349dc..a71f93288 100644 --- a/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -1,4 +1,4 @@ -From 71b17d41c230f37f7896238653970eb145a1bca7 Mon Sep 17 00:00:00 2001 +From cdc3ed1642102a6f61d4eeb17950e734e03653cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 01:18:49 -0400 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event @@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event Otherwise the creeper infinite explodes diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index dabe40c5f9..317c1998e6 100644 +index 374cf28fb..b89530079 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster { @@ -27,5 +27,5 @@ index dabe40c5f9..317c1998e6 100644 // CraftBukkit end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch index b2c87450c..82fc7ccf3 100644 --- a/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch +++ b/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch @@ -1,4 +1,4 @@ -From 655e6e34576247e9c6e0dc75782d760880823d12 Mon Sep 17 00:00:00 2001 +From 74ebd795cfb3e9be77acd0fefb44bba990daabd4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:20:15 -0400 Subject: [PATCH] Fix CraftEntity hashCode @@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle() However, replaced it too to make it clearer of intent. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 495a7c464f..915ccb1807 100644 +index 495a7c464..915ccb180 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -723,14 +723,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -45,5 +45,5 @@ index 495a7c464f..915ccb1807 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch index 56a626858..04f463899 100644 --- a/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -1,4 +1,4 @@ -From 5fc41c66b880fb304f3fe0fc635283d996c6ad67 Mon Sep 17 00:00:00 2001 +From 428f1be4a81dd51929c799a41974145043559d8e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 00:30:32 -0400 Subject: [PATCH] Configurable Alternative LootPool Luck Formula @@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas. I would love to see this change in Vanilla, so Mojang please pull :) diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ba341e0174..26ab855dcf 100644 +index ba341e017..26ab855dc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -279,4 +279,12 @@ public class PaperConfig { @@ -53,7 +53,7 @@ index ba341e0174..26ab855dcf 100644 + } } diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java -index 3ed6a1e785..03398ce8fd 100644 +index 3ed6a1e78..03398ce8f 100644 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java @@ -11,8 +11,8 @@ import org.apache.commons.lang3.ArrayUtils; @@ -109,5 +109,5 @@ index 3ed6a1e785..03398ce8fd 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch index b4e38eb9a..aaf95c9f9 100644 --- a/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch @@ -1,11 +1,11 @@ -From 46da088e8952a8d9435ff03034ea2b2c4c48bf4e Mon Sep 17 00:00:00 2001 +From 46d3879915b37e8353a50391d46c73486636cb73 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 20:37:03 -0400 Subject: [PATCH] Print Error details when failing to save player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index e60e10c57d..350ac42d6b 100644 +index e60e10c57..350ac42d6 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -151,7 +151,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -18,5 +18,5 @@ index e60e10c57d..350ac42d6b 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch index 26243f2b5..d01f606f6 100644 --- a/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From d51d14dfa3970f44d5446bfd91311b2096206b39 Mon Sep 17 00:00:00 2001 +From b927a1aee8f1ba2e8209b7f737a9be471a002e11 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:18:16 -0500 Subject: [PATCH] Make shield blocking delay configurable @@ -19,10 +19,10 @@ index 9c52e31f4..33ce9a500 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c03fcd2d3..3f493f415 100644 +index fe0b08220..a738848ec 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2996,7 +2996,7 @@ public abstract class EntityLiving extends Entity { +@@ -2998,7 +2998,7 @@ public abstract class EntityLiving extends Entity { if (this.isHandRaised() && !this.activeItem.isEmpty()) { Item item = this.activeItem.getItem(); @@ -31,9 +31,9 @@ index c03fcd2d3..3f493f415 100644 } else { return false; } -@@ -3235,4 +3235,15 @@ public abstract class EntityLiving extends Entity { - public void d(EnumHand enumhand) { - this.c(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); +@@ -3237,4 +3237,15 @@ public abstract class EntityLiving extends Entity { + public void broadcastItemBreak(EnumHand enumhand) { + this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); } + // Paper start + public int shieldBlockingDelay = world.paperConfig.shieldBlockingDelay; diff --git a/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch index ae6f3fc1e..8b8e9b5d3 100644 --- a/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch +++ b/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch @@ -1,4 +1,4 @@ -From bd24b362196cf6f9c17d8e3438a479615614d3e1 Mon Sep 17 00:00:00 2001 +From f515ce3d4d364afc397e823afbf29457bca7cf4a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jun 2018 16:23:38 -0400 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors This code was causing NPE's in saving player data, potentially related to reloads. diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java -index 0203e26ec9..aa6e5681f6 100644 +index 0203e26ec..aa6e5681f 100644 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java @@ -79,6 +79,10 @@ public class RecipeBookServer extends RecipeBook { @@ -32,5 +32,5 @@ index 0203e26ec9..aa6e5681f6 100644 nbttaglist1.add(NBTTagString.a(minecraftkey1.toString())); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index cd0458bd5..240a81316 100644 --- a/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 99fb5247c638c50f256eb2f377ad094772308815 Mon Sep 17 00:00:00 2001 +From 37e33369c3579bbdf56a449fbeb38e83e1433564 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:51:17 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index d97558da3..fdeb8980d 100644 +index fb9656afd..3c95c0428 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -19,7 +19,7 @@ index d97558da3..fdeb8980d 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java -index 4b07e18c7..71800b34b 100644 +index 83aa70c29..26899916d 100644 --- a/src/main/java/net/minecraft/server/ItemBow.java +++ b/src/main/java/net/minecraft/server/ItemBow.java @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon { @@ -41,7 +41,7 @@ index 4b07e18c7..71800b34b 100644 return; @@ -71,7 +72,8 @@ public class ItemBow extends ItemProjectileWeapon { itemstack.damage(1, entityhuman, (entityhuman1) -> { - entityhuman1.d(entityhuman.getRaisedHand()); + entityhuman1.broadcastItemBreak(entityhuman.getRaisedHand()); }); - if (flag1 || entityhuman.abilities.canInstantlyBuild && (itemstack1.getItem() == Items.SPECTRAL_ARROW || itemstack1.getItem() == Items.TIPPED_ARROW)) { + consumeArrow = event.getConsumeArrow(); // Paper @@ -59,7 +59,7 @@ index 4b07e18c7..71800b34b 100644 if (itemstack1.isEmpty()) { entityhuman.inventory.f(itemstack1); diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 608be9e70..011efc6f5 100644 +index 7be41c869..60a47bccc 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -221,7 +221,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -104,5 +104,5 @@ index f9b0f39f7..caf277439 100644 return event; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch index 4d08456b1..c2d0f9513 100644 --- a/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From aac2c8bb5c984fbcdb11ebd6a391e4de76851b62 Mon Sep 17 00:00:00 2001 +From 73b674eb1c10159d3350d650a4e0d34530df1505 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:12:53 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -7,10 +7,10 @@ Called when a player is firing a bow and the server is choosing an arrow to use. Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 4e91fdd69e..3917980b76 100644 +index 2b7c0a29d..4280dacdc 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -2149,6 +2149,17 @@ public abstract class EntityHuman extends EntityLiving { +@@ -2150,6 +2150,17 @@ public abstract class EntityHuman extends EntityLiving { return (EntitySize) EntityHuman.b.getOrDefault(entitypose, EntityHuman.bp); } @@ -28,7 +28,7 @@ index 4e91fdd69e..3917980b76 100644 @Override public ItemStack f(ItemStack itemstack) { if (!(itemstack.getItem() instanceof ItemProjectileWeapon)) { -@@ -2165,7 +2176,7 @@ public abstract class EntityHuman extends EntityLiving { +@@ -2166,7 +2177,7 @@ public abstract class EntityHuman extends EntityLiving { for (int i = 0; i < this.inventory.getSize(); ++i) { ItemStack itemstack2 = this.inventory.getItem(i); @@ -38,5 +38,5 @@ index 4e91fdd69e..3917980b76 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch index 6aaaddc53..571c88900 100644 --- a/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch +++ b/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -1,11 +1,11 @@ -From 7bdaa94715970463f8750208a4b3bc8f7228ab44 Mon Sep 17 00:00:00 2001 +From 8a9248e1324f866573fb7013ad89d0a7812affd5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 22:19:36 -0400 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 2ea0583a3e..81b7cd06f2 100644 +index 2ea0583a3..81b7cd06f 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -138,8 +138,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan @@ -29,5 +29,5 @@ index 2ea0583a3e..81b7cd06f2 100644 class a extends EntityIllagerWizard.c { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch index ab3581f96..ff91e1cb4 100644 --- a/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 875bd87e9087628e63e007d8c50b833c982db8bb Mon Sep 17 00:00:00 2001 +From ebd1410d870c38f3e1cacd5bc446639fa3f3226e Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:46:23 +0200 Subject: [PATCH] Implement EntityKnockbackByEntityEvent @@ -6,10 +6,10 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3f493f4158..855afcd64b 100644 +index a738848ec..2196dbfce 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1419,6 +1419,16 @@ public abstract class EntityLiving extends Entity { +@@ -1421,6 +1421,16 @@ public abstract class EntityLiving extends Entity { Vec3D vec3d1 = (new Vec3D(d0, 0.0D, d1)).d().a((double) f); this.setMot(vec3d.x / 2.0D - vec3d1.x, this.onGround ? Math.min(0.4D, vec3d.y / 2.0D + (double) f) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); @@ -27,5 +27,5 @@ index 3f493f4158..855afcd64b 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0237-Expand-Explosions-API.patch b/Spigot-Server-Patches/0237-Expand-Explosions-API.patch index c46f1ee20..656b5d26a 100644 --- a/Spigot-Server-Patches/0237-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0237-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 25a159b876a2da7ff22aae09750a4c550dd8af18 Mon Sep 17 00:00:00 2001 +From 7e642c7be08e270da1bf557d38a05ece64c975e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 40eb71d9b7..6fe8a61860 100644 +index 66026f5a4..6b04a031e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -881,6 +881,11 @@ public class CraftWorld implements World { @@ -22,5 +22,5 @@ index 40eb71d9b7..6fe8a61860 100644 @Override public boolean createExplosion(Location loc, float power) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch index 099ad4f45..48a0d22c0 100644 --- a/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 6180f5f273986977648298889eb810bb4e03ad84 Mon Sep 17 00:00:00 2001 +From 6f38b65376127fff7e2c97dcbc7571677ac50af6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:21:28 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 855afcd64b..470cbddeb8 100644 +index 2196dbfce..fea821be1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity { @@ -18,7 +18,7 @@ index 855afcd64b..470cbddeb8 100644 protected int bl; protected int bm; private BlockPosition bE; -@@ -2974,10 +2974,12 @@ public abstract class EntityLiving extends Entity { +@@ -2976,10 +2976,12 @@ public abstract class EntityLiving extends Entity { return this.activeItem; } @@ -32,7 +32,7 @@ index 855afcd64b..470cbddeb8 100644 return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 67f275321b..379239567e 100644 +index 67f275321..379239567 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -642,5 +642,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -62,5 +62,5 @@ index 67f275321b..379239567e 100644 // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0239-RangedEntity-API.patch b/Spigot-Server-Patches/0239-RangedEntity-API.patch index 327de1c7a..4607c2b30 100644 --- a/Spigot-Server-Patches/0239-RangedEntity-API.patch +++ b/Spigot-Server-Patches/0239-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 3bdc0c6bb3c52b1a0990d913e91f9ae2a14836fc Mon Sep 17 00:00:00 2001 +From 4011816022ca926c37a6617b631eab9967362037 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 22:00:49 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java new file mode 100644 -index 0000000000..696660b089 +index 000000000..696660b08 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java @@ -0,0 +1,19 @@ @@ -32,7 +32,7 @@ index 0000000000..696660b089 + } +} diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java -index b4178ce1e8..9b79ac77db 100644 +index b4178ce1e..9b79ac77d 100644 --- a/src/main/java/net/minecraft/server/IRangedEntity.java +++ b/src/main/java/net/minecraft/server/IRangedEntity.java @@ -2,5 +2,8 @@ package net.minecraft.server; @@ -46,7 +46,7 @@ index b4178ce1e8..9b79ac77db 100644 + void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java -index 2ec1af8be4..f31d3eed3a 100644 +index 2ec1af8be..f31d3eed3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java @@ -1,11 +1,12 @@ @@ -64,7 +64,7 @@ index 2ec1af8be4..f31d3eed3a 100644 public CraftIllusioner(CraftServer server, EntityIllagerIllusioner entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index 23ab78da15..3f94c5a920 100644 +index 23ab78da1..3f94c5a92 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -1,5 +1,6 @@ @@ -84,7 +84,7 @@ index 23ab78da15..3f94c5a920 100644 public CraftLlama(CraftServer server, EntityLlama entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java -index b4ae898401..02df66ecfe 100644 +index b4ae89840..02df66ecf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java @@ -1,11 +1,12 @@ @@ -102,7 +102,7 @@ index b4ae898401..02df66ecfe 100644 public CraftSkeleton(CraftServer server, EntitySkeletonAbstract entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -index 27460c59e3..e482b1c9dc 100644 +index 27460c59e..e482b1c9d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java @@ -1,11 +1,12 @@ @@ -120,7 +120,7 @@ index 27460c59e3..e482b1c9dc 100644 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java -index 244e4dc8ec..bae107e76e 100644 +index 244e4dc8e..bae107e76 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,11 +1,12 @@ @@ -138,7 +138,7 @@ index 244e4dc8ec..bae107e76e 100644 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -index 38b555cc7e..03cf6136e6 100644 +index 38b555cc7..03cf6136e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java @@ -1,5 +1,6 @@ @@ -158,5 +158,5 @@ index 38b555cc7e..03cf6136e6 100644 private BossBar bossBar; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch index c59cde497..d5455a738 100644 --- a/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch +++ b/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch @@ -1,4 +1,4 @@ -From 050181755667e9b0c3c795c28fbe2b2b12e3c213 Mon Sep 17 00:00:00 2001 +From feef818cc5cfdd932c98332379135eb104f4d78a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 22 Jun 2018 10:38:31 -0500 Subject: [PATCH] Add config to disable ender dragon legacy check diff --git a/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch index c58dcd3dd..59ed5d581 100644 --- a/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch @@ -1,11 +1,11 @@ -From b8e5bf67bb39d100b7b3e868838ae7567331bb77 Mon Sep 17 00:00:00 2001 +From 2a7ceb4f880d6a4e1b6f651230e3588a96da4051 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:08:14 +0200 Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6fe8a61860..3df8c336f8 100644 +index 6b04a031e..a257dce8f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1274,6 +1274,15 @@ public class CraftWorld implements World { @@ -25,5 +25,5 @@ index 6fe8a61860..3df8c336f8 100644 public void save() { org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch index 0281c6ddc..771652506 100644 --- a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 41d659c8d3733aa980d3d3f0c18fd2e030bfe76b Mon Sep 17 00:00:00 2001 +From 741de755a8d799b1867c66b78d561cbc3ac661de Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index ba3e6b882..2265b01e6 100644 +index 4280dacdc..1f3513874 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -34,7 +34,7 @@ index ba3e6b882..2265b01e6 100644 this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 636667a8e..2419feba7 100644 +index 68b19a3fc..5e2e0674a 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -114,10 +114,10 @@ index 002f7e844..fd0f5c6f2 100644 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); cserver.getPluginManager().callEvent(playerQuitEvent); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index abf91bd8c..fa7b38a5c 100644 +index 9ee58acf7..ae7df6141 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1036,7 +1036,7 @@ public class WorldServer extends World { +@@ -1046,7 +1046,7 @@ public class WorldServer extends World { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) { @@ -126,7 +126,7 @@ index abf91bd8c..fa7b38a5c 100644 } } } -@@ -1059,7 +1059,7 @@ public class WorldServer extends World { +@@ -1069,7 +1069,7 @@ public class WorldServer extends World { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) { @@ -193,5 +193,5 @@ index caf277439..f931fa48b 100644 human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity()); } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch index 7ecc2822d..b2f62222a 100644 --- a/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch +++ b/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch @@ -1,4 +1,4 @@ -From 47f50e10ef01160769a2557af0f38894370fef12 Mon Sep 17 00:00:00 2001 +From 76f529f06c0254ff538046d8fd57220f3eefaeab Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:22:06 -0400 Subject: [PATCH] Configurable Bed Search Radius diff --git a/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch index 63d12562c..c15f49a8f 100644 --- a/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch +++ b/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch @@ -1,4 +1,4 @@ -From 715b0caa9037c29a24fa6f1b1019e8fd1113b6de Mon Sep 17 00:00:00 2001 +From 7b6494b56f7f05c5d7a55525082a90605161562b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:30:22 -0400 Subject: [PATCH] Vex#getSummoner API @@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API Get's the NPC that summoned this Vex diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index cd9fb3aabf..a46730460e 100644 +index cd9fb3aab..a46730460 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster { @@ -18,7 +18,7 @@ index cd9fb3aabf..a46730460e 100644 return this.c; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 737a37b6fe..169c951ec3 100644 +index 737a37b6f..169c951ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -1,8 +1,10 @@ @@ -47,5 +47,5 @@ index 737a37b6fe..169c951ec3 100644 public String toString() { return "CraftVex"; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 126a84a15..5e1138cba 100644 --- a/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From 469b199f7aa9f37f09967637b108a23da00b5211 Mon Sep 17 00:00:00 2001 +From d82f7d4350a122be3d5f77d8cdeae7adcc174c96 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 13 Jul 2018 14:54:43 +0200 Subject: [PATCH] Refresh player inventory when cancelling @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4f04410f9b..3a7e197e39 100644 +index 4f04410f9..3a7e197e3 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1949,6 +1949,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -28,5 +28,5 @@ index 4f04410f9b..3a7e197e39 100644 } // CraftBukkit end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch index f6d3b0f1a..112589b46 100644 --- a/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,11 +1,11 @@ -From 492d9f6d6c7c890086f19cf58bc31a7c23170883 Mon Sep 17 00:00:00 2001 +From 6485e9ecad897fa344735fc3ffb9f0b57ce46a81 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:05:00 -0400 Subject: [PATCH] Don't change the Entity Random seed for squids diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 1c1ff2069d..92efe4e7f5 100644 +index 1c1ff2069..92efe4e7f 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal { @@ -18,5 +18,5 @@ index 1c1ff2069d..92efe4e7f5 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch index a8e1509ec..d1bbfda2e 100644 --- a/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From a6e586600f6ce7513744a523bae5cbac889e4f49 Mon Sep 17 00:00:00 2001 +From d2d62998ed68f66af8cfa85e33aea7a3d94c1bee Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:08:05 -0400 Subject: [PATCH] Re-add vanilla entity warnings for duplicates @@ -8,10 +8,10 @@ These are a critical sign that somethin went wrong, and you've lost some data... We should kind of know about these things you know. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fa7b38a5c..d30f2f18a 100644 +index ae7df6141..389036405 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1021,7 +1021,8 @@ public class WorldServer extends World { +@@ -1031,7 +1031,8 @@ public class WorldServer extends World { if (entity1 == null) { return false; } else { @@ -22,5 +22,5 @@ index fa7b38a5c..d30f2f18a 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index c8df51e9a..f548a9f37 100644 --- a/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -1,11 +1,11 @@ -From a85c8b0c7857937f33ecede1016c4ae13dcd981f Mon Sep 17 00:00:00 2001 +From 5abcca34e2d2e1667c9940c92bbee26f4bbba795 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 16 Jul 2018 12:42:20 +0200 Subject: [PATCH] Avoid item merge if stack size above max stack size diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index fcc1c0993d..5f46c7f869 100644 +index fcc1c0993..5f46c7f86 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -170,6 +170,10 @@ public class EntityItem extends Entity { @@ -20,5 +20,5 @@ index fcc1c0993d..5f46c7f869 100644 double radius = world.spigotConfig.itemMerge; List list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch index b62b8a4e1..faf75dfdd 100644 --- a/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch @@ -1,11 +1,11 @@ -From e00c207e94e81d585c7e87e31b4fd8b1a0793044 Mon Sep 17 00:00:00 2001 +From 46899c78b914ac9c9befdc72fb414654ce6335f1 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 17 Jul 2018 16:42:17 +0200 Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index dbc425524c..d10c219e3f 100644 +index 9e06edfe2..907807ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,13 @@ @@ -24,7 +24,7 @@ index dbc425524c..d10c219e3f 100644 asm diff --git a/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java new file mode 100644 -index 0000000000..db652a1f7a +index 000000000..db652a1f7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java @@ -0,0 +1,17 @@ @@ -46,7 +46,7 @@ index 0000000000..db652a1f7a + } +} diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties -index 0694b21465..30efeb5faf 100644 +index 0694b2146..30efeb5fa 100644 --- a/src/main/resources/log4j2.component.properties +++ b/src/main/resources/log4j2.component.properties @@ -1 +1,3 @@ @@ -54,5 +54,5 @@ index 0694b21465..30efeb5faf 100644 +log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy" log4j.skipJansi=true -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch index 7517db378..532427daa 100644 --- a/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch +++ b/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch @@ -1,4 +1,4 @@ -From 711048be5cefd3e2532ca823422c9e824daf90b9 Mon Sep 17 00:00:00 2001 +From 222aebd187b7bc6b50fc8910301f4545272aca99 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:13:28 -0400 Subject: [PATCH] add more information to Entity.toString() @@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7c4ab7fe72..5823b3740d 100644 +index e57b623ef..591e2ad56 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2499,7 +2499,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -19,5 +19,5 @@ index 7c4ab7fe72..5823b3740d 100644 public boolean isInvulnerable(DamageSource damagesource) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 60f0de81a..d708b52a0 100644 --- a/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -1,4 +1,4 @@ -From 133c4428c9213988f6aa1456827a302ae93f9600 Mon Sep 17 00:00:00 2001 +From 5dd454f6d8e206f785b33b548a9571230b95b1e0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 08:25:40 -0400 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues @@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues Add -Ddebug.entities=true to your JVM flags to gain more information diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5823b3740..3458333c9 100644 +index 591e2ad56..e5987be45 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -19,10 +19,10 @@ index 5823b3740..3458333c9 100644 if (bukkitEntity == null) { bukkitEntity = CraftEntity.getEntity(world.getServer(), this); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6012b86f1..c97349010 100644 +index 426beb181..7edca1744 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -1026,6 +1026,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1031,6 +1031,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } else { PlayerChunkMap.EntityTracker playerchunkmap_entitytracker = new PlayerChunkMap.EntityTracker(entity, i, j, entitytypes.isDeltaTracking()); @@ -30,7 +30,7 @@ index 6012b86f1..c97349010 100644 this.trackedEntities.put(entity.getId(), playerchunkmap_entitytracker); playerchunkmap_entitytracker.track(this.world.getPlayers()); if (entity instanceof EntityPlayer) { -@@ -1068,7 +1069,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1073,7 +1074,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { if (playerchunkmap_entitytracker1 != null) { playerchunkmap_entitytracker1.a(); } @@ -40,7 +40,7 @@ index 6012b86f1..c97349010 100644 protected void g() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e2caba80c..257ea4f33 100644 +index 9987adb6f..9d9e8fed2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -67,6 +67,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -52,7 +52,7 @@ index e2caba80c..257ea4f33 100644 public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d30f2f18a..aaf35e02f 100644 +index 389036405..224f6d151 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -76,6 +76,9 @@ public class WorldServer extends World { @@ -65,7 +65,7 @@ index d30f2f18a..aaf35e02f 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { -@@ -983,8 +986,28 @@ public class WorldServer extends World { +@@ -993,8 +996,28 @@ public class WorldServer extends World { // CraftBukkit start private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot @@ -95,7 +95,7 @@ index d30f2f18a..aaf35e02f 100644 // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; } else if (this.isUUIDTaken(entity)) { -@@ -1156,7 +1179,24 @@ public class WorldServer extends World { +@@ -1166,7 +1189,24 @@ public class WorldServer extends World { } } @@ -122,5 +122,5 @@ index d30f2f18a..aaf35e02f 100644 // CraftBukkit start - SPIGOT-5278 if (entity instanceof EntityDrowned) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0252-EnderDragon-Events.patch b/Spigot-Server-Patches/0252-EnderDragon-Events.patch index 97fb954f6..69161e6fc 100644 --- a/Spigot-Server-Patches/0252-EnderDragon-Events.patch +++ b/Spigot-Server-Patches/0252-EnderDragon-Events.patch @@ -1,11 +1,11 @@ -From 3e3419b34e0a2ba51d62ba44bb8e2a9f939d9f7d Mon Sep 17 00:00:00 2001 +From 1810be56bd2d574eff23ede93286de716da30eb9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:27 -0500 Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java -index 40a8beff55..18fdcd453a 100644 +index 40a8beff5..18fdcd453 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -71,7 +71,11 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -29,7 +29,7 @@ index 40a8beff55..18fdcd453a 100644 public void e() { if (this.d != null) { diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java -index a2c36548ca..a9d20ee3bb 100644 +index a2c36548c..a9d20ee3b 100644 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController { @@ -43,7 +43,7 @@ index a2c36548ca..a9d20ee3bb 100644 if (this.d != null) { while (!this.d.b()) { diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java -index bc08b53fcd..db43ac1cc4 100644 +index bc08b53fc..db43ac1cc 100644 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java @@ -41,8 +41,10 @@ public class EntityDragonFireball extends EntityFireball { @@ -58,5 +58,5 @@ index bc08b53fcd..db43ac1cc4 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch index e230fd1d4..1f0a916f5 100644 --- a/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch +++ b/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch @@ -1,11 +1,11 @@ -From e821e56f5cb1608df4fceead00f1b947c808d63b Mon Sep 17 00:00:00 2001 +From d4d3cc6be23b114b37ebea6ea438beaafa55e597 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:59 -0500 Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 76b253a50d..a43e52889f 100644 +index 92dac35ec..bd524a35b 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -36,11 +36,16 @@ public class ItemFireworks extends Item { @@ -28,7 +28,7 @@ index 76b253a50d..a43e52889f 100644 + // Paper end } - return InteractionResultWrapper.a(entityhuman.b(enumhand)); + return InteractionResultWrapper.success(entityhuman.b(enumhand)); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch index f21e93904..34f456fac 100644 --- a/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From c6943acd17e47ff98ab1014b740e544ea8d9364e Mon Sep 17 00:00:00 2001 +From 94b5f2ac086c6844aeea8e603c73ad062e6ba24e Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 30 Nov 2016 20:56:58 -0600 Subject: [PATCH] Speedup BlockPos by fixing inlining @@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt They had 'callq' (invoke) instead of 'mov' (get from memory) instructions. diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index 71089442c1..c439a8d019 100644 +index 71089442c..c439a8d01 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -7,25 +7,22 @@ import javax.annotation.concurrent.Immutable; @@ -110,7 +110,7 @@ index 71089442c1..c439a8d019 100644 return (int) (f + f1 + f2); } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 1cdf0346fa..5a505b753a 100644 +index 1cdf0346f..5a505b753 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -342,11 +342,13 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -206,5 +206,5 @@ index 1cdf0346fa..5a505b753a 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch index c4921faf9..af83500a3 100644 --- a/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch +++ b/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch @@ -1,4 +1,4 @@ -From 0efdc2836b86d07a56a883c0f1885be68d730630 Mon Sep 17 00:00:00 2001 +From ae9bcdc84f1bc311b5e4bef15658721b17c392a5 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 23 Jul 2018 13:08:19 -0400 Subject: [PATCH] Optimize RegistryID.c() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c() This is a frequent hotspot for world loading/saving. diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java -index e15d286710..e8a48b9a4c 100644 +index e15d28671..e8a48b9a4 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -14,12 +14,14 @@ public class RegistryID implements Registry { @@ -64,5 +64,5 @@ index e15d286710..e8a48b9a4c 100644 public int b() { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 58b666dcf..1b2876dc9 100644 --- a/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,4 +1,4 @@ -From d9d45e34f445632b8da9cc1809c2e2a9dbb3bc9f Mon Sep 17 00:00:00 2001 +From dcbdb23f806c68ebb5eff19bd0b90408855c2a6f Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 12:57:39 +0200 Subject: [PATCH] Option to prevent armor stands from doing entity lookups @@ -19,7 +19,7 @@ index 387e0dcb9..eaaa51e4b 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 257ea4f33..6742c991f 100644 +index 9d9e8fed2..6b09e2732 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -805,6 +805,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch index ef8b0feea..41e3b43d2 100644 --- a/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 1b08c2466b0ea7593464c5d507c01381b8654d1f Mon Sep 17 00:00:00 2001 +From 6f58377aaf6174c5f68b3ec3c2818ef100e0ceea Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 14:22:26 +0200 Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 189542b91..c2ca16968 100644 +index e5987be45..8e23f336a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -76,7 +76,7 @@ index 143be566c..08c83c62d 100644 if (operatorboolean.apply(false, false)) { throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6742c991f..b6d904007 100644 +index 6b09e2732..eb8cadf5c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -164,6 +164,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -146,5 +146,5 @@ index f931fa48b..317a5bf4e 100644 return event; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index d19d8610d..34c232ee9 100644 --- a/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From 6e446408eeb09c8344a208b0e8332b9e82f405d3 Mon Sep 17 00:00:00 2001 +From f50d2da0dac7ab2bfb2cb1d67f325a6f03b4aead Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:18:31 -0400 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it @@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 1efddb5338..6774c64806 100644 +index 1efddb533..6774c6480 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -410,6 +410,7 @@ public class Chunk implements IChunkAccess { @@ -26,5 +26,5 @@ index 1efddb5338..6774c64806 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch index ebc7edddc..b10df0a1d 100644 --- a/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From fd327a71c910a0ae3c12469cce85e43f4359dbc3 Mon Sep 17 00:00:00 2001 +From fc2b2e371a21fe3a22451d658507557f4d2a5885 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:44:23 -0400 Subject: [PATCH] Add some Debug to Chunk Entity slices @@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created if the entity was to end up in 2 different chunk slices diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 6774c64806..b156f5428c 100644 +index 6774c6480..b156f5428 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -402,6 +402,25 @@ public class Chunk implements IChunkAccess { @@ -57,7 +57,7 @@ index 6774c64806..b156f5428c 100644 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6ef5d2ebd7..be8f6ac99f 100644 +index 8e23f336a..e761f7148 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -69,5 +69,5 @@ index 6ef5d2ebd7..be8f6ac99f 100644 public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0260-EntityTransformedEvent.patch b/Spigot-Server-Patches/0260-EntityTransformedEvent.patch index 2432f4502..92a55797c 100644 --- a/Spigot-Server-Patches/0260-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0260-EntityTransformedEvent.patch @@ -1,11 +1,11 @@ -From 1ed0683c782e99636f6ba63841577d7f335dca2b Mon Sep 17 00:00:00 2001 +From 6c4c03f5b661a5a1c2c674fe6b4e613079504979 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:30:03 -0400 Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 1fff4ce63..efde7bd1d 100644 +index 19c12728d..3706c31aa 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -116,6 +116,7 @@ public class EntityMushroomCow extends EntityCow { @@ -17,7 +17,7 @@ index 1fff4ce63..efde7bd1d 100644 this.die(); // CraftBukkit - from above diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 8b0c40147..572723005 100644 +index 6ca4fa43c..6e0020ae0 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -699,6 +699,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -29,7 +29,7 @@ index 8b0c40147..572723005 100644 // CraftBukkit end this.die(); diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 6333d2234..c8e4dcdac 100644 +index 0240cef74..31aba6bfc 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -257,6 +257,7 @@ public class EntityZombie extends EntityMonster { @@ -61,5 +61,5 @@ index 91cac5d53..8082fa617 100644 worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason // CraftBukkit end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch index a0e3839f8..b934c5e69 100644 --- a/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch @@ -1,11 +1,11 @@ -From ba7a297627d6fd7f6834126a3d08366c53d08b3d Mon Sep 17 00:00:00 2001 +From 8bee08608cdd24f44c5b187c54c5bf11c4ca32c5 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:31 -0500 Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index 621f2afee5..290cb9337c 100644 +index 621f2afee..290cb9337 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -31,7 +31,7 @@ index 621f2afee5..290cb9337c 100644 if (flag != this.bG) { this.bG = flag; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index dfe5a63583..37626f925f 100644 +index dfe5a6358..37626f925 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { @@ -43,7 +43,7 @@ index dfe5a63583..37626f925f 100644 this.a.r(false); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java -index e822c2200d..2a7d1d4ec2 100644 +index e822c2200..2a7d1d4ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo @@ -74,5 +74,5 @@ index e822c2200d..2a7d1d4ec2 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch index 8a71414b1..d578ba257 100644 --- a/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch @@ -1,4 +1,4 @@ -From b2869ded2f63a5b8a6f043551781ef4415968f57 Mon Sep 17 00:00:00 2001 +From 1bb924aba6e3b2a14806f3837f67e05731106ed6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 26 Jul 2018 00:11:12 -0400 Subject: [PATCH] Prevent Saving Bad entities to chunks @@ -18,7 +18,7 @@ an invalid entity. This should reduce log occurrences of dupe uuid messages. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 4af5a230ba..6371f2f5b1 100644 +index 4af5a230b..6371f2f5b 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -300,6 +300,7 @@ public class ChunkRegionLoader { @@ -61,5 +61,5 @@ index 4af5a230ba..6371f2f5b1 100644 ProtoChunk protochunk = (ProtoChunk) ichunkaccess; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch index 9a47f15d6..d4a47b771 100644 --- a/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From 7e3cb7dc349b699c6ef547413b9736cbd9f7d103 Mon Sep 17 00:00:00 2001 +From d510614e516f981c111c5832c6488d5892b44ab4 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 26 Jul 2018 14:10:23 +0200 Subject: [PATCH] Don't call getItemMeta on hasItemMeta @@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set. Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index a41be8fdae..d5e8a7ee6d 100644 +index a41be8fda..d5e8a7ee6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -553,7 +553,7 @@ public final class CraftItemStack extends ItemStack { @@ -24,7 +24,7 @@ index a41be8fdae..d5e8a7ee6d 100644 static boolean hasItemMeta(net.minecraft.server.ItemStack item) { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java -index 3a82bede7c..d731418397 100644 +index 3a82bede7..d73141839 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -2,10 +2,9 @@ package org.bukkit.craftbukkit.inventory; @@ -77,5 +77,5 @@ index 3a82bede7c..d731418397 100644 public void testConflictingStoredEnchantment() { EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch index be4b96af4..b29a05a09 100644 --- a/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From 20739b06abb5978e1fb136e7a10ba9314831acc5 Mon Sep 17 00:00:00 2001 +From 9dbb6eb1aa5d92972f3e2c0c0513c6d0e004c4db Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Jul 2018 12:18:27 -0400 Subject: [PATCH] Ignore Dead Entities in entityList iteration @@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since they shouldn't of been in the list in the first place. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index eecf27370b..d704fc79c0 100644 +index eecf27370..d704fc79c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -179,6 +179,7 @@ public class PaperCommand extends Command { @@ -23,7 +23,7 @@ index eecf27370b..d704fc79c0 100644 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ()); diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index b156f5428c..c7c600b80c 100644 +index b156f5428..c7c600b80 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -671,6 +671,7 @@ public class Chunk implements IChunkAccess { @@ -51,7 +51,7 @@ index b156f5428c..c7c600b80c 100644 if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check list.add(t0); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index be8f6ac99f..4a931aaf42 100644 +index e761f7148..ca794328a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -196,6 +196,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -63,10 +63,10 @@ index be8f6ac99f..4a931aaf42 100644 public float getBukkitYaw() { return this.yaw; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index aaf35e02f4..71da6f37e1 100644 +index 224f6d151..ba0389f2f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -894,7 +894,7 @@ public class WorldServer extends World { +@@ -904,7 +904,7 @@ public class WorldServer extends World { while (objectiterator.hasNext()) { Entity entity = (Entity) objectiterator.next(); @@ -75,7 +75,7 @@ index aaf35e02f4..71da6f37e1 100644 if (entity instanceof EntityInsentient) { EntityInsentient entityinsentient = (EntityInsentient) entity; -@@ -1213,6 +1213,7 @@ public class WorldServer extends World { +@@ -1223,6 +1223,7 @@ public class WorldServer extends World { entity.origin = entity.getBukkitEntity().getLocation(); } // Paper end @@ -83,7 +83,7 @@ index aaf35e02f4..71da6f37e1 100644 new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid } -@@ -1225,6 +1226,7 @@ public class WorldServer extends World { +@@ -1235,6 +1236,7 @@ public class WorldServer extends World { this.removeEntityFromChunk(entity); this.entitiesById.remove(entity.getId()); this.unregisterEntity(entity); @@ -92,7 +92,7 @@ index aaf35e02f4..71da6f37e1 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3df8c336f8..030d01bd3c 100644 +index a257dce8f..0fb47579f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1010,6 +1010,7 @@ public class CraftWorld implements World { @@ -128,5 +128,5 @@ index 3df8c336f8..030d01bd3c 100644 if (bukkitEntity == null) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch index 098f3e29d..0e51a18fc 100644 --- a/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch +++ b/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch @@ -1,4 +1,4 @@ -From 21b99a17c395ec6d2fbeb541b9bdcbb5cf4f28a1 Mon Sep 17 00:00:00 2001 +From 00c25be7c84bad842cc900163723e1c5929f436d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 22:58:47 -0400 Subject: [PATCH] MC-111480: Start Entity ID's at 1 @@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4a931aaf42..75343a4386 100644 +index ca794328a..845993bb4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -20,5 +20,5 @@ index 4a931aaf42..75343a4386 100644 private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); private static double e = 1.0D; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch index db8a8a50c..c43a466a8 100644 --- a/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From 7d8dc4b2a0702e2339136d3324d43602c039d059 Mon Sep 17 00:00:00 2001 +From 4383b1ee134cc543befaf00f504b7a4016da0ce1 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:25:46 -0400 Subject: [PATCH] Implement Expanded ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 80bf58b052..eb6cf3a86b 100644 +index 992d7bfb0..61d7d507a 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index 80bf58b052..eb6cf3a86b 100644 public Vector3f headPose; public Vector3f bodyPose; public Vector3f leftArmPose; -@@ -390,6 +390,7 @@ public class EntityArmorStand extends EntityLiving { +@@ -385,6 +385,7 @@ public class EntityArmorStand extends EntityLiving { return enumitemslot; } @@ -29,7 +29,7 @@ index 80bf58b052..eb6cf3a86b 100644 return (this.bB & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 124c3185bc..d1d689e5d7 100644 +index 124c3185b..d1d689e5d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -126,5 +126,5 @@ index 124c3185bc..d1d689e5d7 100644 // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0267-AnvilDamageEvent.patch b/Spigot-Server-Patches/0267-AnvilDamageEvent.patch index f10b01357..20776b013 100644 --- a/Spigot-Server-Patches/0267-AnvilDamageEvent.patch +++ b/Spigot-Server-Patches/0267-AnvilDamageEvent.patch @@ -1,11 +1,11 @@ -From 2173db383abb64418808e447c5ddbb91a04cae41 Mon Sep 17 00:00:00 2001 +From 6fb7424d3b3e0451b83a40e963588d4960d89c27 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:37:03 -0500 Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index 1d9ce5ef1c..286b930ddb 100644 +index 1d9ce5ef1..286b930dd 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container { @@ -26,5 +26,5 @@ index 1d9ce5ef1c..286b930ddb 100644 if (iblockdata1 == null) { world.a(blockposition, false); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch index ad1fda921..5fc241f9e 100644 --- a/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch @@ -1,11 +1,11 @@ -From e5230fca3c9f34ee93c4adcd1bff9768665d229b Mon Sep 17 00:00:00 2001 +From 30d0707a9432fb622ecf7d8ffaf2dc6bb2306690 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 16 Jul 2018 00:05:05 +0300 Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 0ece78d4dc..1c30a02501 100644 +index 0ece78d4d..1c30a0250 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -40,7 +40,7 @@ index 0ece78d4dc..1c30a02501 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 44d26e096c..ca9b0539f0 100644 +index 6cb82420b..592fcd538 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -1,6 +1,7 @@ @@ -115,7 +115,7 @@ index 44d26e096c..ca9b0539f0 100644 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 07abcc1e24..3df8e30ec7 100644 +index 07abcc1e2..3df8e30ec 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; @@ -139,5 +139,5 @@ index 07abcc1e24..3df8e30ec7 100644 this.world.a(blockposition, false); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch index 38e71b556..10b00caa2 100644 --- a/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From d404822b978f7c150834d20848f1d6252f075f34 Mon Sep 17 00:00:00 2001 +From fa2b3cf4d7e1b4f935bf7bf8e7c092a082a96f69 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 29 Jul 2018 05:02:15 +0100 Subject: [PATCH] Break up and make tab spam limits configurable @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 26ab855dcf..adef07d4d5 100644 +index 26ab855dc..adef07d4d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -287,4 +287,18 @@ public class PaperConfig { @@ -45,7 +45,7 @@ index 26ab855dcf..adef07d4d5 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3a7e197e39..77c375f71b 100644 +index 3a7e197e3..77c375f71 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -74,5 +74,5 @@ index 3a7e197e39..77c375f71b 100644 return; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch index 1e9a05a82..5104553d8 100644 --- a/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch @@ -1,4 +1,4 @@ -From c48283f43376bd7dc10346ad60921ba1261d3635 Mon Sep 17 00:00:00 2001 +From 9997320f8a64cd61f47e9c255eb5ec1d562095f3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:35 -0500 Subject: [PATCH] Add hand to bucket events @@ -18,7 +18,7 @@ index 6e385b530..2c8bbf20a 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index aaed8c0ae..0ff92aea5 100644 +index 7c5c04984..ffe4b9eb8 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -41,7 +41,7 @@ public class ItemBucket extends Item { @@ -107,5 +107,5 @@ index 317a5bf4e..f006b441a 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch index 36ec34099..8a9cc6962 100644 --- a/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From 830ab876589f4b0530f6f74cca373507111f8497 Mon Sep 17 00:00:00 2001 +From d5fe8ff182d9cd4c7892c3fcbd9c97eaa3401b9c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 00:04:54 -0400 Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 87c6b77ce3..53c6c33892 100644 +index 87c6b77ce..53c6c3389 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -207,7 +207,7 @@ public class EntityExperienceOrb extends Entity { @@ -27,5 +27,5 @@ index 87c6b77ce3..53c6c33892 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch index 6d7511ca0..b8d116ad5 100644 --- a/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From c069ef9aa9b923df19d13d60c7a65f4b91691ac5 Mon Sep 17 00:00:00 2001 +From 786e0d9fafbc25fb577d7f2ebfae70d2e0f3e5f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Nov 2016 00:40:42 -0500 Subject: [PATCH] Fix client rendering skulls from same user @@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user, for when different skins were used when skull was made. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 5fc7124dd5..33d9cac4de 100644 +index 1d2eb4a6e..962183491 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -54,7 +54,7 @@ public final class ItemStack { @@ -25,7 +25,7 @@ index 5fc7124dd5..33d9cac4de 100644 private EntityItemFrame i; private ShapeDetectorBlock j; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index d9574a9ace..93ae6dcd78 100644 +index d9574a9ac..93ae6dcd7 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf { @@ -62,7 +62,7 @@ index d9574a9ace..93ae6dcd78 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 3a1d0deb0d..1fcbbd698a 100644 +index 3a1d0deb0..1fcbbd698 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -58,6 +58,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -74,7 +74,7 @@ index 3a1d0deb0d..1fcbbd698a 100644 this.g.add(nbttagcompound); } diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 177cceb77f..0882d82cef 100644 +index 177cceb77..0882d82ce 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa @@ -117,5 +117,5 @@ index 177cceb77f..0882d82cef 100644 public NBTTagCompound b() { return this.save(new NBTTagCompound()); -- -2.24.1 +2.25.0.windows.1 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 26f0224a3..bbdcb5146 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 a06e7f64ec3e47385a8f00de2dd6a4f01f96089a Mon Sep 17 00:00:00 2001 +From d1a090be753e2a0dab2b26a37116d269d426c16b 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 @@ -36,10 +36,10 @@ index adef07d4d..214b577b3 100644 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e75e976ff..1251f4581 100644 +index 7c268eb54..9e5fe9794 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -869,6 +869,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 10 Aug 2018 22:11:49 -0400 Subject: [PATCH] Make EnderDragon implement Mob diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java -index cc115cc368..4947249da2 100644 +index cc115cc36..4947249da 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java @@ -1,17 +1,18 @@ @@ -32,5 +32,5 @@ index cc115cc368..4947249da2 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch index 838df2b29..63983be71 100644 --- a/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch @@ -1,4 +1,4 @@ -From 22d283b355d82dbea3c8c7de5d0ebf90de3e2125 Mon Sep 17 00:00:00 2001 +From b48ad0723e1228ae382cd3ea1185d7b0d982f120 Mon Sep 17 00:00:00 2001 From: egg82 Date: Tue, 7 Aug 2018 01:24:23 -0600 Subject: [PATCH] Use ConcurrentHashMap in JsonList @@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp Finally, added a couple obfhelpers for the modified code diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 734e7ecf63..8570e38f42 100644 +index 734e7ecf6..8570e38f4 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -35,7 +35,8 @@ public class JsonList> { @@ -99,5 +99,5 @@ index 734e7ecf63..8570e38f42 100644 String s = this.b.toJson(collection); BufferedWriter bufferedwriter = null; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch index e7667d8cd..ac14953cd 100644 --- a/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From 867ff7369be06a33177ba4fb30f77a59f5fa941f Mon Sep 17 00:00:00 2001 +From 5632d26dd961b00051930945ccc100df3d16b34f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Aug 2018 02:33:39 -0400 Subject: [PATCH] Use a Queue for Queueing Commands @@ -6,10 +6,10 @@ Subject: [PATCH] Use a Queue for Queueing Commands Lists are bad as Queues mmmkay. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 6e95a0452e..3ed74ae0ec 100644 +index 0411fb3ee..a74fae9ed 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -43,7 +43,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer private static final Logger LOGGER = LogManager.getLogger(); private static final Pattern i = Pattern.compile("^[a-fA-F0-9]{40}$"); @@ -18,7 +18,7 @@ index 6e95a0452e..3ed74ae0ec 100644 private RemoteStatusListener remoteStatusListener; public final RemoteControlCommandListener remoteControlCommandListener; private RemoteControlListener remoteControlListener; -@@ -441,8 +441,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -447,8 +447,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer public void handleCommandQueue() { MinecraftTimings.serverCommandTimer.startTiming(); // Spigot @@ -32,5 +32,5 @@ index 6e95a0452e..3ed74ae0ec 100644 // CraftBukkit start - ServerCommand for preprocessing ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index d89475715..ac79bd3db 100644 --- a/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From 1eee1c091407f4147eb02bbf41aa947dff745abd Mon Sep 17 00:00:00 2001 +From c48d9f4c77534b6550412d97c24b44b6d366a188 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:16:34 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 2995237994..91f2066b12 100644 +index 299523799..91f2066b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -127,9 +127,16 @@ public class CraftChunk implements Chunk { @@ -35,5 +35,5 @@ index 2995237994..91f2066b12 100644 return entities; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch index 5e2aa99c7..c1daadcfb 100644 --- a/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch @@ -1,4 +1,4 @@ -From f6237bf9c93b2ccb59e4f517446d9d7c986cab59 Mon Sep 17 00:00:00 2001 +From 0994b1f1e7de07d1654d56b9626f69cc15fb2959 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:09 -0700 Subject: [PATCH] Allow disabling armour stand ticking @@ -20,7 +20,7 @@ index eaaa51e4b..bc3df01aa 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index eb6cf3a86..b51662ee9 100644 +index 61d7d507a..42b9a339e 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving { @@ -44,7 +44,7 @@ index eb6cf3a86..b51662ee9 100644 this.H = 0.0F; } -@@ -140,6 +147,7 @@ public class EntityArmorStand extends EntityLiving { +@@ -135,6 +142,7 @@ public class EntityArmorStand extends EntityLiving { this.armorItems.set(enumitemslot.b(), itemstack); } @@ -52,7 +52,7 @@ index eb6cf3a86..b51662ee9 100644 } @Override -@@ -220,6 +228,7 @@ public class EntityArmorStand extends EntityLiving { +@@ -215,6 +223,7 @@ public class EntityArmorStand extends EntityLiving { } nbttagcompound.set("Pose", this.B()); @@ -60,7 +60,7 @@ index eb6cf3a86..b51662ee9 100644 } @Override -@@ -251,6 +260,12 @@ public class EntityArmorStand extends EntityLiving { +@@ -246,6 +255,12 @@ public class EntityArmorStand extends EntityLiving { this.setBasePlate(nbttagcompound.getBoolean("NoBasePlate")); this.setMarker(nbttagcompound.getBoolean("Marker")); this.noclip = !this.A(); @@ -73,7 +73,7 @@ index eb6cf3a86..b51662ee9 100644 NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Pose"); this.g(nbttagcompound1); -@@ -605,7 +620,29 @@ public class EntityArmorStand extends EntityLiving { +@@ -600,7 +615,29 @@ public class EntityArmorStand extends EntityLiving { @Override public void tick() { @@ -103,7 +103,7 @@ index eb6cf3a86..b51662ee9 100644 Vector3f vector3f = (Vector3f) this.datawatcher.get(EntityArmorStand.c); if (!this.headPose.equals(vector3f)) { -@@ -728,31 +765,37 @@ public class EntityArmorStand extends EntityLiving { +@@ -723,31 +760,37 @@ public class EntityArmorStand extends EntityLiving { public void setHeadPose(Vector3f vector3f) { this.headPose = vector3f; this.datawatcher.set(EntityArmorStand.c, vector3f); @@ -142,10 +142,10 @@ index eb6cf3a86..b51662ee9 100644 public Vector3f r() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 470cbddeb..91b6d6878 100644 +index fea821be1..0b84ead5f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2324,52 +2324,7 @@ public abstract class EntityLiving extends Entity { +@@ -2326,52 +2326,7 @@ public abstract class EntityLiving extends Entity { } } @@ -199,7 +199,7 @@ index 470cbddeb..91b6d6878 100644 if (this.ticksLived % 20 == 0) { this.getCombatTracker().g(); -@@ -2470,6 +2425,55 @@ public abstract class EntityLiving extends Entity { +@@ -2472,6 +2427,55 @@ public abstract class EntityLiving extends Entity { } } diff --git a/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch index 89c1afd13..84021e44d 100644 --- a/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From 63e1349041f98461fd36bd852d522d35b62e5697 Mon Sep 17 00:00:00 2001 +From 68ffe4970dcf909ead368265bc723e5a8bb90c7f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Aug 2018 12:05:12 -0700 Subject: [PATCH] Optimize BlockPosition helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods Resolves #1338 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 5a505b753a..1424763954 100644 +index 5a505b753..142476395 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -134,57 +134,74 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -98,5 +98,5 @@ index 5a505b753a..1424763954 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch index 5b54b4e08..ce0aadba9 100644 --- a/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,11 +1,11 @@ -From 89fac4c804aa6312a52eaff0ee46f689a8d0c90b Mon Sep 17 00:00:00 2001 +From cdec3794b84a3c3c819fecd813fc2dbabc1bd4c9 Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index fd0f5c6f29..e46436623c 100644 +index fd0f5c6f2..e46436623 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -923,8 +923,25 @@ public abstract class PlayerList { @@ -46,10 +46,10 @@ index fd0f5c6f29..e46436623c 100644 double d5 = d1 - entityplayer.locY(); double d6 = d2 - entityplayer.locZ(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 71da6f37e1..00a1fe7593 100644 +index ba0389f2f..1e8079f91 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1259,7 +1259,7 @@ public class WorldServer extends World { +@@ -1269,7 +1269,7 @@ public class WorldServer extends World { } // CraftBukkit end this.globalEntityList.add(entitylightning); @@ -58,7 +58,7 @@ index 71da6f37e1..00a1fe7593 100644 } @Override -@@ -1391,7 +1391,7 @@ public class WorldServer extends World { +@@ -1401,7 +1401,7 @@ public class WorldServer extends World { BlockActionData blockactiondata = (BlockActionData) this.I.removeFirst(); if (this.a(blockactiondata)) { @@ -68,7 +68,7 @@ index 71da6f37e1..00a1fe7593 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 030d01bd3c..040dde93aa 100644 +index 0fb47579f..bc151d8d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2085,7 +2085,7 @@ public class CraftWorld implements World { @@ -81,5 +81,5 @@ index 030d01bd3c..040dde93aa 100644 private static Map> gamerules; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch index 699b9ce6d..b3438ecda 100644 --- a/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch @@ -1,11 +1,11 @@ -From f1cf5f272ab375515fa02d9f920f8ba0bc537660 Mon Sep 17 00:00:00 2001 +From 1c5d44fef7344af01c0aaa5b09911964da1ea76a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 12:43:16 -0400 Subject: [PATCH] Restore vanlla default mob-spawn-range diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 5686a4f1a0..c2906f20a5 100644 +index 5686a4f1a..c2906f20a 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -165,7 +165,7 @@ public class SpigotWorldConfig @@ -18,5 +18,5 @@ index 5686a4f1a0..c2906f20a5 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch index ee51c52cb..f6154598d 100644 --- a/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From 9a0443261421b82411cc68f8e99ef90056e1a71d Mon Sep 17 00:00:00 2001 +From 7246646de47fcafd5219444ac7fbe44c68574aa5 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 23 Aug 2018 11:45:32 -0400 Subject: [PATCH] Optimize CraftBlockData Creation @@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData and cloning it when one is needed. diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 9ab57be850..c1ff62aa52 100644 +index 9ab57be85..c1ff62aa5 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap; @@ -36,7 +36,7 @@ index 9ab57be850..c1ff62aa52 100644 return this.getBlock().k(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index e371e7f6d9..32e1e7e20a 100644 +index e371e7f6d..32e1e7e20 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -549,7 +549,17 @@ public class CraftBlockData implements BlockData { @@ -58,5 +58,5 @@ index e371e7f6d9..32e1e7e20a 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0283-Fix-MC-124320.patch b/Spigot-Server-Patches/0283-Fix-MC-124320.patch index 841becdac..5715f634e 100644 --- a/Spigot-Server-Patches/0283-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0283-Fix-MC-124320.patch @@ -1,11 +1,11 @@ -From 2f971f57477b2d3bd4581d61d01dc50bc43c2734 Mon Sep 17 00:00:00 2001 +From d8977d2a7209f4b7f6523cb8c8ebc71ceeed68a7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 23 Aug 2018 09:25:30 -0500 Subject: [PATCH] Fix MC-124320 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 3e4fc4ee5e..2262a82532 100644 +index 5f261b9b9..b9b750c36 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -170,6 +170,7 @@ public class Block implements IMaterial { @@ -17,7 +17,7 @@ index 3e4fc4ee5e..2262a82532 100644 IBlockData iblockdata1 = iblockdata; BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 607d6da6a4..9783576e38 100644 +index ca8e43fdf..149de2c57 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -354,8 +354,9 @@ public class EntityEnderman extends EntityMonster { @@ -49,5 +49,5 @@ index 607d6da6a4..9783576e38 100644 if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) { // CraftBukkit start - Place event -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch index 05c0a606e..068ba53f8 100644 --- a/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch @@ -1,11 +1,11 @@ -From aa7e8b35b0a7961ee837e1230a017f672a6a7ad7 Mon Sep 17 00:00:00 2001 +From 6c0ae9f5105e2d7110301f84efda3a6dbe298197 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:42 -0500 Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 3ecf732192..2efc18df94 100644 +index 3ecf73219..2efc18df9 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -3,6 +3,14 @@ package net.minecraft.server; @@ -147,7 +147,7 @@ index 3ecf732192..2efc18df94 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java -index ce6ed6e890..6e9f1b66df 100644 +index ce6ed6e89..6e9f1b66d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime { @@ -166,5 +166,5 @@ index ce6ed6e890..6e9f1b66df 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch index b44442f7a..ceef65c15 100644 --- a/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From 5743b74188e22ca39b2ae259c22e0d741ca72fa4 Mon Sep 17 00:00:00 2001 +From ed07543a84e9138f21e466ed7c05b8b2a6440b9c Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 8 Aug 2018 16:33:21 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch index 3e1d69eec..c71aed3c0 100644 --- a/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From debafca18922cf529cf9ae83cd0eda966650b588 Mon Sep 17 00:00:00 2001 +From 78858b4afe31d5113d447014455190134e115a14 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Aug 2018 20:49:50 -0400 Subject: [PATCH] Optimize RegistryMaterials @@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap BiMap.get was seen to be using a good bit of CPU time. diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java -index 2d6a7b3a47..8477febca2 100644 +index 2d6a7b3a4..8477febca 100644 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java @@ -16,8 +16,8 @@ import org.apache.logging.log4j.Logger; @@ -31,5 +31,5 @@ index 2d6a7b3a47..8477febca2 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch index 2782fab65..b078a5d17 100644 --- a/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch @@ -1,11 +1,11 @@ -From 7af3240895be8ef7f366b602c107a6d287e01f5b Mon Sep 17 00:00:00 2001 +From a23e2b70f800aa1c6beecc83497f32a23d53dc9d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:51 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index b62a8227b2..82323bf4ac 100644 +index b62a8227b..82323bf4a 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -130,6 +130,11 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -48,7 +48,7 @@ index b62a8227b2..82323bf4ac 100644 private final PathfinderTargetCondition b; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index add566ea4f..f488c22ed6 100644 +index add566ea4..f488c22ed 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -52,8 +52,17 @@ public class MobSpawnerPhantom { @@ -71,7 +71,7 @@ index add566ea4f..f488c22ed6 100644 groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null); worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java -index 9f9ee92390..2b97313694 100644 +index 9f9ee9239..2b9731369 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom { @@ -86,5 +86,5 @@ index 9f9ee92390..2b97313694 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch index 9f6b72ed5..c69c5f8f9 100644 --- a/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch @@ -1,11 +1,11 @@ -From 0fae68c138d88aba80eede7fadafcc00e96418c6 Mon Sep 17 00:00:00 2001 +From 938ec7bad64961812a276eeca50182aac6d82771 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:26 -0500 Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 317c1998e6..77ba923338 100644 +index b89530079..45dfc8104 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { @@ -38,7 +38,7 @@ index 317c1998e6..77ba923338 100644 public boolean canCauseHeadDrop() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java -index 896405148c..075a5e77e2 100644 +index 896405148..075a5e77e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java @@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper { @@ -61,5 +61,5 @@ index 896405148c..075a5e77e2 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch index b03604270..492baf93b 100644 --- a/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From 080d7ba36c9d780a06c372d51518ffc4332ceb6a Mon Sep 17 00:00:00 2001 +From 709122fd6dbbff605b357f26baf0f272095682a6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:15 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java -index 0d637e207e..026a0c3995 100644 +index 0d637e207..026a0c399 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory { @@ -57,5 +57,5 @@ index 0d637e207e..026a0c3995 100644 // Drat! we don't have this type in the inventory if (first == -1) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index c5020773f..c7b4de94a 100644 --- a/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From a5b25e8e4d448c6579e343b7a087844802fca0b4 Mon Sep 17 00:00:00 2001 +From 05f1b1ff9dbada197ba9f63945d6bb2b39562b9a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 2 Sep 2018 19:34:33 -0700 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted @@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 040dde93aa..7cd028dc8c 100644 +index bc151d8d2..7c7302853 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -500,7 +500,7 @@ public class CraftWorld implements World { @@ -19,5 +19,5 @@ index 040dde93aa..7cd028dc8c 100644 // If generate = false, but the chunk already exists, we will get this back. if (chunk instanceof ProtoChunkExtension) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch index 5cc8bd0e8..e094ed118 100644 --- a/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,15 +1,15 @@ -From 76516c54af150355907b2c8d2fc8dc8f547dc12c Mon Sep 17 00:00:00 2001 +From 04f9f57fd8dc331a56ff4cb4095a9c1bbf657b98 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:20:03 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 91b6d68787..1592a705f6 100644 +index 0b84ead5f..fa097e055 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3252,6 +3252,23 @@ public abstract class EntityLiving extends Entity { - this.c(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); +@@ -3254,6 +3254,23 @@ public abstract class EntityLiving extends Entity { + this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND); } // Paper start + public MovingObjectPosition getRayTrace(int maxDistance) { @@ -33,7 +33,7 @@ index 91b6d68787..1592a705f6 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 379239567e..6f4c6c5891 100644 +index 379239567..6f4c6c589 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -195,6 +195,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -66,5 +66,5 @@ index 379239567e..6f4c6c5891 100644 public List getLastTwoTargetBlocks(Set transparent, int maxDistance) { return getLineOfSight(transparent, maxDistance, 2); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch index 8db3149d4..4a010d5ad 100644 --- a/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch @@ -1,14 +1,14 @@ -From fe6d14adaee1040cb699f63890f354a5db427561 Mon Sep 17 00:00:00 2001 +From 73bfa29e41de09537d20e58dfe80c3644abff261 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:02:00 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 2265b01e6..763ca58d1 100644 +index 1f3513874..d6df01868 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -2115,14 +2115,17 @@ public abstract class EntityHuman extends EntityLiving { +@@ -2116,14 +2116,17 @@ public abstract class EntityHuman extends EntityLiving { this.datawatcher.set(EntityHuman.bt, nbttagcompound); } @@ -52,5 +52,5 @@ index c1f392716..352ef3669 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0293-Improve-death-events.patch b/Spigot-Server-Patches/0293-Improve-death-events.patch index 34352f01d..19a3a4d44 100644 --- a/Spigot-Server-Patches/0293-Improve-death-events.patch +++ b/Spigot-Server-Patches/0293-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 1ade9a3c92b252555cbebebd3e707286b9389166 Mon Sep 17 00:00:00 2001 +From a37fd61973e5e77832a167141998b6d5e9ae5f72 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -27,7 +27,7 @@ index 6daa400d2..38fe29f8a 100644 int i = this.f ? 300 : 100; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 109f1f614..9195a94a9 100644 +index 845993bb4..16c55a9fa 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -47,10 +47,10 @@ index 109f1f614..9195a94a9 100644 protected void k(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index b51662ee9..e6032e3ed 100644 +index 42b9a339e..8ad131e4f 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java -@@ -706,7 +706,8 @@ public class EntityArmorStand extends EntityLiving { +@@ -701,7 +701,8 @@ public class EntityArmorStand extends EntityLiving { @Override public void killEntity() { @@ -61,7 +61,7 @@ index b51662ee9..e6032e3ed 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 97ffd9346..bd62ac3ed 100644 +index 2be6c7bde..82a32d5db 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal { @@ -119,7 +119,7 @@ index 80717ad9a..53aac5bcc 100644 public void b(NBTTagCompound nbttagcompound) { super.b(nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1592a705f..b59b39d41 100644 +index fa097e055..eed3e7c58 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity { @@ -139,7 +139,7 @@ index 1592a705f..b59b39d41 100644 @Override public float getBukkitYaw() { -@@ -1137,13 +1138,17 @@ public abstract class EntityLiving extends Entity { +@@ -1139,13 +1140,17 @@ public abstract class EntityLiving extends Entity { if (this.getHealth() <= 0.0F) { if (!this.f(damagesource)) { @@ -161,7 +161,7 @@ index 1592a705f..b59b39d41 100644 } } else if (flag1) { this.c(damagesource); -@@ -1281,6 +1286,7 @@ public abstract class EntityLiving extends Entity { +@@ -1283,6 +1288,7 @@ public abstract class EntityLiving extends Entity { Entity entity = damagesource.getEntity(); EntityLiving entityliving = this.getKillingEntity(); @@ -169,7 +169,7 @@ index 1592a705f..b59b39d41 100644 if (this.aW >= 0 && entityliving != null) { entityliving.a(this, this.aW, damagesource); } -@@ -1292,16 +1298,36 @@ public abstract class EntityLiving extends Entity { +@@ -1294,16 +1300,36 @@ public abstract class EntityLiving extends Entity { if (this.isSleeping()) { this.entityWakeup(); } @@ -208,7 +208,7 @@ index 1592a705f..b59b39d41 100644 } } -@@ -1309,7 +1335,7 @@ public abstract class EntityLiving extends Entity { +@@ -1311,7 +1337,7 @@ public abstract class EntityLiving extends Entity { if (!this.world.isClientSide) { boolean flag = false; @@ -217,7 +217,7 @@ index 1592a705f..b59b39d41 100644 if (this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) { BlockPosition blockposition = new BlockPosition(this); IBlockData iblockdata = Blocks.WITHER_ROSE.getBlockData(); -@@ -1330,7 +1356,8 @@ public abstract class EntityLiving extends Entity { +@@ -1332,7 +1358,8 @@ public abstract class EntityLiving extends Entity { } } @@ -227,7 +227,7 @@ index 1592a705f..b59b39d41 100644 Entity entity = damagesource.getEntity(); int i; -@@ -1343,22 +1370,26 @@ public abstract class EntityLiving extends Entity { +@@ -1345,22 +1372,26 @@ public abstract class EntityLiving extends Entity { boolean flag = this.lastDamageByPlayerTime > 0; this.dropInventory(); // CraftBukkit - from below @@ -257,7 +257,7 @@ index 1592a705f..b59b39d41 100644 // CraftBukkit start public int getExpReward() { -@@ -1437,6 +1468,7 @@ public abstract class EntityLiving extends Entity { +@@ -1439,6 +1470,7 @@ public abstract class EntityLiving extends Entity { return SoundEffects.ENTITY_GENERIC_HURT; } @@ -265,7 +265,7 @@ index 1592a705f..b59b39d41 100644 @Nullable protected SoundEffect getSoundDeath() { return SoundEffects.ENTITY_GENERIC_DEATH; -@@ -1919,10 +1951,12 @@ public abstract class EntityLiving extends Entity { +@@ -1921,10 +1953,12 @@ public abstract class EntityLiving extends Entity { } @@ -279,7 +279,7 @@ index 1592a705f..b59b39d41 100644 return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2419feba7..67062635c 100644 +index 5e2e0674a..e6252e5f1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -447,5 +447,5 @@ index f006b441a..39ce40bd5 100644 * Server methods */ -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch index 0c7fec650..4aa1054e0 100644 --- a/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,11 @@ -From aff8c157c1a042b2bf1de87c0397a79a2945b679 Mon Sep 17 00:00:00 2001 +From 4ac284d3aa453ecbbc9a1b1386017807ec647926 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Sep 2018 18:43:31 -0500 Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 33d9cac4de..d891e7b0ee 100644 +index 962183491..1be4cd163 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -240,6 +240,7 @@ public final class ItemStack { @@ -17,7 +17,7 @@ index 33d9cac4de..d891e7b0ee 100644 for (BlockState blockstate : blocks) { blockstate.update(true, false); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index c4766f729f..b22bd06e27 100644 +index c4766f729..b22bd06e2 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -292,7 +292,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic @@ -30,5 +30,5 @@ index c4766f729f..b22bd06e27 100644 // CraftBukkit end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch index 86658911d..340cbc11a 100644 --- a/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From bd88e6a31468f5b2204f5b45f3330e91de3f68bb Mon Sep 17 00:00:00 2001 +From 8fd28572ae389bfe1c6e7251634faaafbcaedbae Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 13:30:00 -0400 Subject: [PATCH] Mob Pathfinding API @@ -7,7 +7,7 @@ Implements Pathfinding API for mobs diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java new file mode 100644 -index 0000000000..f68a07cb96 +index 000000000..f68a07cb9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java @@ -0,0 +1,111 @@ @@ -123,7 +123,7 @@ index 0000000000..f68a07cb96 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index bdd092e49d..f06764973f 100644 +index bdd092e49..f06764973 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -80,7 +80,7 @@ public abstract class NavigationAbstract { @@ -170,7 +170,7 @@ index bdd092e49d..f06764973f 100644 this.c = null; } diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java -index 312352ef84..dcb4e25080 100644 +index 312352ef8..dcb4e2508 100644 --- a/src/main/java/net/minecraft/server/PathEntity.java +++ b/src/main/java/net/minecraft/server/PathEntity.java @@ -5,13 +5,14 @@ import javax.annotation.Nullable; @@ -210,7 +210,7 @@ index 312352ef84..dcb4e25080 100644 return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c); diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java -index b1db95daa9..18cdd2a6f2 100644 +index b1db95daa..18cdd2a6f 100644 --- a/src/main/java/net/minecraft/server/PathPoint.java +++ b/src/main/java/net/minecraft/server/PathPoint.java @@ -2,9 +2,9 @@ package net.minecraft.server; @@ -227,7 +227,7 @@ index b1db95daa9..18cdd2a6f2 100644 public int d = -1; public float e; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 5bf1cd06fa..53c2d154ed 100644 +index 5bf1cd06f..53c2d154e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable; @@ -243,5 +243,5 @@ index 5bf1cd06fa..53c2d154ed 100644 public void setTarget(LivingEntity target) { EntityInsentient entity = getHandle(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch index 845bdc4df..ba64b05ee 100644 --- a/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,11 +1,11 @@ -From 1dd70b1f7c7a33dba19d72767a24ee778a4e83a6 Mon Sep 17 00:00:00 2001 +From bc9f4ac177333ed1d663fefc34e681de57b715c9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:36:16 -0400 Subject: [PATCH] Prevent chunk loading from Fluid Flowing diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index 3099a5e654..376dca1889 100644 +index 3099a5e65..376dca188 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType { @@ -74,5 +74,5 @@ index 3099a5e654..376dca1889 100644 Fluid fluid = (Fluid) pair.getSecond(); Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index a8d2a9087..3ac009591 100644 --- a/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,11 +1,11 @@ -From e566200e9046c62b1de472caf63ba8dbb00c0afe Mon Sep 17 00:00:00 2001 +From d1c41e1d8275dece2e04bbc3214f28ce9d92d30e Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java -index 005ebec266..97d85f8451 100644 +index 005ebec26..97d85f845 100644 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java @@ -43,7 +43,7 @@ public class ArgumentBlock { @@ -32,7 +32,7 @@ index 005ebec266..97d85f8451 100644 this.s = this::l; if (this.i.canRead() && this.i.peek() == '#') { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 1eede4bcc6..fb78d6cce0 100644 +index 1eede4bcc..fb78d6cce 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -87,6 +87,12 @@ import org.bukkit.persistence.PersistentDataContainer; @@ -432,5 +432,5 @@ index 1eede4bcc6..fb78d6cce0 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index 874599148..ae634095c 100644 --- a/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,11 +1,11 @@ -From dc43fec66678f87814f96a24ae1b8c9b835ca5f3 Mon Sep 17 00:00:00 2001 +From ea6be7d9eec94c640a01e551254eb74777100b35 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:56:36 -0400 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java -index bf8ca9b32a..7ccb3d5c06 100644 +index bf8ca9b32..7ccb3d5c0 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget { @@ -52,7 +52,7 @@ index bf8ca9b32a..7ccb3d5c06 100644 return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).getBlock() == this.g && ichunkaccess.getType(blockposition.up()).isAir() && ichunkaccess.getType(blockposition.up(2)).isAir(); } diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java -index d4cd50918b..d6a3b99339 100644 +index d4cd50918..d6a3b9933 100644 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java @@ -109,6 +109,7 @@ public class RandomPositionGenerator { @@ -74,5 +74,5 @@ index d4cd50918b..d6a3b99339 100644 if (entitycreature.a(pathtype) == 0.0F) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch index 63ac5f7d5..d22b5327b 100644 --- a/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From 497bd15717816f6d4797c3b70d40c57eadb993ea Mon Sep 17 00:00:00 2001 +From 13f578fb8354a5ef83e3765c1ddb1513ac7b0ac5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:12:57 -0400 Subject: [PATCH] Prevent mob spawning from loading/generating chunks @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 224443e03c..fdac5bb3a2 100644 +index 224443e03..fdac5bb3a 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -25,9 +25,9 @@ public final class SpawnerCreature { @@ -31,5 +31,5 @@ index 224443e03c..fdac5bb3a2 100644 if (Objects.equals(chunkcoordintpair, chunk.getPos()) || worldserver.getChunkProvider().a(chunkcoordintpair)) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index 793010439..58a33ffa1 100644 --- a/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From 044c369e0d9d3db2ae9609a960fd844de71f32d5 Mon Sep 17 00:00:00 2001 +From 89395a6f037f018a26ae8cb2c1d3875f86e9fa3d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:47:01 -0400 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning Uses an EnumMap as well as a Set paired List for O(1) contains calls. diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 253890e537..0102a170dc 100644 +index 253890e53..0102a170d 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -40,7 +40,7 @@ public abstract class BiomeBase { @@ -67,5 +67,5 @@ index 253890e537..0102a170dc 100644 @Nullable -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch index 582ff5ee5..022222733 100644 --- a/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From d8cd15b5bb8b1ea68fdff1854117a00f835f3a7e Mon Sep 17 00:00:00 2001 +From 7ee109973dbce56d13226f7108948a67f50b6477 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:21 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 0419aea923..04849c3da6 100644 +index 560e2f42b..d5432bfeb 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -8,6 +8,7 @@ import java.util.Map; @@ -57,7 +57,7 @@ index 0419aea923..04849c3da6 100644 this.cookTimeTotal = this.getRecipeCookingTime(); this.burn(irecipe); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java -index 9cc67915ca..1ce10ea049 100644 +index 9cc67915c..1ce10ea04 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java @@ -63,4 +63,18 @@ public class CraftFurnace extends CraftContainer @@ -80,5 +80,5 @@ index 9cc67915ca..1ce10ea049 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch index b92b264b5..7f8359793 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 19989dfb7d45e49f73acc4be9b0d809a4a95b719 Mon Sep 17 00:00:00 2001 +From 688565b10741ebc591cf9929cb760aff74823ba2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is a permanent change in that it won't go back if you remove it from paper.yml diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 214b577b32..559e6b42ba 100644 +index 214b577b3..559e6b42b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier; @@ -59,10 +59,10 @@ index 214b577b32..559e6b42ba 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index dd2d8712ed..7fd0404093 100644 +index 9e5fe9794..52ec526fc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -377,7 +377,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map @@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java new file mode 100644 -index 0000000000..6bb2f98b45 +index 000000000..6bb2f98b4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java @@ -0,0 +1,191 @@ @@ -217,7 +217,7 @@ index 0000000000..6bb2f98b45 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7fd0404093..553014b79e 100644 +index 52ec526fc..a3156d003 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -88,7 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 18 Sep 2018 23:53:23 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for spawners. diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index fe8bc7f75d..90ca1ee141 100644 +index fe8bc7f75..90ca1ee14 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -111,11 +111,11 @@ public abstract class MobSpawnerAbstract { @@ -28,5 +28,5 @@ index fe8bc7f75d..90ca1ee141 100644 if (!event.callEvent()) { flag = true; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch index 7b594961d..cf91ae54c 100644 --- a/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From 72e93bc7a90780864ce743797ea17219c931500c Mon Sep 17 00:00:00 2001 +From a802670c7c392d9a70dc8ac6b4d8523f0b02142d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Sep 2018 15:56:59 -0400 Subject: [PATCH] Catch JsonParseException in Entity and TE names @@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly No more crashing though. diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java -index e6bf34ab00..c447cf1aed 100644 +index 786712297..ef2a496ed 100644 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java @@ -59,7 +59,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener { @@ -26,7 +26,7 @@ index e6bf34ab00..c447cf1aed 100644 if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b03316bc8c..5d31068d7d 100644 +index 16c55a9fa..4619f2c92 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,7 +39,7 @@ index b03316bc8c..5d31068d7d 100644 this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible")); diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 670f8313ae..d49e210a3c 100644 +index 670f8313a..d49e210a3 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -339,4 +339,19 @@ public final class MCUtil { @@ -63,10 +63,10 @@ index 670f8313ae..d49e210a3c 100644 + } } diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java -index 21a2415fbe..7a911c5a5e 100644 +index 93911a825..d35604edb 100644 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java -@@ -59,7 +59,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity { +@@ -60,7 +60,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity { public void load(NBTTagCompound nbttagcompound) { super.load(nbttagcompound); if (nbttagcompound.hasKeyOfType("CustomName", 8)) { @@ -76,7 +76,7 @@ index 21a2415fbe..7a911c5a5e 100644 if (this.hasWorld()) { diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java -index 473ec2cbde..ab6b86e4e9 100644 +index 473ec2cbd..ab6b86e4e 100644 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento @@ -89,5 +89,5 @@ index 473ec2cbde..ab6b86e4e9 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch index a3aed473d..bfd3a0454 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 ea77ed836455767035fdc6124e904b3e453a68c6 Mon Sep 17 00:00:00 2001 +From 63d45833051ad294ff8782268adede43e40c5b47 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,7 +8,7 @@ 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 1ca9a7724a..e1c9a9e120 100644 +index b02995144..781ed63dc 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 { @@ -21,5 +21,5 @@ index 1ca9a7724a..e1c9a9e120 100644 dimension++; break; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch index e0da7ef03..33bdbb37e 100644 --- a/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch @@ -1,11 +1,11 @@ -From fe543262b07590e5cf598bb1a866da01910de44f Mon Sep 17 00:00:00 2001 +From 75cfa2e57d0ff320616705d625bc3de1717c5c43 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 23 Sep 2018 20:59:53 -0500 Subject: [PATCH] Honor EntityAgeable.ageLock diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index cec938436d..3d27f0964a 100644 +index cec938436..3d27f0964 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -101,6 +101,7 @@ public abstract class EntityAgeable extends EntityCreature { @@ -17,5 +17,5 @@ index cec938436d..3d27f0964a 100644 int k = j; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch index e1ea92fef..4aefbd417 100644 --- a/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From 5ed2b57345317a42de525cee8a0ed8c2c5a90d96 Mon Sep 17 00:00:00 2001 +From 398196f95888864e3806b5760956bd7cdb17b2bf Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 2 Oct 2018 09:57:50 +0100 Subject: [PATCH] Configurable connection throttle kick message diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 559e6b42ba..092bff78ab 100644 +index 559e6b42b..092bff78a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -274,6 +274,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 559e6b42ba..092bff78ab 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 8928d93e49..0532f975b7 100644 +index 8928d93e4..0532f975b 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -34,5 +34,5 @@ index 8928d93e49..0532f975b7 100644 this.b.close(chatmessage); return; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch index 9dd96951b..9c2ca14f5 100644 --- a/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From 9aede8db3a0bd41702a24be33af9cf07be1c3aa8 Mon Sep 17 00:00:00 2001 +From 210300e7972f42ccac44af3d20da7d2c5a376afb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites @@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're debugging in an IDE pre-relocate. diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 467b2d9385..61f1023557 100644 +index 467b2d938..61f102355 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -6,7 +6,9 @@ import java.io.FileOutputStream; @@ -187,5 +187,5 @@ index 467b2d9385..61f1023557 100644 { if ( owner.equals( "org/bukkit/Material" ) ) -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch index 737912d32..586e2137c 100644 --- a/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From 2876e7f04dead535408f8fdfec37682cf22279e6 Mon Sep 17 00:00:00 2001 +From 4dc40c1775c78bde423d620db9bf4d4adc94a05b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:44 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index a46730460e..cf274666c7 100644 +index a46730460..cf274666c 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster { @@ -17,7 +17,7 @@ index a46730460e..cf274666c7 100644 this.c = entityinsentient; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 169c951ec3..2f7df3074f 100644 +index 169c951ec..2f7df3074 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex { @@ -32,5 +32,5 @@ index 169c951ec3..2f7df3074f 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0311-Add-sun-related-API.patch b/Spigot-Server-Patches/0311-Add-sun-related-API.patch index 415fe2072..afa5f70d3 100644 --- a/Spigot-Server-Patches/0311-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0311-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From 2ede2ea193cffddedaafd7b73cce4dc0ac560f27 Mon Sep 17 00:00:00 2001 +From ef5516debcf0b8fcb094fb0c53fec0a1d1ece2b4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 5ca281172d..e259c868e1 100644 +index 5ca281172..e259c868e 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1334,6 +1334,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -17,7 +17,7 @@ index 5ca281172d..e259c868e1 100644 if (this.world.isDay() && !this.world.isClientSide) { float f = this.aI(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7cd028dc8c..816d59b614 100644 +index 7c7302853..20e4be0e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -862,6 +862,13 @@ public class CraftWorld implements World { @@ -35,7 +35,7 @@ index 7cd028dc8c..816d59b614 100644 public boolean createExplosion(double x, double y, double z, float power) { return createExplosion(x, y, z, power, false, true); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 53c2d154ed..56c233872b 100644 +index 53c2d154e..56c233872 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { @@ -51,5 +51,5 @@ index 53c2d154ed..56c233872b 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch index 658ada50b..e1433be33 100644 --- a/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From 681b356b181ae069b9ff7cddf6e8cc5b90d000a6 Mon Sep 17 00:00:00 2001 +From 83b0524a338f924e7ba399ecb218dc27210ea168 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Oct 2018 21:22:44 -0500 Subject: [PATCH] Check Drowned for Villager Aggression Config diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 255b3d0cde..3a1928b221 100644 +index 70c06ca77..77885f67f 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -18,5 +18,5 @@ index 255b3d0cde..3a1928b221 100644 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bw)); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0313-Here-s-Johnny.patch b/Spigot-Server-Patches/0313-Here-s-Johnny.patch index 7232ee5ed..66e6fa17f 100644 --- a/Spigot-Server-Patches/0313-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0313-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From bd1c0daed361b07b62aa2a6893a940bc0784c38a Mon Sep 17 00:00:00 2001 +From 1e7fdb5e3eeaf2540a4310d130543d633407bb6a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:22 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 73ecdd22ea..c974c02e92 100644 +index 73ecdd22e..c974c02e9 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -18,7 +18,7 @@ index 73ecdd22ea..c974c02e92 100644 public EntityVindicator(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java -index 951d479298..5ff957ced7 100644 +index 951d47929..5ff957ced 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator { @@ -37,5 +37,5 @@ index 951d479298..5ff957ced7 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0314-Turtle-API.patch b/Spigot-Server-Patches/0314-Turtle-API.patch index 2edfbc12f..7c80c235f 100644 --- a/Spigot-Server-Patches/0314-Turtle-API.patch +++ b/Spigot-Server-Patches/0314-Turtle-API.patch @@ -1,11 +1,11 @@ -From 1e24a3a152b551daf1d36c38396162c2298e5190 Mon Sep 17 00:00:00 2001 +From a4255ab47148cc0b59007704a6f4ac1ed48b373b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 76296119a1..dd02cb3485 100644 +index 76296119a..dd02cb348 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal { @@ -103,7 +103,7 @@ index 76296119a1..dd02cb3485 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java -index 123a2c75ca..8edcf7af65 100644 +index 123a2c75c..8edcf7af6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java @@ -1,6 +1,8 @@ @@ -153,5 +153,5 @@ index 123a2c75ca..8edcf7af65 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch index e58f825c1..4ba180ef8 100644 --- a/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch @@ -1,4 +1,4 @@ -From 900eacae63f24da67c7db6b73cc151d53e4f9816 Mon Sep 17 00:00:00 2001 +From 0b660f804b58ed6c574577d1fee517a40024cd4d Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance @@ -69,10 +69,10 @@ index 7c518983a..bdb534deb 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 00a1fe759..bcf406f22 100644 +index 1e8079f91..b4443f3a6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1259,7 +1259,7 @@ public class WorldServer extends World { +@@ -1269,7 +1269,7 @@ public class WorldServer extends World { } // CraftBukkit end this.globalEntityList.add(entitylightning); diff --git a/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 2b22f699c..871e31b45 100644 --- a/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From f4d74e3ab68297624b084772807e36ab921e0446 Mon Sep 17 00:00:00 2001 +From 92c918d21661c0c057fea5381883b61b291fb1ea Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 19:17:27 -0400 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles @@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check other worlds. diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 9eed1dce3e..6c091b6808 100644 +index 9eed1dce3..6c091b680 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -209,6 +209,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -32,5 +32,5 @@ index 9eed1dce3e..6c091b6808 100644 if (entity instanceof EntityLiving) { this.shooter = (EntityLiving) entity; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch index 5ee8f16a0..ef5af83a8 100644 --- a/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From 5a2b59cd432df49374c60ff6fc3db1a166f097f1 Mon Sep 17 00:00:00 2001 +From baccdcbf7b3f1fc9ce3500295d5d40e6b85cc651 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 67062635c..707dfe375 100644 +index e6252e5f1..8858bea04 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { 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 3fcf563da..43282de19 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 eacd5eea80e890842c0c5505cf23eadf6fedb4ca Mon Sep 17 00:00:00 2001 +From a1ec98d135336211deb340a8f9c694597f3406f9 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 @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 092bff78ab..7e85a02242 100644 +index 092bff78a..7e85a0224 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; @@ -55,7 +55,7 @@ index 092bff78ab..7e85a02242 100644 } diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java new file mode 100644 -index 0000000000..fdd8708f97 +index 000000000..fdd8708f9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java @@ -0,0 +1,67 @@ @@ -127,7 +127,7 @@ index 0000000000..fdd8708f97 + } +} diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index a985ae7ba0..c3d57461df 100644 +index 1c4ac7bf7..47cf10501 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener { @@ -203,7 +203,7 @@ index a985ae7ba0..c3d57461df 100644 } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 08e314af7c..046196d54d 100644 +index 08e314af7..046196d54 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -216,7 +216,7 @@ index 08e314af7c..046196d54d 100644 public java.util.UUID spoofedUUID; public com.mojang.authlib.properties.Property[] spoofedProfile; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index 93ae6dcd78..fb9186b3f5 100644 +index 93ae6dcd7..fb9186b3f 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -244,7 +244,7 @@ index 93ae6dcd78..fb9186b3f5 100644 int j = this.i(); diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java -index 4d1f441395..c1ca6f9501 100644 +index 4d1f44139..c1ca6f950 100644 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java @@ -4,8 +4,8 @@ import java.io.IOException; @@ -259,7 +259,7 @@ index 4d1f441395..c1ca6f9501 100644 public PacketLoginInCustomPayload() {} diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java -index ae74dc9e18..7eb230f1b2 100644 +index ae74dc9e1..7eb230f1b 100644 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index be6ecfb08a..7b6b1ad17b 100644 +index be6ecfb08..7b6b1ad17 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ @@ -97,7 +97,7 @@ index be6ecfb08a..7b6b1ad17b 100644 public SoundEffect eq() { return SoundEffects.ENTITY_WITCH_CELEBRATE; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java -index bae107e76e..b43a2bbd5b 100644 +index bae107e76..b43a2bbd5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,12 +1,18 @@ @@ -146,5 +146,5 @@ index bae107e76e..b43a2bbd5b 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0320-Fix-MC-93764.patch b/Spigot-Server-Patches/0320-Fix-MC-93764.patch index da3c23163..502ded500 100644 --- a/Spigot-Server-Patches/0320-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0320-Fix-MC-93764.patch @@ -1,11 +1,11 @@ -From 3ef9521e440fa0392eb13b2e3d070b7bcc210639 Mon Sep 17 00:00:00 2001 +From 8d74a1d31f57e2c6dc0c179601db6a18d6a1e821 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Oct 2018 19:38:45 -0500 Subject: [PATCH] Fix MC-93764 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java -index 9d4fcf8bcf..4b9760709d 100644 +index 9d4fcf8bc..4b9760709 100644 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider { @@ -18,5 +18,5 @@ index 9d4fcf8bcf..4b9760709d 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch index ea13eb5cd..2f8d2979b 100644 --- a/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From 4c028f4696820f3469ac9a56822d2b712c3d390b Mon Sep 17 00:00:00 2001 +From ade44b08c750ffcf815f12a5e98071d3c52a62fe Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch index 9133e40cb..ff882fd25 100644 --- a/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From 3becb862ae274a065c17d6edd7c61f924b34717e Mon Sep 17 00:00:00 2001 +From a1271937315bc0dc157ead606a5fd85836ba797f Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1d4c15039..4ff59a6fa 100644 +index 4619f2c92..03469c965 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 1d4c15039..4ff59a6fa 100644 return 300; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 707dfe375..c5ca709a1 100644 +index 8858bea04..f2f34593b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1861,6 +1861,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch index 3609efd61..5c8fd9a30 100644 --- a/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch +++ b/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch @@ -1,4 +1,4 @@ -From 80b6c40c0cc5c605e988627f7c905163558c828f Mon Sep 17 00:00:00 2001 +From 5509fa75cffe5764dab30e4ad1745d5bd8e95c5d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Oct 2018 20:53:43 -0400 Subject: [PATCH] Strip private area unicode characters from signs @@ -20,7 +20,7 @@ think of no reason to use it. Fixes GH-1571 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 03f6ddf000..4c2273497b 100644 +index 03f6ddf00..4c2273497 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -11,6 +11,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -89,5 +89,5 @@ index 03f6ddf000..4c2273497b 100644 public void a(int i, IChatBaseComponent ichatbasecomponent) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 10438fab0..92ce3e6ba 100644 --- a/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 90e61d55098b75de4ce33072d6e3e9c0de99d9b5 Mon Sep 17 00:00:00 2001 +From 1d9adc37ea04e2f598d16e86c670524b6bedb27c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed @@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after the current one finished, resulting in 100ms lost per profile lookup diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java -index 71e48e87b4..23f1447cfc 100644 +index 71e48e87b..23f1447cf 100644 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository { @@ -32,5 +32,5 @@ index 71e48e87b4..23f1447cfc 100644 try { Thread.sleep(DELAY_BETWEEN_PAGES); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch index 68d3d9e37..e4b2789df 100644 --- a/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,11 +1,11 @@ -From 23df2c9ac84d8464e7a7f73c8a90ae26dc73ad93 Mon Sep 17 00:00:00 2001 +From 7ffab5b21a1c24feab0808bbb7728f5df73a9eb7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 7e224ebeff..dc6d030621 100644 +index 7e224ebef..dc6d03062 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -66,7 +66,7 @@ public class SystemUtils { @@ -18,5 +18,5 @@ index 7e224ebeff..dc6d030621 100644 if (i <= 0) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch index 2012978db..124a7de1c 100644 --- a/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 6a0b370f6e6b1d6f45ca16da6e919655d3d0849c Mon Sep 17 00:00:00 2001 +From 7f0e35030a5992c50655cd6285e0858020839d28 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 553014b79e..ca45093e66 100644 +index a3156d003..2a01e609c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1155,12 +1155,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support @@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati based inventories. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java -index 9957ed0402..ae280dd40b 100644 +index 9957ed040..ae280dd40 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java @@ -39,10 +39,20 @@ public final class CraftInventoryCreator { @@ -42,5 +42,5 @@ index 9957ed0402..ae280dd40b 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch index a3696966f..65773c938 100644 --- a/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From f622d3f3fe5d64da154b7a34150691f6fcfcd7f2 Mon Sep 17 00:00:00 2001 +From 900913a4710ef3d90da72e6bc35f342204901239 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds @@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds CraftBukkit changed the values on flying speed, restore back to vanilla diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 1b64ad8243..4388186db5 100644 +index 1b64ad824..4388186db 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -59,9 +59,9 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -23,5 +23,5 @@ index 1b64ad8243..4388186db5 100644 // CraftBukkit end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch index ab26a58d5..c943c39e7 100644 --- a/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 44cda44409f8fce52277f6939177ece03b62db58 Mon Sep 17 00:00:00 2001 +From b48305003dc34450a7cc81c77ad40499a3ef44b5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling @@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling Only process drops when the block is actually going to be removed diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 2262a82532..46490a9430 100644 +index b9b750c36..540fcce1d 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -472,7 +472,7 @@ public class Block implements IMaterial { @@ -19,7 +19,7 @@ index 2262a82532..46490a9430 100644 if (world instanceof WorldServer) { a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> { diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java -index 685a30f3f1..9edf937a65 100644 +index 685a30f3f..9edf937a6 100644 --- a/src/main/java/net/minecraft/server/BlockSponge.java +++ b/src/main/java/net/minecraft/server/BlockSponge.java @@ -115,8 +115,11 @@ public class BlockSponge extends Block { @@ -37,5 +37,5 @@ index 685a30f3f1..9edf937a65 100644 } world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag()); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch index 1b59304b6..68228d0a3 100644 --- a/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,11 +1,11 @@ -From 885065934284b39491841922be8c933e2de6b656 Mon Sep 17 00:00:00 2001 +From 90b8fb0a67bd69a8677cf253dcc0cd212f557e04 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ccad0a601c..d263897da4 100644 +index ccad0a601..d263897da 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1271,6 +1271,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -21,5 +21,5 @@ index ccad0a601c..d263897da4 100644 return; default: -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch index e0c3b201d..3dccecc4e 100644 --- a/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 3f48cc87934a730f5d6423ce5cab4f167d399c63 Mon Sep 17 00:00:00 2001 +From 1b28776ff4559ef02b0e274969f236b70dfe381a Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -1127,7 +1127,7 @@ index 5bf2fc0b3..52a4982ec 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b6d904007..697c99d94 100644 +index eb8cadf5c..d62ef02e5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -543,6 +543,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -1138,7 +1138,7 @@ index b6d904007..697c99d94 100644 public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) { if (!this.isClientSide) { IBlockData iblockdata = this.getType(blockposition); -@@ -1298,6 +1299,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1302,6 +1303,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0)))); } diff --git a/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch index cb380925f..9420fa473 100644 --- a/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 47b1a0115bf4d80d5b352677c55d804002195cc5 Mon Sep 17 00:00:00 2001 +From 9a59cfe70b2c3dceb979d50b8f89a269da141629 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4ff59a6fa..75b883791 100644 +index 03469c965..db404e4cd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2027,12 +2027,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -72,7 +72,7 @@ index 4ff59a6fa..75b883791 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 763ca58d1..003df00b4 100644 +index d6df01868..2edb99b63 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -91,10 +91,10 @@ index 763ca58d1..003df00b4 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b59b39d41..a63edeeb9 100644 +index eed3e7c58..4e64a80a8 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2733,11 +2733,13 @@ public abstract class EntityLiving extends Entity { +@@ -2735,11 +2735,13 @@ public abstract class EntityLiving extends Entity { return ((Byte) this.datawatcher.get(EntityLiving.ao) & 4) != 0; } @@ -112,7 +112,7 @@ index b59b39d41..a63edeeb9 100644 this.a(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index c5ca709a1..15a21ce59 100644 +index f2f34593b..83b7ac459 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1015,11 +1015,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0333-Book-Size-Limits.patch b/Spigot-Server-Patches/0333-Book-Size-Limits.patch index 785250d37..b46198355 100644 --- a/Spigot-Server-Patches/0333-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0333-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From ec46a7a8f3b1fe1bbdba42febfcf7d956a083314 Mon Sep 17 00:00:00 2001 +From 0ae11b28c737c06f42585a00b5575d9d1295756c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7e85a02242..30f35304ad 100644 +index 7e85a0224..30f35304a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -351,4 +351,11 @@ public class PaperConfig { @@ -22,7 +22,7 @@ index 7e85a02242..30f35304ad 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d263897da4..e5db2de26e 100644 +index d263897da..e5db2de26 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -14,6 +14,7 @@ import java.util.Iterator; @@ -77,5 +77,5 @@ index d263897da4..e5db2de26e 100644 // CraftBukkit start if (this.lastBookTick + 20 > MinecraftServer.currentTick) { -- -2.24.1 +2.25.0.windows.1 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 b3957e90b..ed180ffe0 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,11 +1,11 @@ -From d2f9615e2b12453949c136e1033434c09fc94357 Mon Sep 17 00:00:00 2001 +From 3d72f4fe7da0fc0661165efcfb842c35cdd72d99 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 30f35304ad..546a1cfe0a 100644 +index 30f35304a..546a1cfe0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; @@ -29,7 +29,7 @@ index 30f35304ad..546a1cfe0a 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 7e810e0086..58b3432590 100644 +index c74cc5706..f07e7682d 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 { @@ -45,5 +45,5 @@ index 7e810e0086..58b3432590 100644 public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) { return createProfile(uuid, null); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch index 7607d0b50..a0084fbde 100644 --- a/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From b2237c2b5ed734c7b9244b2c8f3b039ad64a4791 Mon Sep 17 00:00:00 2001 +From a1448caf48506b39ea6ca9fc496d42794058cc34 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index cbaed08f52..6bad1687fe 100644 +index e259c868e..5fb3c948d 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1253,6 +1253,8 @@ public abstract class EntityInsentient extends EntityLiving { @@ -18,7 +18,7 @@ index cbaed08f52..6bad1687fe 100644 byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b); diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index c8e4dcdaca..1c2c05ae3a 100644 +index 31aba6bfc..2d4f8aac8 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster { @@ -92,7 +92,7 @@ index c8e4dcdaca..1c2c05ae3a 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java -index 0429cf020e..c4320dbb67 100644 +index 0429cf020..c4320dbb6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie { @@ -138,5 +138,5 @@ index 0429cf020e..c4320dbb67 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch index 265ab7829..f7829634a 100644 --- a/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 72e8e504ce8125125e9c2a395ea15ad3bbd11507 Mon Sep 17 00:00:00 2001 +From 7444bc82fcaedad8178f68ad68e376a0de198e7d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss this saves a ton of lag for when AI tries to raytrace near unloaded chunks. diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java -index 0dff023529..29cdc00875 100644 +index 0dff02352..29cdc0087 100644 --- a/src/main/java/net/minecraft/server/IBlockAccess.java +++ b/src/main/java/net/minecraft/server/IBlockAccess.java @@ -41,7 +41,15 @@ public interface IBlockAccess { @@ -28,5 +28,5 @@ index 0dff023529..29cdc00875 100644 Vec3D vec3d = raytrace1.b(); Vec3D vec3d1 = raytrace1.a(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch index 0fd0ebc4e..117fc6d11 100644 --- a/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From c2690b4ef9dd8835fc11488728a893d6dd22eee0 Mon Sep 17 00:00:00 2001 +From e727be3702ab097173ba79d5128dc0de8ad7263b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client @@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet, split the inventory set into multiple packets instead. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 046196d54d..d4aad8a5b7 100644 +index 046196d54..d4aad8a5b 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -97,6 +97,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -27,7 +27,7 @@ index 046196d54d..d4aad8a5b7 100644 NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause()); } else { diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 601d4d0fa2..2d8e6a2f4a 100644 +index 601d4d0fa..2d8e6a2f4 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -10,6 +10,12 @@ public interface Packet { @@ -44,7 +44,7 @@ index 601d4d0fa2..2d8e6a2f4a 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java -index 63c4dbd327..b0cfef52cb 100644 +index 63c4dbd32..b0cfef52c 100644 --- a/src/main/java/net/minecraft/server/PacketEncoder.java +++ b/src/main/java/net/minecraft/server/PacketEncoder.java @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -80,7 +80,7 @@ index 63c4dbd327..b0cfef52cb 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 1fcbbd698a..a0b87f89df 100644 +index 1fcbbd698..a0b87f89d 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -79,7 +79,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -93,7 +93,7 @@ index 1fcbbd698a..a0b87f89df 100644 } else { this.f = new byte[i]; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java -index f7c3655671..631234324d 100644 +index f7c365567..631234324 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet { @@ -113,5 +113,5 @@ index f7c3655671..631234324d 100644 public PacketPlayOutWindowItems(int i, NonNullList nonnulllist) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 2864603f5..148ed7eca 100644 --- a/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From d8d1fa502fa53b0121cd986afb0519b3c98cd34e Mon Sep 17 00:00:00 2001 +From d2e75b109c8f840b3062f7a34c1a23b53b6b8b2e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 11 Dec 2018 22:25:07 -0500 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer @@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that should be covered as best we can. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index 6a448c02ec..c1ef1c950d 100644 +index 6a448c02e..c1ef1c950 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin; @@ -61,5 +61,5 @@ index 6a448c02ec..c1ef1c950d 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch index fc284ecb7..518afa2fc 100644 --- a/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From c75ab2e4521d296a572435b722e308c4d9bea517 Mon Sep 17 00:00:00 2001 +From be2fcdbbab552651193f0614e8fa38dcaa4e124f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent is undefined. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c3d57461df..a6b22254ac 100644 +index 47cf10501..f1222fcb2 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener { @@ -50,7 +50,7 @@ index c3d57461df..a6b22254ac 100644 private SecretKey loginKey; private EntityPlayer l; diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index d4aad8a5b7..b1dededc15 100644 +index d4aad8a5b..b1dededc1 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -336,6 +336,26 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -81,5 +81,5 @@ index d4aad8a5b7..b1dededc15 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch index 652ea4b16..448854782 100644 --- a/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From 5bdeb1dd1680e7793f2e1aaf8440ed2d184c9931 Mon Sep 17 00:00:00 2001 +From 03d71a4815f4f0fbcdf63b6894e9551bdb81e683 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 18 Dec 2018 02:15:08 +0000 Subject: [PATCH] Prevent Enderman from loading chunks diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 9783576e38..13507edbce 100644 +index 149de2c57..8741df83b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -344,7 +344,8 @@ public class EntityEnderman extends EntityMonster { @@ -29,5 +29,5 @@ index 9783576e38..13507edbce 100644 IBlockData iblockdata1 = world.getType(blockposition1); IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320 -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 5d02c8bb8..f06ceb33b 100644 --- a/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From 17aadebc3d123540f48d5d62efc82c88a3cdbd5d Mon Sep 17 00:00:00 2001 +From 6aa4fec87fd7c60b506da07812490eaee027ca79 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:35:43 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 15a21ce59..8d4cac430 100644 +index 83b7ac459..f51893892 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -163,5 +163,5 @@ index a2bda708c..37fce38df 100644 @Override -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch index 37cf17b9f..29679f8d0 100644 --- a/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From 56d470c052804818d690c2646db01a9cd3b7e95f Mon Sep 17 00:00:00 2001 +From 0c5b2fe41394e0d3f410bb5cfe1d5ec114c77e0d Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent @@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta cancelled writing diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e5db2de26e..c3feccbd64 100644 +index e5db2de26..c3feccbd6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -871,9 +871,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -29,5 +29,5 @@ index e5db2de26e..c3feccbd64 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index cb07f72f0..9e21e7016 100644 --- a/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From 73968e2b8fe632e8eaf8a12b9fcb9e8a1d169624 Mon Sep 17 00:00:00 2001 +From ddc742b1592154f7339cf8c9c2370b0bb66c8d93 Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8d4cac430..1cb90334e 100644 +index f51893892..959e2c1c1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1290,6 +1290,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index b044535c6..259c90cd0 100644 --- a/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From 5315f77f15062f5a76c11a2e13b3885cc70f49b1 Mon Sep 17 00:00:00 2001 +From 498b07609e956990f12baa28189933e4a96559a7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 31 Jan 2019 16:33:36 -0500 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons @@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for all piston types. diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index 1170a28107..b29525c40d 100644 +index 1170a2810..b29525c40 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -122,7 +122,7 @@ public class BlockPiston extends BlockDirectional { @@ -46,5 +46,5 @@ index 1170a28107..b29525c40d 100644 // CraftBukkit end world.playBlockAction(blockposition, this, b0, enumdirection.b()); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch index ef73889ef..4b6aec346 100644 --- a/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From 7b15289fa17f70f53be0b15202333146c496356c Mon Sep 17 00:00:00 2001 +From e8fe700e11b56be17d29eae6d05e824e8857844e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Feb 2019 23:33:24 -0500 Subject: [PATCH] Block Entity#remove from being called on Players @@ -32,5 +32,5 @@ index 37fce38df..90c251c90 100644 // Spigot start -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0346-BlockDestroyEvent.patch b/Spigot-Server-Patches/0346-BlockDestroyEvent.patch index bf9898649..09fc88e27 100644 --- a/Spigot-Server-Patches/0346-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0346-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 74b7490d65427a72952d493d94b3fe6211fda27a Mon Sep 17 00:00:00 2001 +From 0c99ceec43afdfcac3eb6a5afa3316c0d4a1c790 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,7 +11,7 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 380833ee54..59f7900b4e 100644 +index d62ef02e5..a5b451877 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -473,8 +473,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -37,5 +37,5 @@ index 380833ee54..59f7900b4e 100644 TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index 24628a453..b91213c2c 100644 --- a/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From f0d5c2134b3423b0b864afd2c8e4a097c53cad53 Mon Sep 17 00:00:00 2001 +From 20e1b2bdda860cd130c7599e3d9ad4eb391f64e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2019 00:08:15 -0500 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes @@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless. This reimplements vanilla logic using the same test logic as Shaped diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java -index fe03a35cc8..fb481e6586 100644 +index fe03a35cc..fb481e658 100644 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting { @@ -64,5 +64,5 @@ index fe03a35cc8..fb481e6586 100644 public ItemStack a(InventoryCrafting inventorycrafting) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch index cfc06b583..a63719e57 100644 --- a/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From aa164dd151ab3d3ead034731745db1e55a972a6b Mon Sep 17 00:00:00 2001 +From 164f75b7e4bfa6d170ddd9edf90976c63c53361a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 00:15:28 -0500 Subject: [PATCH] Fix sign edit memory leak @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak when a player edits a sign, a reference to their Entity is never cleand up. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c3feccbd64..c54e1c9a08 100644 +index c3feccbd6..c54e1c9a0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2545,7 +2545,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -19,7 +19,7 @@ index c3feccbd64..c54e1c9a08 100644 this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit return; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 4c2273497b..f051f2d3c6 100644 +index 4c2273497..f051f2d3c 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -14,6 +14,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -43,5 +43,5 @@ index 4c2273497b..f051f2d3c6 100644 public EntityHuman f() { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch index 754dfbcbf..5b56b6424 100644 --- a/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From bb751fbc2c916abca2f319d92b379079f2489649 Mon Sep 17 00:00:00 2001 +From 86fc828d1d7846a9bca09301fbb2941d2efcac1d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Feb 2019 22:18:40 -0500 Subject: [PATCH] Limit Client Sign length more @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c54e1c9a08..bd2ee459f1 100644 +index c54e1c9a0..bd2ee459f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -50,5 +50,5 @@ index c54e1c9a08..bd2ee459f1 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index 29b10b58e..ce2f21100 100644 --- a/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From 845ef08736ccbb04c7d244dec9a085f73ee2f1d3 Mon Sep 17 00:00:00 2001 +From 91445890bcd96fd7a6e34c28d4af6d4a5b4660c1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 11:11:29 -0500 Subject: [PATCH] Don't check ConvertSigns boolean every sign save @@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate and check security managers. diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index f051f2d3c6..5eb86c4341 100644 +index f051f2d3c..5eb86c434 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -15,6 +15,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -28,5 +28,5 @@ index f051f2d3c6..5eb86c4341 100644 } // CraftBukkit end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index 922624ab4..ee253b312 100644 --- a/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From 673d3ee1e10e029df171c5e47847a05cfeffe751 Mon Sep 17 00:00:00 2001 +From 09031375ee4d1d4c32f09bded9d72434d7ac4f78 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 14:55:01 -0500 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of @@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1 to disable the limit and let your players be abused. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index b1dededc15..e156804f7a 100644 +index b1dededc1..e156804f7 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -212,6 +212,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -31,7 +31,7 @@ index b1dededc15..e156804f7a 100644 private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 2d8e6a2f4a..8d0965a053 100644 +index 2d8e6a2f4..8d0965a05 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -11,6 +11,7 @@ public interface Packet { @@ -43,7 +43,7 @@ index 2d8e6a2f4a..8d0965a053 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index a0b87f89df..47710067a6 100644 +index a0b87f89d..47710067a 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -23,6 +23,15 @@ public class PacketPlayOutMapChunk implements Packet { @@ -86,5 +86,5 @@ index a0b87f89df..47710067a6 100644 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index e2d818d6c..c87c7004e 100644 --- a/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 7ffca02f733f68041ab9c7f5db1745932ffcce7c Mon Sep 17 00:00:00 2001 +From e2e6747239ab66f8720d21bc24c032f9d96ea8fb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 16:12:35 -0500 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency @@ -11,7 +11,7 @@ everything to the Whitelist object. https://github.com/PaperMC/Paper/issues/1880 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 8570e38f42..c97be42dd7 100644 +index 8570e38f4..c97be42dd 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -64,6 +64,7 @@ public class JsonList> { @@ -23,7 +23,7 @@ index 8570e38f42..c97be42dd7 100644 this.e = flag; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 659ce21818..62d8075971 100644 +index 659ce2181..62d807597 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -62,7 +62,7 @@ public abstract class PlayerList { @@ -62,5 +62,5 @@ index 659ce21818..62d8075971 100644 public List b(String s) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 7615a8356..06d6677e9 100644 --- a/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From c5dd4280a0f1e2df083484e4932c8d0086bec3cc Mon Sep 17 00:00:00 2001 +From fc7ebe181eda2807ffc2252305fe942896de26d9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Mar 2019 02:23:28 -0500 Subject: [PATCH] Set Zombie last tick at start of drowning process @@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process Fixes GH-1887 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 1c2c05ae3a..7d882d9c7e 100644 +index 2d4f8aac8..8635d4f40 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster { @@ -18,5 +18,5 @@ index 1c2c05ae3a..7d882d9c7e 100644 } else { this.bC = -1; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch index 281479f7e..e3697c545 100644 --- a/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From f3eedcffb0f48d7fe53324a16b9d39024c97dd90 Mon Sep 17 00:00:00 2001 +From 39af57e6f34618cb97c1c26bf83de1fd195d47aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks @@ -253,5 +253,5 @@ index 57ce53cfd..b3d1bb5fd 100644 throwable = throwable1; throw throwable1; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index 527642f53..fd7654674 100644 --- a/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,11 +1,11 @@ -From 0a303e331b84bcd8fabe4519e6608c2c788935d9 Mon Sep 17 00:00:00 2001 +From b35f238180840e93a9d516db9201c85fdc650403 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:08:09 +0200 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 62d8075971..9d715d891d 100644 +index 62d807597..9d715d891 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1035,6 +1035,7 @@ public abstract class PlayerList { @@ -17,5 +17,5 @@ index 62d8075971..9d715d891d 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch index 59f68f4dc..07128432e 100644 --- a/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch @@ -1,11 +1,11 @@ -From e811159df149fa177058864e2f1639d13496998e Mon Sep 17 00:00:00 2001 +From 80568b8254deb238e2a062226a686a3c97c3f1f8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index 4f60b931a1..c950139c0f 100644 +index 4f60b931a..c950139c0 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -108,6 +108,7 @@ public class AxisAlignedBB { @@ -46,7 +46,7 @@ index 4f60b931a1..c950139c0f 100644 double[] adouble = new double[]{1.0D}; double d0 = vec3d1.x - vec3d.x; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0f24805210..2e8aedf5fb 100644 +index db404e4cd..f8132a1fa 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1475,6 +1475,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -66,10 +66,10 @@ index 0f24805210..2e8aedf5fb 100644 return 0.0F; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a63edeeb95..43b8a722d0 100644 +index 4e64a80a8..af79b6e37 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -3305,6 +3305,37 @@ public abstract class EntityLiving extends Entity { +@@ -3307,6 +3307,37 @@ public abstract class EntityLiving extends Entity { return world.rayTrace(raytrace); } @@ -108,7 +108,7 @@ index a63edeeb95..43b8a722d0 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index c1f462d9d3..498f381099 100644 +index c1f462d9d..498f38109 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -18,6 +18,7 @@ public final class IEntitySelector { @@ -120,7 +120,7 @@ index c1f462d9d3..498f381099 100644 return !entity.isSpectator(); }; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 6f4c6c5891..b27fd44dcd 100644 +index 6f4c6c589..b27fd44dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -215,6 +215,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -158,5 +158,5 @@ index 6f4c6c5891..b27fd44dcd 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch index 80ed24a62..b0eebbad8 100644 --- a/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From 5e1fd0fad0d62825e89e45ffc2fff57d713e5d2d Mon Sep 17 00:00:00 2001 +From 63ea01d82c450a8342f1b745e1cc1406ca4929d8 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 20 Mar 2019 21:19:29 -0700 Subject: [PATCH] Use proper max length when serialising BungeeCord text @@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index 0ab611564e..f7b2095bb7 100644 +index 0ab611564..f7b2095bb 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -3,7 +3,7 @@ package net.minecraft.server; @@ -31,5 +31,5 @@ index 0ab611564e..f7b2095bb7 100644 // Paper end } else { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch index 9ddd9fd1c..4669a5b3d 100644 --- a/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From af87f78dd526e4e86214023e9da175cd5e0e46db Mon Sep 17 00:00:00 2001 +From 0d84c8471a87f0c6581a3d2adcec70194f4bdef2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2e8aedf5f..96b0917a3 100644 +index f8132a1fa..716d30b8d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -72,10 +72,10 @@ index 9d715d891..49437f212 100644 }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bcf406f22..8428ce779 100644 +index b4443f3a6..f8d7bba34 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -986,6 +986,7 @@ public class WorldServer extends World { +@@ -996,6 +996,7 @@ public class WorldServer extends World { // CraftBukkit start private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot @@ -99,5 +99,5 @@ index 915ccb180..dfa15372b 100644 // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch index 75a2955f1..2fbd9e340 100644 --- a/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,11 +1,11 @@ -From 5fd400efbfa3ecea916a6a70d7b5c9866f7aa363 Mon Sep 17 00:00:00 2001 +From e3bfdacc716c82d0a1086bf16a16f511b7b1f116 Mon Sep 17 00:00:00 2001 From: AgentTroll Date: Fri, 22 Mar 2019 22:24:03 -0700 Subject: [PATCH] Update entity Metadata for all tracked players diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 3ff7a7b4a8..3a88c9a670 100644 +index 3ff7a7b4a..3a88c9a67 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -387,6 +387,12 @@ public class EntityTrackerEntry { @@ -22,7 +22,7 @@ index 3ff7a7b4a8..3a88c9a670 100644 this.f.accept(packet); if (this.tracker instanceof EntityPlayer) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bd2ee459f1..17eeecaf4f 100644 +index bd2ee459f..17eeecaf4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2005,7 +2005,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -35,5 +35,5 @@ index bd2ee459f1..17eeecaf4f 100644 if (event.isCancelled()) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch index 77902bd34..0d799264f 100644 --- a/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch @@ -1,11 +1,11 @@ -From eb6e688b528840cbe7b19820e9b479f71ffad298 Mon Sep 17 00:00:00 2001 +From bdf8afb9a22fef3bdcf7df37700f1e7533ed84e0 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:56 +0200 Subject: [PATCH] Fire event on GS4 query diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java -index 66bfbcf02b..d821ef9a75 100644 +index 66bfbcf02..d821ef9a7 100644 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable { @@ -26,7 +26,7 @@ index 66bfbcf02b..d821ef9a75 100644 return this.b.getPlayerCount(); } diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java -index 16bb89af0f..1b084f2112 100644 +index f4f4e31d3..d50259384 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread { @@ -184,7 +184,7 @@ index 16bb89af0f..1b084f2112 100644 } } diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java -index 848b5c3f0e..73efea7e13 100644 +index 848b5c3f0..73efea7e1 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java @@ -18,15 +18,27 @@ public class RemoteStatusReply { @@ -216,5 +216,5 @@ index 848b5c3f0e..73efea7e13 100644 this.b.writeShort(Short.reverseBytes(short0)); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch index 282fc4372..aea3c6bde 100644 --- a/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch @@ -1,11 +1,11 @@ -From 9f24ddc1ec8cb2eaeeb6198b94cd83c60989c813 Mon Sep 17 00:00:00 2001 +From 4ccf2a5aff78c56a23fe6d7a69b2275791ce12ea Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:31:00 -0700 Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 49437f2124..68e089a4b6 100644 +index 49437f212..68e089a4b 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -638,9 +638,14 @@ public abstract class PlayerList { @@ -47,5 +47,5 @@ index 49437f2124..68e089a4b6 100644 return entityplayer1; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index 8eeabdd14..b48f875c4 100644 --- a/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From c6e6f1c5da5e4b01283396445ffea74e66eff376 Mon Sep 17 00:00:00 2001 +From b77e7a559145c350925a375f86f5c491572da9ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:09:20 -0400 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items @@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items vanilla checks for == 0 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 5f46c7f869..a0d1e7fd27 100644 +index 5f46c7f86..a0d1e7fd2 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -60,6 +60,7 @@ public class EntityItem extends Entity { @@ -26,5 +26,5 @@ index 5f46c7f869..a0d1e7fd27 100644 this.lastTick = MinecraftServer.currentTick; // CraftBukkit end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch index e50c5a1e4..163973817 100644 --- a/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 164c698f430156235f83a2dd6b4f0d41a5e3c5a4 Mon Sep 17 00:00:00 2001 +From 4b9e0ac5eff5d6e5b3122971848dd6943d377c83 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 3f552b5905..cb756b1ba0 100644 +index 3f552b590..cb756b1ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType; @@ -51,5 +51,5 @@ index 3f552b5905..cb756b1ba0 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0364-Server-Tick-Events.patch b/Spigot-Server-Patches/0364-Server-Tick-Events.patch index c2298cc2b..6bea45145 100644 --- a/Spigot-Server-Patches/0364-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0364-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From b0fcc9e0e91993d6995337ca5a04b3f6da16e86a Mon Sep 17 00:00:00 2001 +From 321428ced993804055ff146d6e357403715c5ad8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events @@ -6,10 +6,10 @@ Subject: [PATCH] Server Tick Events Fires event at start and end of a server tick diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ca45093e66..430d38b9c9 100644 +index 2a01e609c..2801a3ee6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1080,6 +1080,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ebab423af..f482bb6cb 100644 +index 959e2c1c1..6483c4a0b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -510,6 +510,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -73,5 +73,5 @@ index ebab423af..f482bb6cb 100644 this.setSpectatorTarget(this); // Remove spectated target -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch index 50cc34342..3ec61fdf2 100644 --- a/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 2b71f54314ccc158d0be01e9ea15d667e9c88e95 Mon Sep 17 00:00:00 2001 +From 9ec887b5bd8dd36f90b5163e878a8a26767f4f42 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup @@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to just do a get call since the value can never be null. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e07e63e55..3e57546a3 100644 +index a5b451877..13ff6a11f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1023,12 +1023,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -31,5 +31,5 @@ index e07e63e55..3e57546a3 100644 if (this.tickingTileEntities) { tileentity = this.e(blockposition); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0367-Add-Heightmap-API.patch b/Spigot-Server-Patches/0367-Add-Heightmap-API.patch index c16bb4df2..346cc2ad3 100644 --- a/Spigot-Server-Patches/0367-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0367-Add-Heightmap-API.patch @@ -1,11 +1,11 @@ -From c507b3253f2d65b838333295c00ace47fd5c8c23 Mon Sep 17 00:00:00 2001 +From 7b721e8893480246abe64b581c87da17ea868e51 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3e57546a36..59a1c6aae7 100644 +index 13ff6a11f..6fd6c343d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -594,8 +594,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -20,7 +20,7 @@ index 3e57546a36..59a1c6aae7 100644 if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 816d59b614..0a91617290 100644 +index 20e4be0e3..007a74f90 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -340,6 +340,29 @@ public class CraftWorld implements World { @@ -54,5 +54,5 @@ index 816d59b614..0a91617290 100644 public Location getSpawnLocation() { BlockPosition spawn = world.getSpawn(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch index 7b38a6aad..53b64aa58 100644 --- a/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From b0bef67d0488103272e29b26c09cafa796994d75 Mon Sep 17 00:00:00 2001 +From 6147a98269b0021a34653fea8f972c807b93f98a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:13 -0500 Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 90ca1ee141..b179893a17 100644 +index 90ca1ee14..b179893a1 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract { @@ -82,7 +82,7 @@ index 90ca1ee141..b179893a17 100644 nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities); nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java -index 5c4c3c70c7..e78e3804ba 100644 +index 5c4c3c70c..e78e3804b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState Date: Mon, 6 May 2019 01:29:25 -0400 Subject: [PATCH] Per-Player View Distance API placeholders @@ -60,5 +60,5 @@ index 90c251c90..c1acec87f 100644 // Spigot start -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch index 55687b612..5485ad045 100644 --- a/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,11 +1,11 @@ -From acbff9aa4ecc1cd25b2d8b2797069b902f6cbc44 Mon Sep 17 00:00:00 2001 +From a89d5a0b65ce63ebb8b626a43ced070e0bfabbf4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 10 May 2019 18:38:19 +0100 Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 17eeecaf4f..8c54022e07 100644 +index 17eeecaf4..8c54022e0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -286,7 +286,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index 17eeecaf4f..8c54022e07 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index e441eab00..d4084f754 100644 --- a/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From c59b376815945a61913f3321d9a6936e648e68b7 Mon Sep 17 00:00:00 2001 +From 9cf4ee44771b205c0e35bd098b8136ae35a039ba Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Apr 2019 20:00:43 +0100 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) This also fixes the adding sound playing when the item frame direction is changed. diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java -index 9b1e07452f..f8a2f32f1d 100644 +index 9b1e07452..f8a2f32f1 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -224,7 +224,7 @@ public class EntityItemFrame extends EntityHanging { @@ -19,7 +19,7 @@ index 9b1e07452f..f8a2f32f1d 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java -index 799036f268..9ad180d946 100644 +index 799036f26..9ad180d94 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { @@ -32,5 +32,5 @@ index 799036f268..9ad180d946 100644 this.entity = frame; } -- -2.24.1 +2.25.0.windows.1 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 f8bde1bf5..51858ed72 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 36846aa6f1ed6e24e6d3353e47c5effa1ca6f8eb Mon Sep 17 00:00:00 2001 +From 56f7533be515ae3f4590e50ba00b70d70ac69fd4 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 @@ -16,10 +16,10 @@ handling that should have been handled synchronously will be handled synchronously when the server gets shut down. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 430d38b9c9..be31fef799 100644 +index 2801a3ee6..3ede5ce2a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2199,7 +2199,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -19,10 +19,10 @@ This change ensures the chunks are always loaded when entities are added to the world, or a valid entity moves between chunks. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8428ce779..ae1e4b34b 100644 +index f8d7bba34..3c94aa48c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -693,7 +693,7 @@ public class WorldServer extends World { +@@ -703,7 +703,7 @@ public class WorldServer extends World { this.getChunkAt(entity.chunkX, entity.chunkZ).a(entity, entity.chunkY); } @@ -31,7 +31,7 @@ index 8428ce779..ae1e4b34b 100644 entity.inChunk = false; } else { this.getChunkAt(i, k).a(entity); -@@ -1018,7 +1018,7 @@ public class WorldServer extends World { +@@ -1028,7 +1028,7 @@ public class WorldServer extends World { return false; } // CraftBukkit end @@ -41,5 +41,5 @@ index 8428ce779..ae1e4b34b 100644 if (!(ichunkaccess instanceof Chunk)) { return false; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch index 61f79d009..7d61dfdfd 100644 --- a/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 7d00c8a2e75726da594e0203d6e88cbafb2513b1 Mon Sep 17 00:00:00 2001 +From 0080550b42ff659ffcbaea501571e8c4208e4549 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -93,7 +93,7 @@ index c7c600b80..64c327669 100644 int k = MathHelper.floor(entity.locY() / 16.0D); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 464301a1f..85f16bdb8 100644 +index 716d30b8d..7c7cd851c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2743,6 +2743,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -105,7 +105,7 @@ index 464301a1f..85f16bdb8 100644 this.uniqueID = uuid; this.am = this.uniqueID.toString(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index c97349010..ca3f9d3d3 100644 +index 7edca1744..314c77767 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,6 +1,7 @@ @@ -134,7 +134,7 @@ index c97349010..ca3f9d3d3 100644 import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.Executor; -@@ -598,19 +602,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -602,19 +606,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { for (int j = 0; j < i; ++j) { List entityslice = aentityslice[j]; // Spigot @@ -201,7 +201,7 @@ index c97349010..ca3f9d3d3 100644 if (list == null) { list = Lists.newArrayList(new Entity[]{entity}); } else { -@@ -618,6 +658,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -622,6 +662,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } } } @@ -210,7 +210,7 @@ index c97349010..ca3f9d3d3 100644 if (list != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ae1e4b34b..c4fabc477 100644 +index 3c94aa48c..f973b0799 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -222,7 +222,7 @@ index ae1e4b34b..c4fabc477 100644 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; -@@ -1045,8 +1047,23 @@ public class WorldServer extends World { +@@ -1055,8 +1057,23 @@ public class WorldServer extends World { if (entity1 == null) { return false; } else { @@ -248,7 +248,7 @@ index ae1e4b34b..c4fabc477 100644 return true; } } -@@ -1185,7 +1202,7 @@ public class WorldServer extends World { +@@ -1195,7 +1212,7 @@ public class WorldServer extends World { } Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity); diff --git a/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch index ad98c1bd9..ba14070ab 100644 --- a/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 5620e40df38c5991a73c4ae175263e24a30a9385 Mon Sep 17 00:00:00 2001 +From 2f99c3149ef9822c03f9cf077129a704145f715a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 21 May 2019 02:34:04 +0100 Subject: [PATCH] improve CraftWorld#isChunkLoaded @@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query the chunk status and get a response now, vs having to wait diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0a91617290..3a686c5287 100644 +index 007a74f90..428749238 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -404,14 +404,13 @@ public class CraftWorld implements World { @@ -30,5 +30,5 @@ index 0a91617290..3a686c5287 100644 throw new RuntimeException(ex); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch index c2bf80bfc..4e5c328b5 100644 --- a/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 14f500c16bffebebc1e0ae5e7dda0b54432ef414 Mon Sep 17 00:00:00 2001 +From 3254c8c658ade5ab399d1d63b6d3402a48e8cc6e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -21,10 +21,10 @@ index 572679e4d..071e5e7f7 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fd7526137..105ac1358 100644 +index 3ede5ce2a..eaa26e1a5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -585,6 +585,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 24 May 2019 07:53:16 +0100 Subject: [PATCH] Fix some generation concurrency issues diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1846aacc9a..46c810376e 100644 +index 6fd6c343d..d981dfd43 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -100,6 +100,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -33,7 +33,7 @@ index 1846aacc9a..46c810376e 100644 public CraftWorld getWorld() { return this.world; diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java -index 22e14fe1e9..e2af6d43b2 100644 +index 22e14fe1e..e2af6d43b 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java @@ -23,18 +23,18 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr @@ -59,7 +59,7 @@ index 22e14fe1e9..e2af6d43b2 100644 builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> { diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index b34a0683a1..e002ed53f6 100644 +index fc4348b60..44be7169f 100644 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java @@ -10,10 +10,12 @@ import javax.annotation.Nullable; @@ -121,7 +121,7 @@ index b34a0683a1..e002ed53f6 100644 + @Nullable @Override - public synchronized BlockPosition getNearestGeneratedFeature(World world, ChunkGenerator chunkgenerator, BlockPosition blockposition, int i, boolean flag) { // CraftBukkit - synchronized + public synchronized BlockPosition getNearestGeneratedFeature(World world, ChunkGenerator chunkgenerator, BlockPosition blockposition, int i, boolean flag) { if (!chunkgenerator.getWorldChunkManager().a(this)) { return null; } else { @@ -222,5 +222,5 @@ index b34a0683a1..e002ed53f6 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index 1dc2d0b1e..1fc15ef8f 100644 --- a/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From 19ab184d6152d90818930ab6f63665ee2da6c455 Mon Sep 17 00:00:00 2001 +From 24a3c231cb896032bb5737b5d55634c658a06922 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 27 May 2019 17:35:39 -0500 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative @@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java -index e8f3e55fd3..44289c2301 100644 +index e8f3e55fd..44289c230 100644 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java @@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity { @@ -23,5 +23,5 @@ index e8f3e55fd3..44289c2301 100644 if (this.world.isClientSide) { ParticleParam particleparam = this.getParticle(); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch index d9944c4f4..9be70b7be 100644 --- a/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch @@ -1,11 +1,11 @@ -From 9f996d0c55e7de903ef5dffc52115917ca3379ed Mon Sep 17 00:00:00 2001 +From 5619ab021614a4d2a9dcbe56aab720deb415a077 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 29 May 2019 04:01:22 +0100 Subject: [PATCH] ChunkMapDistance CME diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index a35f0e18b5..8c19456875 100644 +index a35f0e18b..8c1945687 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance { @@ -50,5 +50,5 @@ index a35f0e18b5..8c19456875 100644 } else { if (!this.l.isEmpty()) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch index 830120c1e..bd3820262 100644 --- a/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From 33328513e7947ba7da892fe021caa8604c4684fe Mon Sep 17 00:00:00 2001 +From 24cc5791d8a1cf9cccb522bafff707e5a05742cc Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:48:51 -0700 Subject: [PATCH] Implement CraftBlockSoundGroup @@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java new file mode 100644 -index 0000000000..99f99330d0 +index 000000000..99f99330d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 0000000000..99f99330d0 + } +} diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index c1ff62aa52..de43881653 100644 +index c1ff62aa5..de4388165 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -275,6 +275,7 @@ public class IBlockData extends BlockDataAbstract implements @@ -61,7 +61,7 @@ index c1ff62aa52..de43881653 100644 return this.getBlock().getStepSound(this); } diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java -index b774d2d8d9..0184bf3fc9 100644 +index b774d2d8d..0184bf3fc 100644 --- a/src/main/java/net/minecraft/server/SoundEffectType.java +++ b/src/main/java/net/minecraft/server/SoundEffectType.java @@ -27,10 +27,10 @@ public class SoundEffectType { @@ -96,7 +96,7 @@ index b774d2d8d9..0184bf3fc9 100644 return this.D; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index fa840c3d38..a667e58ed2 100644 +index fa840c3d3..a667e58ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -697,4 +697,11 @@ public class CraftBlock implements Block { @@ -112,5 +112,5 @@ index fa840c3d38..a667e58ed2 100644 + // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0381-Chunk-debug-command.patch b/Spigot-Server-Patches/0381-Chunk-debug-command.patch index 91eeff55a..df474f220 100644 --- a/Spigot-Server-Patches/0381-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0381-Chunk-debug-command.patch @@ -1,4 +1,4 @@ -From 6833643e5152ce0860958429c3d807b2c26dedb2 Mon Sep 17 00:00:00 2001 +From 32c84bc51770d5feb0a8e83cfa6649ca9c164aa7 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Jun 2019 13:00:55 -0700 Subject: [PATCH] Chunk debug command @@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index d704fc79c0..09efbf7250 100644 +index d704fc79c..09efbf725 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -28,14 +28,14 @@ public class PaperCommand extends Command { @@ -185,7 +185,7 @@ index d704fc79c0..09efbf7250 100644 * Ported from MinecraftForge - author: LexManos - License: LGPLv2.1 */ diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 038b7b68da..9b2bafdbd1 100644 +index a3ef6dba7..0b43e4eb4 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger; @@ -198,7 +198,7 @@ index 038b7b68da..9b2bafdbd1 100644 public final ChunkGenerator chunkGenerator; private final WorldServer world; diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index d49e210a3c..25a87c2d37 100644 +index d49e210a3..25a87c2d3 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -4,7 +4,13 @@ import com.destroystokyo.paper.block.TargetBlockInfo; @@ -399,7 +399,7 @@ index d49e210a3c..25a87c2d37 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3c6fe0596c..43d9a56340 100644 +index 3c6fe0596..43d9a5634 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -26,7 +26,7 @@ public class PlayerChunk { @@ -412,7 +412,7 @@ index 3c6fe0596c..43d9a56340 100644 private int dirtyCount; private int r; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 5fd001170b..827831aabc 100644 +index 314c77767..c17a53915 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -58,7 +58,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -434,7 +434,7 @@ index 5fd001170b..827831aabc 100644 private final DefinedStructureManager definedStructureManager; private final File w; diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index 77bb6b092a..7a8397815a 100644 +index 77bb6b092..7a8397815 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -6,8 +6,8 @@ public final class Ticket implements Comparable> { @@ -457,5 +457,5 @@ index 77bb6b092a..7a8397815a 100644 return this.b; } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0382-incremental-chunk-saving.patch b/Spigot-Server-Patches/0382-incremental-chunk-saving.patch index 7cfcd37ae..16b14f31c 100644 --- a/Spigot-Server-Patches/0382-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0382-incremental-chunk-saving.patch @@ -1,4 +1,4 @@ -From 7b6033c0bc67362b923dc13dc494b0b4c0911ff3 Mon Sep 17 00:00:00 2001 +From 522dba5da6503c5a65909606ade341f964ba4fdc Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving @@ -42,10 +42,10 @@ index 64c327669..14ec31f0a 100644 private long inhabitedTime; @Nullable diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 9b2bafdbd..f138b112f 100644 +index 0b43e4eb4..99ce73c45 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -335,6 +335,15 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -340,6 +340,15 @@ public class ChunkProviderServer extends IChunkProvider { } // Paper - Timings } @@ -62,7 +62,7 @@ index 9b2bafdbd..f138b112f 100644 public void close() throws IOException { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 105ac1358..4eba20b6a 100644 +index eaa26e1a5..6fa08c60b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -168,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 100) { // Spigot diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index dfbac1b3b..4acb03c9e 100644 +index c17a53915..3a02b6269 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -302,6 +302,36 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -149,10 +149,10 @@ index dfbac1b3b..4acb03c9e 100644 if (flag) { List list = (List) this.visibleChunks.values().stream().filter(PlayerChunk::hasBeenLoaded).peek(PlayerChunk::m).collect(Collectors.toList()); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8b3ea6544..2b42f3262 100644 +index 9be58e785..7bf0b8708 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -800,11 +800,44 @@ public class WorldServer extends World { +@@ -810,11 +810,44 @@ public class WorldServer extends World { return this.worldProvider.c(); } @@ -198,7 +198,7 @@ index 8b3ea6544..2b42f3262 100644 try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper if (iprogressupdate != null) { iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0])); -@@ -831,6 +864,7 @@ public class WorldServer extends World { +@@ -841,6 +874,7 @@ public class WorldServer extends World { // CraftBukkit end } diff --git a/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch index 394c648cd..429adf998 100644 --- a/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch +++ b/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch @@ -1,11 +1,11 @@ -From 892615eecbde89d87f0462d0f8bb9787d5201882 Mon Sep 17 00:00:00 2001 +From ae6210b47e9eacc744d03428dd7e120275374fa4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 10 Jun 2019 09:36:40 +0100 Subject: [PATCH] Catch exceptions from dispenser entity spawns diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index abc0cd3462..9a8be1474d 100644 +index abc0cd346..9a8be1474 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -163,7 +163,14 @@ public interface IDispenseBehavior { @@ -24,5 +24,5 @@ index abc0cd3462..9a8be1474d 100644 // CraftBukkit end return itemstack; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch index 64d936c13..10d84763e 100644 --- a/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch @@ -1,4 +1,4 @@ -From 3fd2ac56b41a6fb00288f3cb1dc08fe36ac32f6c Mon Sep 17 00:00:00 2001 +From 3edbd083e20ae90b37ce5ab04b6108c4cf7fac21 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 08:54:33 -0700 Subject: [PATCH] Fix World#isChunkGenerated calls @@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that its only purpose is to cache the status on DISK) diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index f138b112fe..e9cd44fae1 100644 +index 99ce73c45..761399e28 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -28,7 +28,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -43,7 +43,7 @@ index f138b112fe..e9cd44fae1 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 6371f2f5b1..961228e9df 100644 +index 6371f2f5b..961228e9d 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -391,6 +391,17 @@ public class ChunkRegionLoader { @@ -65,7 +65,7 @@ index 6371f2f5b1..961228e9df 100644 if (nbttagcompound != null) { ChunkStatus chunkstatus = ChunkStatus.a(nbttagcompound.getCompound("Level").getString("Status")); diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index efdf611e66..134a4f0b7d 100644 +index efdf611e6..134a4f0b7 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -176,6 +176,7 @@ public class ChunkStatus { @@ -95,7 +95,7 @@ index efdf611e66..134a4f0b7d 100644 return (ChunkStatus) IRegistry.CHUNK_STATUS.get(MinecraftKey.a(s)); } diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index f0a052eec2..2f95174fcc 100644 +index f0a052eec..2f95174fc 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; @@ -108,7 +108,7 @@ index f0a052eec2..2f95174fcc 100644 @Nullable private PersistentStructureLegacy c; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 43d9a56340..6f2cca07e0 100644 +index 43d9a5634..6f2cca07e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -70,6 +70,19 @@ public class PlayerChunk { @@ -132,10 +132,10 @@ index 43d9a56340..6f2cca07e0 100644 public CompletableFuture> getStatusFutureUnchecked(ChunkStatus chunkstatus) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 4acb03c9ed..bdbadca64b 100644 +index 3a02b6269..6257eafe0 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -902,11 +902,61 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -907,11 +907,61 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } @Nullable @@ -200,7 +200,7 @@ index 4acb03c9ed..bdbadca64b 100644 boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair) { // Spigot start diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 6b543f89d4..d37abf2cf3 100644 +index 6b543f89d..d37abf2cf 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -36,6 +36,30 @@ public class RegionFile implements AutoCloseable { @@ -249,7 +249,7 @@ index 6b543f89d4..d37abf2cf3 100644 this.c(); } finally { diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index b3d1bb5fd8..e07ae98540 100644 +index b3d1bb5fd..e07ae9854 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -18,7 +18,14 @@ public final class RegionFileCache implements AutoCloseable { @@ -279,7 +279,7 @@ index b3d1bb5fd8..e07ae98540 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8b62d1c6f2..2a33b90efd 100644 +index 9787d5332..f56ec3d34 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -18,6 +18,7 @@ import java.util.Objects; @@ -375,5 +375,5 @@ index 8b62d1c6f2..2a33b90efd 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch index 3a93c6f16..fe376292d 100644 --- a/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -1,11 +1,11 @@ -From c55d563741cac88102c70c74269b22594863eff9 Mon Sep 17 00:00:00 2001 +From 417b437ce455ba2657ebad4cd5287dcc0454fe7d Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 10:28:25 -0700 Subject: [PATCH] Show blockstate location if we failed to read it diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index f6401e2cde..3e22d558ea 100644 +index f6401e2cd..3e22d558e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -19,6 +19,8 @@ public class CraftBlockEntityState extends CraftBlockState @@ -33,5 +33,5 @@ index f6401e2cde..3e22d558ea 100644 public final boolean snapshotDisabled; // Paper -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch index d760925aa..6666c876a 100644 --- a/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch +++ b/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch @@ -1,4 +1,4 @@ -From bf88da807ddb0dc446176b281f7c56fa1ad7ca7f Mon Sep 17 00:00:00 2001 +From b57e278904ca310c9f763a59594ff19182445a43 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 21 Jun 2019 14:42:48 -0700 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure @@ -6,7 +6,7 @@ Subject: [PATCH] Log other thread in DataPaletteBlock lock failure diff --git a/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java new file mode 100644 -index 0000000000..a3b174618d +index 000000000..a3b174618 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java @@ -0,0 +1,11 @@ @@ -22,7 +22,7 @@ index 0000000000..a3b174618d + } +} diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index d5f5a51872..2c1d1b1a55 100644 +index d5f5a5187..2c1d1b1a5 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -22,14 +22,17 @@ public class DataPaletteBlock implements DataPaletteExpandable { @@ -47,5 +47,5 @@ index d5f5a51872..2c1d1b1a55 100644 crashreportsystemdetails.a("Thread dumps", (Object) s); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch index 720f9b497..b655384fc 100644 --- a/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch +++ b/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch @@ -1,4 +1,4 @@ -From 4d05ea5ef9cd7228debac748c43e05aa8adda786 Mon Sep 17 00:00:00 2001 +From 81ca8a38e7ed63416c92b49cfcabeba9ed3edc1c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 22 Jun 2019 04:20:47 -0700 Subject: [PATCH] Use ChunkStatus cache when saving protochunks @@ -7,10 +7,10 @@ The cache should contain the chunk status when saving. If not it will load it. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index bdbadca64..bfaabfdfe 100644 +index 6257eafe0..4e9edd759 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -779,8 +779,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -783,8 +783,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { NBTTagCompound nbttagcompound; if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) { @@ -24,5 +24,5 @@ index bdbadca64..bfaabfdfe 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0388-Anti-Xray.patch b/Spigot-Server-Patches/0388-Anti-Xray.patch index 15e263368..31a6e7ae9 100644 --- a/Spigot-Server-Patches/0388-Anti-Xray.patch +++ b/Spigot-Server-Patches/0388-Anti-Xray.patch @@ -1,4 +1,4 @@ -From dcdd9553b66246aa5f1fd23a5ba36c9e39701ce6 Mon Sep 17 00:00:00 2001 +From 59d051b8d575a77e737688f5abc99fdc894e92f6 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Mon, 20 Aug 2018 03:03:58 +0200 Subject: [PATCH] Anti-Xray @@ -1558,10 +1558,10 @@ index 6f2cca07e..7a1578afa 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 bfaabfdfe..3825520fa 100644 +index 4e9edd759..6728e84b2 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -544,7 +544,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -545,7 +545,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { PlayerChunkMap.LOGGER.error("Couldn't load chunk {}", chunkcoordintpair, exception); } @@ -1570,7 +1570,7 @@ index bfaabfdfe..3825520fa 100644 }, this.executor); } -@@ -1255,7 +1255,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1260,7 +1260,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { private void a(EntityPlayer entityplayer, Packet[] apacket, Chunk chunk) { if (apacket[0] == null) { @@ -1648,7 +1648,7 @@ index a905a29e7..335b64435 100644 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 65763d772..06e8c27d9 100644 +index d981dfd43..a1b777ac0 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; diff --git a/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index 2fc25587d..942d4e9ba 100644 --- a/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -1,4 +1,4 @@ -From fb7dfbcc4e1ac59d02f68704b18d8f8742abff73 Mon Sep 17 00:00:00 2001 +From 5f766aa9deba621216afafea763e60fdb78d3335 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 01:01:32 -0400 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob @@ -38,10 +38,10 @@ index df24e3297..4c5010936 100644 public boolean asynchronous; public EngineMode engineMode; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2b42f3262..d1b2800b2 100644 +index 7bf0b8708..53172dac2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -943,6 +943,13 @@ public class WorldServer extends World { +@@ -953,6 +953,13 @@ public class WorldServer extends World { EnumCreatureType enumcreaturetype = entity.getEntityType().e(); if (enumcreaturetype != EnumCreatureType.MISC && this.getChunkProvider().b(entity)) { diff --git a/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch index 3845b0c99..7a4b157e4 100644 --- a/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch +++ b/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch @@ -1,4 +1,4 @@ -From a51787f3150ea943b1131cef4d82066dc1b05aae Mon Sep 17 00:00:00 2001 +From c7187f4c439228b7437e24042f4d1841f6b02a8f Mon Sep 17 00:00:00 2001 From: Lucavon Date: Tue, 23 Jul 2019 20:29:20 -0500 Subject: [PATCH] Configurable projectile relative velocity diff --git a/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch index a4a5c1c7b..a3f3b3bb5 100644 --- a/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch +++ b/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch @@ -1,14 +1,14 @@ -From 03f8e0d9211b682c9ead96de67b59b54368e01b0 Mon Sep 17 00:00:00 2001 +From e618559325fb1981a036d690cbb52dbe40349ee7 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 28 Jul 2019 00:51:11 +0100 Subject: [PATCH] Mark entities as being ticked when notifying navigation diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d1b2800b2..90272d0c0 100644 +index 53172dac2..691ef0048 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1380,6 +1380,7 @@ public class WorldServer extends World { +@@ -1390,6 +1390,7 @@ public class WorldServer extends World { VoxelShape voxelshape1 = iblockdata1.getCollisionShape(this, blockposition); if (VoxelShapes.c(voxelshape, voxelshape1, OperatorBoolean.NOT_SAME)) { @@ -16,7 +16,7 @@ index d1b2800b2..90272d0c0 100644 Iterator iterator = this.navigators.iterator(); while (iterator.hasNext()) { -@@ -1390,6 +1391,7 @@ public class WorldServer extends World { +@@ -1400,6 +1401,7 @@ public class WorldServer extends World { } } @@ -25,5 +25,5 @@ index d1b2800b2..90272d0c0 100644 } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch index 8af26dbfb..7f9477f32 100644 --- a/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch +++ b/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch @@ -1,11 +1,11 @@ -From 197465af8ed1a4c66a36adefa13a7b923cd3cc32 Mon Sep 17 00:00:00 2001 +From 2b0ecef5ce123353ef0bf4dbe36f08ab7c7071af Mon Sep 17 00:00:00 2001 From: kickash32 Date: Tue, 30 Jul 2019 03:17:16 +0500 Subject: [PATCH] offset item frame ticking diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java -index e9cde9c6e7..04864a36ef 100644 +index 21dbc9b2a..ef9c4717c 100644 --- a/src/main/java/net/minecraft/server/EntityHanging.java +++ b/src/main/java/net/minecraft/server/EntityHanging.java @@ -15,7 +15,7 @@ public abstract class EntityHanging extends Entity { @@ -18,5 +18,5 @@ index e9cde9c6e7..04864a36ef 100644 protected EnumDirection direction; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch index e64134d19..95d45c3a4 100644 --- a/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From c3d22601f3a549f38d3346fdf47e94cdf2b60360 Mon Sep 17 00:00:00 2001 +From 5977ff695cb879dc9a1d3d4c6a7a1a7e15a6800d Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items @@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear Combined, this adds up a lot. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 863a2222f5..f2a04cb6a0 100644 +index 863a2222f..f2a04cb6a 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -84,6 +84,10 @@ public class Chunk implements IChunkAccess { @@ -85,7 +85,7 @@ index 863a2222f5..f2a04cb6a0 100644 T t0 = (T) iterator.next(); // CraftBukkit - decompile error if (t0.shouldBeRemoved) continue; // Paper diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 498f381099..a2d1ef3602 100644 +index 498f38109..a2d1ef360 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -11,6 +11,7 @@ public final class IEntitySelector { @@ -97,5 +97,5 @@ index 498f381099..a2d1ef3602 100644 return entity instanceof IInventory && entity.isAlive(); }; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0394-Fixed-MC-156852.patch b/Spigot-Server-Patches/0394-Fixed-MC-156852.patch index c83ab023d..f0eeede79 100644 --- a/Spigot-Server-Patches/0394-Fixed-MC-156852.patch +++ b/Spigot-Server-Patches/0394-Fixed-MC-156852.patch @@ -1,4 +1,4 @@ -From ff366a3dddb05e9289dc6f54f0787ca587b1832e Mon Sep 17 00:00:00 2001 +From 91a4d1f49eaf71a0e8695ae4b1d4d34726a278e2 Mon Sep 17 00:00:00 2001 From: TheGreatKetchup Date: Thu, 1 Aug 2019 21:24:30 -0400 Subject: [PATCH] Fixed MC-156852 @@ -12,7 +12,7 @@ issue in 1.8-1.12. Originally solved by Gnembon on MC-5694 at bugs.mojang.com diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 8720dd1209..cc77dd8e54 100644 +index ce4340a47..8f7b08a6d 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -223,7 +223,7 @@ public class PlayerInteractManager { @@ -25,5 +25,5 @@ index 8720dd1209..cc77dd8e54 100644 } } else if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.STOP_DESTROY_BLOCK) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch index 5e9454f86..986f5a1e2 100644 --- a/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 94151e2bc6e9f31006421670d275c3822a32efa2 Mon Sep 17 00:00:00 2001 +From cba242fa2b307d951063e3d724d73dd4cb1bfecd 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 e9cd44fae..1f6b1c4f1 100644 +index 761399e28..58299562e 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -124,11 +124,137 @@ public class ChunkProviderServer extends IChunkProvider { @@ -2502,7 +2502,7 @@ index e9cd44fae..1f6b1c4f1 100644 if (Thread.currentThread() != this.serverThread) { return (IChunkAccess) CompletableFuture.supplyAsync(() -> { return this.getChunkAt(i, j, chunkstatus, flag); -@@ -150,8 +276,13 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -154,8 +280,13 @@ public class ChunkProviderServer extends IChunkProvider { CompletableFuture> completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag); if (!completablefuture.isDone()) { // Paper @@ -2516,7 +2516,7 @@ index e9cd44fae..1f6b1c4f1 100644 this.world.timings.chunkAwait.stopTiming(); // Paper } // Paper ichunkaccess = (IChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> { -@@ -640,11 +771,12 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -651,11 +782,12 @@ public class ChunkProviderServer extends IChunkProvider { protected boolean executeNext() { // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task try { @@ -2812,7 +2812,7 @@ index 134a4f0b7..88f167461 100644 return ChunkStatus.r.getInt(chunkstatus.c()); } diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java -index 721021791..f7156acb8 100644 +index 7e5ece9d5..cfe43e882 100644 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java @@ -91,7 +91,7 @@ public abstract class IAsyncTaskHandler implements Mailbox> syncLoadComplete = (chunkHolder, ioThrowable) -> { try (Timing ignored = this.world.timings.syncChunkLoadTimer.startTimingIfSync()) { // Paper + this.world.getMethodProfiler().c("chunkLoad"); - NBTTagCompound nbttagcompound; // Paper -- try (Timing ignored2 = this.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper -- nbttagcompound = this.readChunkData(chunkcoordintpair); -+ if (ioThrowable != null) { -+ com.destroystokyo.paper.io.IOUtil.rethrow(ioThrowable); - } - +- try (Timing ignored2 = this.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper start - timings +- nbttagcompound = this.readChunkData(chunkcoordintpair); +- } // Paper end +- - if (nbttagcompound != null) { - boolean flag = nbttagcompound.hasKeyOfType("Level", 10) && nbttagcompound.getCompound("Level").hasKeyOfType("Status", 8); - - if (flag) { - ProtoChunk protochunk = ChunkRegionLoader.loadChunk(this.world, this.definedStructureManager, this.m, chunkcoordintpair, nbttagcompound); -- ++ if (ioThrowable != null) { ++ com.destroystokyo.paper.io.IOUtil.rethrow(ioThrowable); ++ } + - protochunk.setLastSaved(this.world.getTime()); - return Either.left(protochunk); - } @@ -3288,7 +3290,7 @@ index 3825520fa..0ad11ba68 100644 } catch (ReportedException reportedexception) { Throwable throwable = reportedexception.getCause(); -@@ -545,7 +618,27 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -546,7 +619,27 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } return Either.left(new ProtoChunk(chunkcoordintpair, ChunkConverter.a, this.world)); // Paper - Anti-Xray @@ -3317,7 +3319,7 @@ index 3825520fa..0ad11ba68 100644 } private CompletableFuture> b(PlayerChunk playerchunk, ChunkStatus chunkstatus) { -@@ -757,18 +850,43 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -761,18 +854,43 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { return this.u.get(); } @@ -3369,7 +3371,7 @@ index 3825520fa..0ad11ba68 100644 ichunkaccess.setLastSaved(this.world.getTime()); ichunkaccess.setNeedsSaving(false); -@@ -779,27 +897,33 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -783,28 +901,35 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { NBTTagCompound nbttagcompound; if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) { @@ -3387,7 +3389,8 @@ index 3825520fa..0ad11ba68 100644 return false; } } -- + + this.world.getMethodProfiler().c("chunkSave"); + } // Paper + try (co.aikar.timings.Timing ignored1 = this.world.timings.chunkSaveDataSerialization.startTiming()) { // Paper nbttagcompound = ChunkRegionLoader.saveChunk(this.world, ichunkaccess); @@ -3406,7 +3409,7 @@ index 3825520fa..0ad11ba68 100644 } protected void setViewDistance(int i) { -@@ -903,6 +1027,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -908,6 +1033,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } } @@ -3449,7 +3452,7 @@ index 3825520fa..0ad11ba68 100644 @Nullable public NBTTagCompound readChunkData(ChunkCoordIntPair chunkcoordintpair) throws IOException { // Paper - private -> public NBTTagCompound nbttagcompound = this.read(chunkcoordintpair); -@@ -925,33 +1085,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -930,33 +1091,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { // Paper start - chunk status cache "api" public ChunkStatus getChunkStatusOnDiskIfCached(ChunkCoordIntPair chunkPos) { @@ -3516,7 +3519,7 @@ index 3825520fa..0ad11ba68 100644 } public IChunkAccess getUnloadingChunk(int chunkX, int chunkZ) { -@@ -960,6 +1142,39 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -965,6 +1148,39 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } // Paper end @@ -3556,7 +3559,7 @@ index 3825520fa..0ad11ba68 100644 boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair) { // Spigot start return isOutsideOfRange(chunkcoordintpair, false); -@@ -1304,6 +1519,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { +@@ -1309,6 +1525,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { } @@ -3952,7 +3955,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 90272d0c0..136c18d10 100644 +index 691ef0048..541c1535e 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 { @@ -4045,7 +4048,7 @@ index 90272d0c0..136c18d10 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2a33b90ef..0d036e5d9 100644 +index f56ec3d34..1a6a88b17 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/0396-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0396-Use-getChunkIfLoadedImmediately-in-places.patch index 8fa5accbd..a64fe893a 100644 --- a/Spigot-Server-Patches/0396-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0396-Use-getChunkIfLoadedImmediately-in-places.patch @@ -1,4 +1,4 @@ -From cc9d4e04761b5953e80552358e7663c3f3e40583 Mon Sep 17 00:00:00 2001 +From 3b0d0c226a4f9ef09c808fe10c82420a978a140a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 8 Jul 2019 00:13:36 -0700 Subject: [PATCH] Use getChunkIfLoadedImmediately in places @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f0d1a5b14..8c88cf637 100644 +index 7c7cd851c..bbfbe4b1e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -204,7 +204,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -34,7 +34,7 @@ index 8c54022e0..f6fbba36f 100644 return; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 06e8c27d9..37604d8cc 100644 +index a1b777ac0..0944ce045 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -130,8 +130,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -90,5 +90,5 @@ index f86404f83..92601c581 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0397-Reduce-sync-loads.patch b/Spigot-Server-Patches/0397-Reduce-sync-loads.patch index 0af3c5c72..322190243 100644 --- a/Spigot-Server-Patches/0397-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0397-Reduce-sync-loads.patch @@ -1,4 +1,4 @@ -From 0d6bd6ef77c14a6a7d648dc84ac43d675e46973e Mon Sep 17 00:00:00 2001 +From 75474a2f173a6ecb18037b0a2b74c8f3691545ed Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 19 Jul 2019 03:29:14 -0700 Subject: [PATCH] Reduce sync loads @@ -268,10 +268,10 @@ index 000000000..59aec1032 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 1f6b1c4f1..58654f453 100644 +index 58299562e..3eb867684 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -280,6 +280,7 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -284,6 +284,7 @@ public class ChunkProviderServer extends IChunkProvider { this.world.asyncChunkTaskManager.raisePriority(x, z, com.destroystokyo.paper.io.PrioritizedTaskQueue.HIGHEST_PRIORITY); com.destroystokyo.paper.io.chunk.ChunkTaskManager.pushChunkWait(this.world, x, z); // Paper end @@ -280,10 +280,10 @@ index 1f6b1c4f1..58654f453 100644 this.serverThreadQueue.awaitTasks(completablefuture::isDone); com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 37604d8cc..5460ace8f 100644 +index 0944ce045..9df079d8a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1197,7 +1197,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1198,7 +1198,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 <= j; ++i1) { for (int j1 = k; j1 <= l; ++j1) { @@ -292,7 +292,7 @@ index 37604d8cc..5460ace8f 100644 if (chunk != null) { chunk.a(entity, axisalignedbb, list, predicate); -@@ -1217,7 +1217,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1219,7 +1219,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 < j; ++i1) { for (int j1 = k; j1 < l; ++j1) { @@ -301,7 +301,7 @@ index 37604d8cc..5460ace8f 100644 if (chunk != null) { chunk.a(entitytypes, axisalignedbb, list, predicate); -@@ -1239,7 +1239,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1242,7 +1242,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 < j; ++i1) { for (int j1 = k; j1 < l; ++j1) { @@ -311,7 +311,7 @@ index 37604d8cc..5460ace8f 100644 if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 136c18d10..14f25caa0 100644 +index 541c1535e..4c74a85e0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -154,6 +154,12 @@ public class WorldServer extends World { @@ -328,5 +328,5 @@ index 136c18d10..14f25caa0 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch index b3b8b3f6f..8910b9385 100644 --- a/Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch +++ b/Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch @@ -1,4 +1,4 @@ -From 8e41731bb2f662d9286443c7ba5eb0cde48511b1 Mon Sep 17 00:00:00 2001 +From f9cc1034bd1c69afdf1201db96f1b57d35affb8c Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 3 Jun 2019 02:02:39 -0400 Subject: [PATCH] Implement alternative item-despawn-rate diff --git a/Spigot-Server-Patches/0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index 35b7f1f84..45c90f255 100644 --- a/Spigot-Server-Patches/0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/Spigot-Server-Patches/0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -1,4 +1,4 @@ -From d9c3b4c7139a9ac5c83a40d03cbd3381f74f711c Mon Sep 17 00:00:00 2001 +From 69a3146d91af39ed115c6017775fe608fa12a6c0 Mon Sep 17 00:00:00 2001 From: Paul Sauve Date: Sun, 14 Jul 2019 21:05:03 -0500 Subject: [PATCH] Do less work if we have a custom Bukkit generator @@ -7,10 +7,10 @@ If the Bukkit generator already has a spawn, use it immediately instead of spending time generating one that we won't use diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 14f25caa0..aad93723e 100644 +index 4c74a85e0..b3d23de1b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -797,12 +797,13 @@ public class WorldServer extends World { +@@ -807,12 +807,13 @@ public class WorldServer extends World { } else if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) { this.worldData.setSpawn(BlockPosition.ZERO.up()); } else { @@ -30,7 +30,7 @@ index 14f25caa0..aad93723e 100644 // CraftBukkit start if (this.generator != null) { Random rand = new Random(this.getSeed()); -@@ -819,6 +820,13 @@ public class WorldServer extends World { +@@ -829,6 +830,13 @@ public class WorldServer extends World { } // CraftBukkit end @@ -45,5 +45,5 @@ index 14f25caa0..aad93723e 100644 WorldServer.LOGGER.warn("Unable to find spawn biome"); } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0400-Fix-MC-158900.patch b/Spigot-Server-Patches/0400-Fix-MC-158900.patch index ab001f660..d3dc5ed8f 100644 --- a/Spigot-Server-Patches/0400-Fix-MC-158900.patch +++ b/Spigot-Server-Patches/0400-Fix-MC-158900.patch @@ -1,4 +1,4 @@ -From 5eed901d5840bd3011f06acbdbce04ad5f2f89f7 Mon Sep 17 00:00:00 2001 +From 0cb106700f315e3cf1e6e2c6f519611dde76d3d3 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 13 Aug 2019 06:35:17 -0700 Subject: [PATCH] Fix MC-158900 @@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it was expired at that point, then it would be null. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 68e089a4b6..f702619aa2 100644 +index 68e089a4b..f702619aa 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -513,8 +513,10 @@ public abstract class PlayerList { @@ -24,5 +24,5 @@ index 68e089a4b6..f702619aa2 100644 chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()}); if (gameprofilebanentry.getExpires() != null) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch index 78ff7172a..07bbf111a 100644 --- a/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch @@ -1,4 +1,4 @@ -From fd1b75f95c393ce7cd4c71ea10cb230378a33673 Mon Sep 17 00:00:00 2001 +From a98286788491d9065c6dabcc7773377b467014f4 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 01:27:58 +0500 Subject: [PATCH] implement optional per player mob spawns @@ -545,10 +545,10 @@ index 000000000..4f13d3ff8 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 58654f453..8a35e2994 100644 +index 3eb867684..d1e541ad6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -555,7 +555,22 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -560,7 +560,22 @@ public class ChunkProviderServer extends IChunkProvider { this.world.timings.countNaturalMobs.startTiming(); // Paper - timings int l = this.chunkMapDistance.b(); EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values(); @@ -572,7 +572,7 @@ index 58654f453..8a35e2994 100644 this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings this.world.getMethodProfiler().exit(); -@@ -620,8 +635,23 @@ public class ChunkProviderServer extends IChunkProvider { +@@ -625,8 +640,23 @@ public class ChunkProviderServer extends IChunkProvider { if (enumcreaturetype != EnumCreatureType.MISC && (!enumcreaturetype.c() || this.allowAnimals) && (enumcreaturetype.c() || this.allowMonsters) && (!enumcreaturetype.d() || flag2)) { int k1 = limit * l / ChunkProviderServer.b; // CraftBukkit - use per-world limits @@ -599,7 +599,7 @@ index 58654f453..8a35e2994 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 260eca28c..8b120e277 100644 +index 6483c4a0b..83405b641 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -80,6 +80,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -631,7 +631,7 @@ index 260eca28c..8b120e277 100644 return this.cs; } diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index d49ad0308..2fb04e3e9 100644 +index 79f854966..4100e367a 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -254,6 +254,7 @@ public class EntityTypes { @@ -643,7 +643,7 @@ index d49ad0308..2fb04e3e9 100644 return this.bb; } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 0ad11ba68..f8a65b3df 100644 +index 8ce6cf8ec..1df6a1f19 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -755,10 +755,10 @@ index fdac5bb3a..58bbf2f9d 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index aad93723e..f2d9392a0 100644 +index b3d23de1b..909af91ca 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1014,7 +1014,20 @@ public class WorldServer extends World { +@@ -1024,7 +1024,20 @@ public class WorldServer extends World { } public Object2IntMap l() { @@ -780,7 +780,7 @@ index aad93723e..f2d9392a0 100644 ObjectIterator objectiterator = this.entitiesById.values().iterator(); while (objectiterator.hasNext()) { -@@ -1039,11 +1052,16 @@ public class WorldServer extends World { +@@ -1049,11 +1062,16 @@ public class WorldServer extends World { continue; } // Paper end diff --git a/Spigot-Server-Patches/0402-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0402-Prevent-consuming-the-wrong-itemstack.patch index 385d91a56..01223ea44 100644 --- a/Spigot-Server-Patches/0402-Prevent-consuming-the-wrong-itemstack.patch +++ b/Spigot-Server-Patches/0402-Prevent-consuming-the-wrong-itemstack.patch @@ -1,14 +1,14 @@ -From dbf6b7b54ac1533f68fe2577b5c9f0ba31c687a2 Mon Sep 17 00:00:00 2001 +From 0e126d36e43b6d2ee76d3b32cb8c0e3e61726a2a Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 19:42:35 +0500 Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 43b8a722d0..e3c562a63b 100644 +index af79b6e37..b098cd6d7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2891,10 +2891,13 @@ public abstract class EntityLiving extends Entity { +@@ -2893,10 +2893,13 @@ public abstract class EntityLiving extends Entity { this.datawatcher.set(EntityLiving.ao, (byte) j); } @@ -24,7 +24,7 @@ index 43b8a722d0..e3c562a63b 100644 this.activeItem = itemstack; this.bl = itemstack.k(); if (!this.world.isClientSide) { -@@ -2970,6 +2973,7 @@ public abstract class EntityLiving extends Entity { +@@ -2972,6 +2975,7 @@ public abstract class EntityLiving extends Entity { this.clearActiveItem(); } else { if (!this.activeItem.isEmpty() && this.isHandRaised()) { @@ -32,7 +32,7 @@ index 43b8a722d0..e3c562a63b 100644 this.b(this.activeItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; -@@ -3000,8 +3004,8 @@ public abstract class EntityLiving extends Entity { +@@ -3002,8 +3006,8 @@ public abstract class EntityLiving extends Entity { this.a(this.getRaisedHand(), itemstack); // CraftBukkit end this.dH(); @@ -44,5 +44,5 @@ index 43b8a722d0..e3c562a63b 100644 } // Paper end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0403-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0403-only-add-passanger-entities-once-from-spawners.patch index 5bffdf224..147acf702 100644 --- a/Spigot-Server-Patches/0403-only-add-passanger-entities-once-from-spawners.patch +++ b/Spigot-Server-Patches/0403-only-add-passanger-entities-once-from-spawners.patch @@ -1,11 +1,11 @@ -From 263d4328d65fc870427a529fee730111c0753a73 Mon Sep 17 00:00:00 2001 +From 5c76b806f7dfdc6aa605e9c555881598656d55b6 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Wed, 21 Aug 2019 23:57:32 +0500 Subject: [PATCH] only add passanger entities once from spawners diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index b179893a17..b96f6461da 100644 +index b179893a1..b96f6461d 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -195,7 +195,7 @@ public abstract class MobSpawnerAbstract { @@ -18,5 +18,5 @@ index b179893a17..b96f6461da 100644 while (iterator.hasNext()) { -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0404-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0404-Fix-nether-portal-creation.patch index fba6a1047..0b715d4b3 100644 --- a/Spigot-Server-Patches/0404-Fix-nether-portal-creation.patch +++ b/Spigot-Server-Patches/0404-Fix-nether-portal-creation.patch @@ -1,11 +1,11 @@ -From 821be36bae9294b5d2fb00f9fd2fd062fe1bce79 Mon Sep 17 00:00:00 2001 +From 46a316fdf003cd8d6ace9a722facd9c0a7d6ccde Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Mon, 9 Sep 2019 13:21:17 +1000 Subject: [PATCH] Fix nether portal creation diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java -index 60330f753f..c22dbbfbe8 100644 +index 60330f753..c22dbbfbe 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java @@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess { @@ -21,5 +21,5 @@ index 60330f753f..c22dbbfbe8 100644 state.setData(data); list.put(position, state); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0405-Generator-Settings.patch b/Spigot-Server-Patches/0405-Generator-Settings.patch index dc113c22e..714b5fef2 100644 --- a/Spigot-Server-Patches/0405-Generator-Settings.patch +++ b/Spigot-Server-Patches/0405-Generator-Settings.patch @@ -1,4 +1,4 @@ -From e010ff94179eff5de8cc9be7cfdfa2bf6fa68aa2 Mon Sep 17 00:00:00 2001 +From f9873a8b7b662603099b4767da5e7b9743b3b61d Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings diff --git a/Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch index 99469737c..6e3dd065e 100644 --- a/Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch +++ b/Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch @@ -1,4 +1,4 @@ -From 674ba47adc6ea8be5ea4a7632056881426763acf Mon Sep 17 00:00:00 2001 +From c8b92f4b4cd63da65a9dac056dc348c1ce9a2df5 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sun, 15 Sep 2019 11:32:32 -0500 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809 @@ -81,7 +81,7 @@ index 55b07444e..3bc3c5aa2 100644 for (i = 1; worldserver.getType(blockposition.down(i)).getBlock() == this; ++i) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f2d9392a0..70cbff313 100644 +index 909af91ca..32512e5cc 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -590,7 +590,9 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0407-Fix-MC-161754.patch b/Spigot-Server-Patches/0407-Fix-MC-161754.patch index 01b54f622..e90d1b53b 100644 --- a/Spigot-Server-Patches/0407-Fix-MC-161754.patch +++ b/Spigot-Server-Patches/0407-Fix-MC-161754.patch @@ -1,4 +1,4 @@ -From 50870f9758bbac32ba1b296206b5af2b6bf5ce32 Mon Sep 17 00:00:00 2001 +From 64838870c3ed929c53914c8b867cb3d73eade9ef Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 24 Sep 2019 16:03:00 -0700 Subject: [PATCH] Fix MC-161754 @@ -9,7 +9,7 @@ We can use an entity valid check since this method is invoked for each inventory iteraction (thanks to CB) and on player tick (vanilla). diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java -index c95ce0124d..18e1ae7f0a 100644 +index c95ce0124..18e1ae7f0 100644 --- a/src/main/java/net/minecraft/server/ContainerHorse.java +++ b/src/main/java/net/minecraft/server/ContainerHorse.java @@ -76,7 +76,7 @@ public class ContainerHorse extends Container { @@ -22,5 +22,5 @@ index c95ce0124d..18e1ae7f0a 100644 @Override -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0408-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0408-Performance-improvement-for-Chunk.getEntities.patch index 70cac5645..62c648499 100644 --- a/Spigot-Server-Patches/0408-Performance-improvement-for-Chunk.getEntities.patch +++ b/Spigot-Server-Patches/0408-Performance-improvement-for-Chunk.getEntities.patch @@ -1,4 +1,4 @@ -From 32d4a337c94bccc2ae845eb5c197d8306e7673be Mon Sep 17 00:00:00 2001 +From e73a4f5457041d81d437d6f98705251df18b7167 Mon Sep 17 00:00:00 2001 From: wea_ondara Date: Thu, 10 Oct 2019 11:29:42 +0200 Subject: [PATCH] Performance improvement for Chunk.getEntities @@ -10,7 +10,7 @@ operation. This patch will reduce the load of plugins which for example implement custom moblimits and depend on Chunk.getEntities(). diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 91f2066b12..9cff8b88ba 100644 +index 91f2066b1..9cff8b88b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -112,14 +112,14 @@ public class CraftChunk implements Chunk { @@ -34,5 +34,5 @@ index 91f2066b12..9cff8b88ba 100644 return entities; -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch index ae149bebf..81f817434 100644 --- a/Spigot-Server-Patches/0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch +++ b/Spigot-Server-Patches/0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch @@ -1,4 +1,4 @@ -From 72e20dd1c42970f67d78bc7e97da4e40a13704c7 Mon Sep 17 00:00:00 2001 +From 4e6c0d35f3089a469d2dc5fe45c51a7fccbb0bc2 Mon Sep 17 00:00:00 2001 From: MisterErwin Date: Wed, 30 Oct 2019 16:57:54 +0100 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and @@ -6,7 +6,7 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0d036e5d96..4d7a7a8fe8 100644 +index 1a6a88b17..be8b617f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1831,7 +1831,12 @@ public class CraftWorld implements World { @@ -24,5 +24,5 @@ index 0d036e5d96..4d7a7a8fe8 100644 for (BlockFace dir : faces) { IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir))); -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0410-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0410-Expose-the-internal-current-tick.patch index 0026425cf..0752593d8 100644 --- a/Spigot-Server-Patches/0410-Expose-the-internal-current-tick.patch +++ b/Spigot-Server-Patches/0410-Expose-the-internal-current-tick.patch @@ -1,11 +1,11 @@ -From 9d6bff4402c92c5b5f9977faf411f8ffe9a031ca Mon Sep 17 00:00:00 2001 +From d5fc5250c5404103b92b76c9fee15fdcdf1c782c 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 18b76ed0f7..f3da3a82d9 100644 +index 9a5ca755b..ee5c57ca2 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 { @@ -20,5 +20,5 @@ index 18b76ed0f7..f3da3a82d9 100644 // Paper end } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index 276df569a..9826ace5e 100644 --- a/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -1,11 +1,11 @@ -From 2b69b34da50e8b99da20afff6b968db050e7f19a Mon Sep 17 00:00:00 2001 +From 7b5a4dafc73b631ad1d1aadee0c0cd601f82071c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:51:43 -0500 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8b120e277..eca1841b2 100644 +index 83405b641..41a3ad104 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -976,6 +976,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch index df42808af..e6c01a5b6 100644 --- a/Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch +++ b/Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch @@ -1,4 +1,4 @@ -From 2c72901a7914221bfc9e2776b7ff7d885f40ef8c Mon Sep 17 00:00:00 2001 +From 69ee23487c8d7dc08b9119e2114624d4e4e4985a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:46:15 -0500 Subject: [PATCH] Add option to disable pillager patrols @@ -19,7 +19,7 @@ index c37a0f035..3bbf77a8e 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index 55fc19fdc..38de3a618 100644 +index 33488b37e..a0f582807 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java @@ -9,6 +9,7 @@ public class MobSpawnerPatrol { @@ -29,7 +29,7 @@ index 55fc19fdc..38de3a618 100644 + if (worldserver.paperConfig.disablePillagerPatrols) return 0; // Paper if (!flag) { return 0; - } else { + } else if (!worldserver.getGameRules().getBoolean(GameRules.DO_PATROL_SPAWNING)) { -- 2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index ba2a5d933..1f50e5a92 100644 --- a/Spigot-Server-Patches/0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/Spigot-Server-Patches/0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -1,4 +1,4 @@ -From 790ec25581fb4df8c802a36f12fa3348381248e0 Mon Sep 17 00:00:00 2001 +From a01ad1a56d67a680d5ad8f3fa3edbfbf104d00a0 Mon Sep 17 00:00:00 2001 From: Lukasz Derlatka Date: Mon, 11 Nov 2019 16:08:13 +0100 Subject: [PATCH] Fix AssertionError when player hand set to empty type @@ -7,10 +7,10 @@ Fixes an AssertionError when setting the player's item in hand to null or a new Fixes GH-2718 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e3c562a63b..80219f2df1 100644 +index b098cd6d7..6184cced7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1886,6 +1886,7 @@ public abstract class EntityLiving extends Entity { +@@ -1888,6 +1888,7 @@ public abstract class EntityLiving extends Entity { return this.getEquipment(EnumItemSlot.OFFHAND); } @@ -19,7 +19,7 @@ index e3c562a63b..80219f2df1 100644 if (enumhand == EnumHand.MAIN_HAND) { return this.getEquipment(EnumItemSlot.MAINHAND); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f6fbba36f4..a1ce2d2e07 100644 +index f6fbba36f..a1ce2d2e0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1429,6 +1429,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -34,5 +34,5 @@ index f6fbba36f4..a1ce2d2e07 100644 } // CraftBukkit end -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch index d94babe67..1761ea485 100644 --- a/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch @@ -1,11 +1,11 @@ -From e38167e75d1e96f7a54df8cc01b01d2cbb6f2f44 Mon Sep 17 00:00:00 2001 +From ac9aaf1721701a758bb444c38c8ff02b6acd7780 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:11:03 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java -index a6b96456b..712bda122 100644 +index 5cab47a28..886babdcd 100644 --- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java +++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java @@ -10,6 +10,7 @@ public class InteractionResultWrapper { @@ -17,7 +17,7 @@ index a6b96456b..712bda122 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java -index 89d399c9f..15a536dab 100644 +index c72f618bb..a41ccc8f6 100644 --- a/src/main/java/net/minecraft/server/ItemEgg.java +++ b/src/main/java/net/minecraft/server/ItemEgg.java @@ -16,13 +16,32 @@ public class ItemEgg extends Item { @@ -52,10 +52,10 @@ index 89d399c9f..15a536dab 100644 } + */ // Paper end - return InteractionResultWrapper.a(itemstack); + return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java -index 315e01274..34ad0c119 100644 +index cab869e8e..b57e9f7e7 100644 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java @@ -16,22 +16,37 @@ public class ItemEnderPearl extends Item { @@ -104,10 +104,10 @@ index 315e01274..34ad0c119 100644 +// } + // Paper end - return InteractionResultWrapper.a(itemstack); + return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java -index f83eb5c45..1bcf58292 100644 +index 071688b3a..1d575af52 100644 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java @@ -15,19 +15,38 @@ public class ItemExpBottle extends Item { @@ -149,7 +149,7 @@ index f83eb5c45..1bcf58292 100644 } + */ // Paper end - return InteractionResultWrapper.a(itemstack); + return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java index c19b678cf..7672e31fc 100644 @@ -170,7 +170,7 @@ index c19b678cf..7672e31fc 100644 } } diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java -index 8f8f31b26..72dcf109f 100644 +index 5d1f118c5..d1beab1ab 100644 --- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java +++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java @@ -15,13 +15,31 @@ public class ItemPotionThrowable extends ItemPotion { @@ -204,10 +204,10 @@ index 8f8f31b26..72dcf109f 100644 } + */ // Paper end - return InteractionResultWrapper.a(itemstack); + return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java -index abbf2b788..4ad285696 100644 +index d38776b7e..e6044e654 100644 --- a/src/main/java/net/minecraft/server/ItemSnowball.java +++ b/src/main/java/net/minecraft/server/ItemSnowball.java @@ -17,18 +17,27 @@ public class ItemSnowball extends Item { @@ -262,5 +262,5 @@ index 18bd846ce..e71e933ff 100644 } } -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch index 7f6a352df..14db50615 100644 --- a/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -1,11 +1,11 @@ -From 009a60a50466d5a0e18d54a5410a9a222e392d0b Mon Sep 17 00:00:00 2001 +From 58758799789741b0d6dc9bc14fbe493a8fd85101 Mon Sep 17 00:00:00 2001 From: BlackHole Date: Sun, 15 Dec 2019 19:12:39 +0100 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion() diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 40f7b433a..ab3ebc79e 100644 +index 9fed3cd5d..9d4b76d4a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -298,6 +298,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -21,5 +21,5 @@ index 40f7b433a..ab3ebc79e 100644 /** -- -2.24.1 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0416-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0416-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch index 2931e60e7..1384cbead 100644 --- a/Spigot-Server-Patches/0416-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch +++ b/Spigot-Server-Patches/0416-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch @@ -1,4 +1,4 @@ -From ba28067d4c0a7fcd2cfa9cc141ed1318649afffd Mon Sep 17 00:00:00 2001 +From 7b77187774c1c4be0bb7f64522e3594f4934846f Mon Sep 17 00:00:00 2001 From: Callahan Date: Mon, 13 Jan 2020 23:47:28 -0600 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds @@ -19,5 +19,5 @@ index fa575dde1..dfe0f6650 100644 return globalpos.getBlockPosition().a((IPosition) entityliving.getPositionVector(), 2.0D) && iblockdata.getBlock().a(TagsBlock.BEDS) && !(Boolean) iblockdata.get(BlockBed.OCCUPIED); } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch index 3a2114b90..60a0d2e9f 100644 --- a/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch +++ b/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch @@ -1,11 +1,11 @@ -From 253abe5c3a4d5b2638ee6ce820343100098e467d Mon Sep 17 00:00:00 2001 +From b213d93c2fec628178a313d8ea64ce8ca7f02927 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Dec 2019 19:41:28 +0000 Subject: [PATCH] Fix spawn radius being treated as 0 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index eca1841b2..07d7ac56e 100644 +index 41a3ad104..27d529efe 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -123,7 +123,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,5 +18,5 @@ index eca1841b2..07d7ac56e 100644 int j = MathHelper.floor(worldserver.getWorldBorder().b((double) blockposition.getX(), (double) blockposition.getZ())); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch index 4f5d3173f..78e26de17 100644 --- a/Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -1,4 +1,4 @@ -From cbe17bc833a073c04a5e37568cedcd8e4f48303f Mon Sep 17 00:00:00 2001 +From e3376b78dc9f247bd0c164003a5c5e6e5af271ec Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 18 Dec 2019 22:21:35 -0600 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target @@ -63,5 +63,5 @@ index c76a43837..e35ec2db0 100644 + // Paper end } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0419-Optimize-Hoppers.patch b/Spigot-Server-Patches/0419-Optimize-Hoppers.patch index a453b70f0..99eafb8a8 100644 --- a/Spigot-Server-Patches/0419-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0419-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From c8eb8e9afa91d412c07fe63c11b1287d51340812 Mon Sep 17 00:00:00 2001 +From 676ced8c74cd7909a1c161c77b8a93d1dd21b8e5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -49,10 +49,10 @@ index 1be4cd163..182633bca 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fe24d924e..0365cebcf 100644 +index baeaf772b..346664cee 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1219,6 +1219,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0; // Paper @@ -81,7 +81,7 @@ index 958279249..a8e64dfda 100644 this.world.b(this.position, this); if (!this.c.isAir()) { diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index e08faf538..5dded0abe 100644 +index 907d088c8..4afd33a49 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -168,6 +168,160 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -297,7 +297,7 @@ index e08faf538..5dded0abe 100644 if (event.isCancelled()) { return false; @@ -368,7 +525,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi - boolean flag1 = iinventory1.isNotEmpty(); + boolean flag1 = iinventory1.isEmpty(); if (itemstack1.isEmpty()) { + IGNORE_TILE_UPDATES = true; // Paper @@ -307,5 +307,5 @@ index e08faf538..5dded0abe 100644 flag = true; } else if (a(itemstack1, itemstack)) { -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0420-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0420-PlayerDeathEvent-shouldDropExperience.patch index a24b8121f..fa29224d7 100644 --- a/Spigot-Server-Patches/0420-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-Server-Patches/0420-PlayerDeathEvent-shouldDropExperience.patch @@ -1,11 +1,11 @@ -From 49358ef040460f25448876b8f2a3027c6eddb06c Mon Sep 17 00:00:00 2001 +From 95db5e56cb5f4c3dcd1277a07333b20669e12755 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:42 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 07d7ac56e..9a61dda82 100644 +index 27d529efe..d09afc889 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -639,7 +639,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,5 +18,5 @@ index 07d7ac56e..9a61dda82 100644 if (!event.getKeepInventory()) { // Paper start - replace logic -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0421-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0421-Prevent-bees-loading-chunks-checking-hive-position.patch index c71745be5..810a7fa03 100644 --- a/Spigot-Server-Patches/0421-Prevent-bees-loading-chunks-checking-hive-position.patch +++ b/Spigot-Server-Patches/0421-Prevent-bees-loading-chunks-checking-hive-position.patch @@ -1,11 +1,11 @@ -From d5359117d37570a72d2655acf6d55259c29b107c Mon Sep 17 00:00:00 2001 +From e23ef0c34b897a117281b61b3ca36a75e213c8da Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Jan 2020 17:24:34 -0600 Subject: [PATCH] Prevent bees loading chunks checking hive position diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index fb1c0a965..829aab7f7 100644 +index d1d7db062..f67d66b9a 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -17,5 +17,5 @@ index fb1c0a965..829aab7f7 100644 return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE; -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0422-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0422-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 40c1c7a00..7e3dac361 100644 --- a/Spigot-Server-Patches/0422-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0422-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 5188398998617b7bcac6700d417981aa4693f577 Mon Sep 17 00:00:00 2001 +From bcd462bd1b2e7fd07d780470fb9b8ea58a34b56c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things @@ -32,5 +32,5 @@ index 3cb6e6089..7a16a3e0e 100644 DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0423-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0423-Guard-against-serializing-mismatching-chunk-coordina.patch index 6d1dda070..fdd4c6648 100644 --- a/Spigot-Server-Patches/0423-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/Spigot-Server-Patches/0423-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -1,4 +1,4 @@ -From 6bd0d983bbd84cb2fcc32655bdfbff511c7856f4 Mon Sep 17 00:00:00 2001 +From 8e8e3b451fd7a632f61a0cc503feacb904487da4 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 27 Dec 2019 09:42:26 -0800 Subject: [PATCH] Guard against serializing mismatching chunk coordinate @@ -53,5 +53,5 @@ index 134c76065..25c8b131f 100644 if (this.c != null) { synchronized (this.persistentDataLock) { // Paper - Async chunk loading -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0424-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0424-Optimise-IEntityAccess-getPlayerByUUID.patch index 409a41a83..0b852d2cc 100644 --- a/Spigot-Server-Patches/0424-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/Spigot-Server-Patches/0424-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -1,4 +1,4 @@ -From 05b1422690929330ad3ec07e842be83e1bde932e Mon Sep 17 00:00:00 2001 +From 452b0cd832ff24ce65a8d5bab77db2eb4a3665ab Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 11 Jan 2020 21:50:56 -0800 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID Use the world entity map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index c8512f9f4..467b35e3c 100644 +index d5c284cdd..4157e50e4 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -219,6 +219,12 @@ public interface IEntityAccess { @@ -23,7 +23,7 @@ index c8512f9f4..467b35e3c 100644 EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 70cbff313..8526a3fda 100644 +index 32512e5cc..0b3f6b8ba 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -82,6 +82,15 @@ public class WorldServer extends World { @@ -43,5 +43,5 @@ index 70cbff313..8526a3fda 100644 public final com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController poiDataController = new com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController() { @Override -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0425-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0425-Fix-items-not-falling-correctly.patch index 2094e90ec..c43d8109e 100644 --- a/Spigot-Server-Patches/0425-Fix-items-not-falling-correctly.patch +++ b/Spigot-Server-Patches/0425-Fix-items-not-falling-correctly.patch @@ -1,4 +1,4 @@ -From 8d1d14d443a17c93f6ce7feb9b75e40f1ef060bb Mon Sep 17 00:00:00 2001 +From a8e7ed3eb8a42ddcaac5ea98204787b3425e35f2 Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Fri, 17 Jan 2020 17:17:54 -0600 Subject: [PATCH] Fix items not falling correctly @@ -28,5 +28,5 @@ index e61af3f5e..d15a9fcfb 100644 float f = 0.98F; -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch index b9b6beda4..c3951533a 100644 --- a/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch +++ b/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch @@ -1,4 +1,4 @@ -From aeabd8ac2eedc092054b266c0cb9af1b7c530ea9 Mon Sep 17 00:00:00 2001 +From 91e9bdcaf03ebe68435195d6565bc721fb16f3fe Mon Sep 17 00:00:00 2001 From: BrodyBeckwith Date: Tue, 14 Jan 2020 17:49:03 -0500 Subject: [PATCH] Optimize call to getFluid for explosions @@ -18,5 +18,5 @@ index 8762a566d..3fd4c12b1 100644 if (!iblockdata.isAir() || !fluid.isEmpty()) { float f2 = Math.max(iblockdata.getBlock().getDurability(), fluid.k()); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch index 574d4f7ec..71955ebaf 100644 --- a/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch +++ b/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch @@ -1,4 +1,4 @@ -From 1ea6a2cbd8595c611adbc561e06b200be7696020 Mon Sep 17 00:00:00 2001 +From 157b9e959f6d0e0db85fd8b4993f902e89772ecb Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 17 Jan 2020 18:44:55 -0800 Subject: [PATCH] Fix last firework in stack not having effects when dispensed @@ -22,5 +22,5 @@ index 9a8be1474..02d2e9a84 100644 entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F); isourceblock.getWorld().addEntity(entityfireworks); -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch index 60d32274c..7bc9f2181 100644 --- a/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 58a93912d33063d61700ffa253c1feadba39142a Mon Sep 17 00:00:00 2001 +From d9e0d50063023dded73063f94de934d80adee185 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Activation Range Improvements @@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior Adds water Mobs to activation range config and nerfs fish diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 77d7e6885..9143f5ee8 100644 +index bbfbe4b1e..c1ffd6dc1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -554,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -277,5 +277,5 @@ index c2906f20a..885512396 100644 log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers ); } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch index 3c4421f37..2e0234fc6 100644 --- a/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch +++ b/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch @@ -1,4 +1,4 @@ -From 2147836df3d636fd7c9b27f2697b5c6acbaee475 Mon Sep 17 00:00:00 2001 +From ae4b30a826b7fc0456698c2af3d82cf2f7efc8de Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:07 -0600 Subject: [PATCH] Add effect to block break naturally @@ -30,5 +30,5 @@ index a667e58ed..78e84c3d6 100644 } -- -2.25.0 +2.25.0.windows.1 diff --git a/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch index 6e5d088ab..3a46c74be 100644 --- a/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch +++ b/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 2b7b877d32c3b5a1d308515210267a7e17c4fdd8 Mon Sep 17 00:00:00 2001 +From 7a6bccc3348903a4e0eca83740ac69dcc9e2f8a1 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Sat, 21 Dec 2019 15:22:09 -0500 Subject: [PATCH] Tracking Range Improvements @@ -60,5 +60,5 @@ index 6f8e6c1d0..46c33e691 100644 } } -- -2.25.0 +2.25.0.windows.1 diff --git a/work/BuildData b/work/BuildData index bcded15a2..4a6af0566 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit bcded15a2b4e78ea3c3e53843736ebac013471c2 +Subproject commit 4a6af056693a191400cc4bc242823734c865c282 diff --git a/work/Bukkit b/work/Bukkit index 58d299a56..538ceaff0 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 58d299a56f783ba04943502d709d86d5a4227daa +Subproject commit 538ceaff0e2c94f8deaf44fbf35e6024938c67b5 diff --git a/work/CraftBukkit b/work/CraftBukkit index 5c6b0dc6e..29737ccbd 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 5c6b0dc6e41b0e416b2f90e51f220a1f956dbc5f +Subproject commit 29737ccbd2a184f893f102618ac2b64261bff8d9 diff --git a/work/Spigot b/work/Spigot index 037559e7b..800b93fb8 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 037559e7b4721c8a0af0ead3788733886ce9f49d +Subproject commit 800b93fb8cfcad0ac393eb401e00a40475722be3